X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fschema%2FRelationshipSchema.java;h=47b5b99ebf027ebea117561a5697c8b8bca7cf5e;hb=0c40bcde9facc109ceb8dabb91156df2b4fb4129;hp=2aab7a96e13b33c8b1b56502e06eaa86aa49a75b;hpb=d10a218c76633374f083f7a2802c198e93a6abae;p=aai%2Fgizmo.git

diff --git a/src/main/java/org/onap/schema/RelationshipSchema.java b/src/main/java/org/onap/schema/RelationshipSchema.java
index 2aab7a9..47b5b99 100644
--- a/src/main/java/org/onap/schema/RelationshipSchema.java
+++ b/src/main/java/org/onap/schema/RelationshipSchema.java
@@ -23,7 +23,9 @@ package org.onap.schema;
 
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 import javax.ws.rs.core.Response.Status;
 import org.codehaus.jackson.map.ObjectMapper;
@@ -34,11 +36,7 @@ import com.google.common.collect.Multimap;
 
 public class RelationshipSchema {
 
-  public static final String SCHEMA_SOURCE_NODE_TYPE = "from";
-  public static final String SCHEMA_TARGET_NODE_TYPE = "to";
   public static final String SCHEMA_RELATIONSHIP_TYPE = "label";
-  public static final String SCHEMA_MULTIPLICITY_TYPE = "multiplicity";
-  public static final String SCHEMA_RULES_ARRAY = "rules";
 
   private Map<String, Map<String, Class<?>>> relations = new HashMap<>();
   /**
@@ -46,7 +44,9 @@ public class RelationshipSchema {
    */
   private Map<String, Map<String, Class<?>>> relationTypes  = new HashMap<>();
 
-  private Map<String, EdgeRule> relationshipRules = new HashMap<>();
+  // A map storing the list of valid edge types for a source/target pair
+  private Map<String, Set<String>> edgeTypesForNodePair = new HashMap<>();
+  
 
   @SuppressWarnings("unchecked")
   public RelationshipSchema(Multimap<String, EdgeRule> rules, String props) throws CrudException, IOException {
@@ -54,8 +54,16 @@ public class RelationshipSchema {
 
     // hold the true values of the edge rules by key - convert to java 8
     for (EdgeRule rule : rules.values()) {
-      String key = buildRelation(rule.getFrom(), rule.getTo(), rule.getLabel());
-      relationshipRules.put(key, rule);
+      
+      String nodePairKey = buildNodePairKey(rule.getFrom(), rule.getTo());
+      if (edgeTypesForNodePair.get(nodePairKey) == null) {
+        Set<String> typeSet = new HashSet<String>();
+        typeSet.add(rule.getLabel());
+        edgeTypesForNodePair.put(nodePairKey, typeSet);
+      }
+      else {
+        edgeTypesForNodePair.get(nodePairKey).add(rule.getLabel());
+      }
     }
 
     Map<String, Class<?>> edgeProps = properties.entrySet().stream().collect(Collectors.toMap(p -> p.getKey(), p -> {
@@ -77,27 +85,6 @@ public class RelationshipSchema {
     return this.relations.get(key);
   }
 
-  /**
-   * Extract the multiplicity type from the Edge rules
-   *
-   * @param key
-   * @return
-   * @throws CrudException
-   */
-  public String lookupRelationMultiplicity(String key) throws CrudException {
-    EdgeRule edgeRule = relationshipRules.get(key);
-
-    if (edgeRule == null) {
-      throw new CrudException("Invalid source/target/relationship type: " + key, Status.BAD_REQUEST);
-    }
-
-    if (edgeRule.getMultiplicityRule() != null) {
-      return edgeRule.getMultiplicityRule().toString();
-    }
-
-    return null;
-  }
-
   public Map<String, Class<?>> lookupRelationType(String type) {
     return this.relationTypes.get(type);
   }
@@ -106,10 +93,23 @@ public class RelationshipSchema {
     return relationTypes.containsKey(type);
   }
 
+  public Set<String> getValidRelationTypes(String source, String target) {
+    Set<String> typeList = edgeTypesForNodePair.get(buildNodePairKey(source, target));
 
+    if (typeList == null) {
+      return new HashSet<String>();
+    }
+    
+    return typeList;
+  }
+  
   private String buildRelation(String source, String target, String relation) {
     return source + ":" + target + ":" + relation;
   }
+  
+  private String buildNodePairKey(String source, String target) {
+    return source + ":" + target;
+  }
 
   private Class<?> resolveClass(String type) throws CrudException, ClassNotFoundException {
     Class<?> clazz = Class.forName(type);