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=e6a40b5ca965b9bdbc70f466d7449636c13e4ace;hpb=94cbd3286b5fdd2f3f8fa3325835e713d71aac73;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 e6a40b5..47b5b99 100644
--- a/src/main/java/org/onap/schema/RelationshipSchema.java
+++ b/src/main/java/org/onap/schema/RelationshipSchema.java
@@ -1,16 +1,15 @@
 /**
  * ============LICENSE_START=======================================================
- * Gizmo
+ * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
- * Copyright © 2017 Amdocs
- * All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 Amdocs
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,31 +17,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.schema;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import org.codehaus.jackson.map.ObjectMapper;
-import org.onap.crud.exception.CrudException;
 
 import java.io.IOException;
-import java.util.*;
+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;
+import org.onap.aai.edges.EdgeRule;
+import org.onap.crud.exception.CrudException;
+import com.google.common.collect.Multimap;
 
 
 public class RelationshipSchema {
-  private static final Gson gson = new GsonBuilder().create();
 
-  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_RULES_ARRAY = "rules";
-
 
   private Map<String, Map<String, Class<?>>> relations = new HashMap<>();
   /**
@@ -50,13 +44,28 @@ public class RelationshipSchema {
    */
   private Map<String, Map<String, Class<?>>> relationTypes  = new HashMap<>();
 
+  // A map storing the list of valid edge types for a source/target pair
+  private Map<String, Set<String>> edgeTypesForNodePair = new HashMap<>();
+  
 
-  public RelationshipSchema(List<String> jsonStrings) throws CrudException, IOException {
-    String edgeRules = jsonStrings.get(0);
-    String props = jsonStrings.get(1);
-
-    HashMap<String, ArrayList<LinkedHashMap<String, String>>> rules = new ObjectMapper().readValue(edgeRules, HashMap.class);
+  @SuppressWarnings("unchecked")
+  public RelationshipSchema(Multimap<String, EdgeRule> rules, String props) throws CrudException, IOException {
     HashMap<String, String> properties = new ObjectMapper().readValue(props, HashMap.class);
+
+    // hold the true values of the edge rules by key - convert to java 8
+    for (EdgeRule rule : rules.values()) {
+      
+      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 -> {
       try {
         return resolveClass(p.getValue());
@@ -66,14 +75,12 @@ public class RelationshipSchema {
       return null;
     }));
 
-    rules.get(SCHEMA_RULES_ARRAY).forEach(l -> {
-      relationTypes.put(l.get(SCHEMA_RELATIONSHIP_TYPE), edgeProps);
-      relations.put(buildRelation(l.get(SCHEMA_SOURCE_NODE_TYPE), l.get(SCHEMA_TARGET_NODE_TYPE), l.get(SCHEMA_RELATIONSHIP_TYPE)), edgeProps);
+    rules.entries ().forEach ( (kv) -> {
+      relationTypes.put(kv.getValue ().getLabel (), edgeProps);
+      relations.put (buildRelation ( kv.getValue ().getFrom (), kv.getValue ().getTo (), kv.getValue ().getLabel ()), edgeProps);
     });
   }
 
-
-
   public Map<String, Class<?>> lookupRelation(String key) {
     return this.relations.get(key);
   }
@@ -86,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));
 
-  private String buildRelation(String source, String target, String relation){
+    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);
@@ -103,6 +123,4 @@ public class RelationshipSchema {
       throw new CrudException("", Status.BAD_REQUEST);
     }
   }
-}
-
-
+}
\ No newline at end of file