X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fgizmo.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fschema%2FRelationshipSchema.java;h=47b5b99ebf027ebea117561a5697c8b8bca7cf5e;hp=0cf419e8dfc48b0d8ef2bb58917daf4d7973cdd2;hb=0c40bcde9facc109ceb8dabb91156df2b4fb4129;hpb=df7904cca9c67ed7ce99e1d1d1c3a2c961a61445 diff --git a/src/main/java/org/onap/schema/RelationshipSchema.java b/src/main/java/org/onap/schema/RelationshipSchema.java index 0cf419e..47b5b99 100644 --- a/src/main/java/org/onap/schema/RelationshipSchema.java +++ b/src/main/java/org/onap/schema/RelationshipSchema.java @@ -36,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>> relations = new HashMap<>(); /** @@ -48,8 +44,6 @@ public class RelationshipSchema { */ private Map>> relationTypes = new HashMap<>(); - private Map relationshipRules = new HashMap<>(); - // A map storing the list of valid edge types for a source/target pair private Map> edgeTypesForNodePair = new HashMap<>(); @@ -60,8 +54,6 @@ 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) { @@ -93,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> lookupRelationType(String type) { return this.relationTypes.get(type); }