diff options
| author |   Pavel Paroulek <pavel.paroulek@orange.com> | 2019-05-28 14:43:01 +0200 |
|---|---|---|
| committer | Pavel Paroulek <pavel.paroulek@orange.com> | 2019-05-28 14:43:01 +0200 |
| commit | cd8c4a64f0b6aa74e8190c53bf21924d291b76e0 (patch) | |
| tree | e2ecdc6a33897a39207ad6412870b605dd1f3428 /src | |
| parent | e22629636b27a473f7950d7b684c7017d01f6298 (diff) | |
Adding edgerule filtering
Adding edgerule filter and removing 'Both' option from drop down menu
Change-Id: I1969052166cc213a891d52fef9e79c1901ff7f9f
Issue-ID: AAI-531
Signed-off-by: Pavel Paroulek <pavel.paroulek@orange.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/onap/aai/graphgraph/reader/BasicSchemaReader.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/org/onap/aai/graphgraph/reader/BasicSchemaReader.java b/src/main/java/org/onap/aai/graphgraph/reader/BasicSchemaReader.java index 1367aeb..a52a297 100644 --- a/src/main/java/org/onap/aai/graphgraph/reader/BasicSchemaReader.java +++ b/src/main/java/org/onap/aai/graphgraph/reader/BasicSchemaReader.java @@ -166,7 +166,7 @@ public class BasicSchemaReader implements SchemaReader { p, introspector.getPropertyMetadata(p) .getOrDefault(PropertyMetadata.DESCRIPTION,"no description available"), - "I dont know", //TODO how to get this information???? + "I don't know", //TODO how to get this information???? introspector.getAllKeys().contains(p), introspector.getIndexedProperties().contains(p), introspector.getRequiredProperties().contains(p)) @@ -243,6 +243,7 @@ public class BasicSchemaReader implements SchemaReader { if (!"all".equals(initialNode)) { Set<String> subGraphVertices = computeNodes(initialNode, parentHops, EdgeType.CHILD.getTypeName()); subGraphVertices.addAll(computeNodes(initialNode, childHops, EdgeType.PARENT.getTypeName())); + subGraphVertices.addAll(computeNodes(initialNode, cousinHops, EdgeType.EDGE_RULE.getTypeName())); edges = filterEdges(edges, subGraphVertices); } @@ -251,11 +252,11 @@ public class BasicSchemaReader implements SchemaReader { } private boolean isParentChildFilter(String edgeFilter) { - return "Both".equals(edgeFilter) || "Parents".equals(edgeFilter); + return "Parents".equals(edgeFilter); } private boolean isEdgeRulesFilter(String edgeFilter) { - return "Both".equals(edgeFilter) || "Edgerules".equals(edgeFilter); + return "Edgerules".equals(edgeFilter); } private Set<Edge> filterEdgesStrict(Set<Edge> edges, Set<String> subGraphVertices) { |