X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=aai-schema-gen%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fschemagen%2Fgenxsd%2FEdgeDescriptionTest.java;h=b17901f79e76d28c2a6b93a5fcb33cbcae788567;hb=e0ad4f2890f9f933199bc6f1b3f0e988da471aa9;hp=ceddafef0fd823ad2f6c31bfc6b098353f7e91e9;hpb=1b2c97dbc18bc0db5610fc18e9ae690b7a40d06d;p=aai%2Fschema-service.git

diff --git a/aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/EdgeDescriptionTest.java b/aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/EdgeDescriptionTest.java
index ceddafe..b17901f 100644
--- a/aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/EdgeDescriptionTest.java
+++ b/aai-schema-gen/src/test/java/org/onap/aai/schemagen/genxsd/EdgeDescriptionTest.java
@@ -53,296 +53,296 @@ import static org.junit.Assert.assertTrue;
 
 
 public class EdgeDescriptionTest  {
-	private static final String EDGEFILENAME = "src/test/resources/dbedgerules/EdgeDescriptionRules_test.json";
-	@Autowired
+  private static final String EDGEFILENAME = "src/test/resources/dbedgerules/EdgeDescriptionRules_test.json";
+  @Autowired
     ConfigTranslator ct;
-	@Autowired
+  @Autowired
     EdgeIngestor edgeIngestor;
-	String nodeName = "availability-zone";
-	String toNode = "complex";
-	SchemaVersion v10 = new SchemaVersion("v10");
-	@BeforeClass
-	public static void setUpBeforeClass() throws Exception {
-		String json = "{"
-				+ "	\"rules\": ["
-				+ "		{"
-				+ "			\"from\": \"availability-zone\","
-				+ "			\"to\": \"complex\","
-				+ "			\"label\": \"org.onap.relationships.inventory.LocatedIn\","
-				+ "			\"direction\": \"OUT\","
-				+ "			\"multiplicity\": \"MANY2ONE\","
-				+ "			\"contains-other-v\": \"NONE\","
-				+ "			\"delete-other-v\": \"NONE\","
-				+ "			\"SVC-INFRA\": \"NONE\","
-				+ "			\"prevent-delete\": \"!${direction}\","
-				+ "			\"default\": \"true\","
-				+ "			\"description\":\"this description\""
-				+ "		},"
-				+ "    {"
-				+ "			\"from\": \"availability-zone\","
-				+ "			\"to\": \"service-capability\","
-				+ "			\"label\": \"org.onap.relationships.inventory.AppliesTo\","
-				+ "			\"direction\": \"OUT\","
-				+ "			\"multiplicity\": \"MANY2MANY\","
-				+ "			\"contains-other-v\": \"NONE\","
-				+ "			\"delete-other-v\": \"NONE\","
-				+ "			\"SVC-INFRA\": \"NONE\","
-				+ "			\"prevent-delete\": \"!${direction}\","
-				+ "			\"default\": \"true\","
-				+ "			\"description\":\"\""
-				+ "		},"
-				+ "		{"
-				+ "			\"from\": \"availability-zone\","
-				+ "			\"to\": \"cloud-region\","
-				+ "			\"label\": \"org.onap.relationships.inventory.BelongsTo\","
-				+ "			\"direction\": \"OUT\","
-				+ "			\"multiplicity\": \"MANY2ONE\","
-				+ "			\"contains-other-v\": \"!${direction}\","
-				+ "			\"delete-other-v\": \"!${direction}\","
-				+ "			\"SVC-INFRA\": \"NONE\","
-				+ "			\"prevent-delete\": \"NONE\","
-				+ "			\"default\": \"true\","
-				+ "			\"description\":\"\""
-				+ "		},"
-				+ "		{"
-				+ "			\"from\": \"ctag-pool\","
-				+ "			\"to\": \"availability-zone\","
-				+ "			\"label\": \"org.onap.relationships.inventory.AppliesTo\","
-				+ "			\"direction\": \"OUT\","
-				+ "			\"multiplicity\": \"MANY2MANY\","
-				+ "			\"contains-other-v\": \"${direction}\","
-				+ "			\"delete-other-v\": \"NONE\","
-				+ "			\"SVC-INFRA\": \"NONE\","
-				+ "			\"prevent-delete\": \"!${direction}\","
-				+ "			\"default\": \"true\","
-				+ "			\"description\":\"\""
-				+ "		},"
-				+ "		{"
-				+ "			\"from\": \"dvs-switch\","
-				+ "			\"to\": \"availability-zone\","
-				+ "			\"label\": \"org.onap.relationships.inventory.AppliesTo\","
-				+ "			\"direction\": \"OUT\","
-				+ "			\"multiplicity\": \"MANY2MANY\","
-				+ "			\"contains-other-v\": \"NONE\","
-				+ "			\"delete-other-v\": \"NONE\","
-				+ "			\"SVC-INFRA\": \"NONE\","
-				+ "			\"prevent-delete\": \"!${direction}\","
-				+ "			\"default\": \"true\","
-				+ "			\"description\":\"\""
-				+ "		},"
-				+ "		{"
-				+ "			\"from\": \"generic-vnf\","
-				+ "			\"to\": \"availability-zone\","
-				+ "			\"label\": \"org.onap.relationships.inventory.Uses\","
-				+ "			\"direction\": \"OUT\","
-				+ "			\"multiplicity\": \"MANY2MANY\","
-				+ "			\"contains-other-v\": \"NONE\","
-				+ "			\"delete-other-v\": \"NONE\","
-				+ "			\"SVC-INFRA\": \"${direction}\","
-				+ "			\"prevent-delete\": \"!${direction}\","
-				+ "			\"default\": \"true\","
-				+ "			\"description\":\"\""
-				+ "		},"
-				+ "		{"
-				+ "			\"from\": \"pserver\","
-				+ "			\"to\": \"availability-zone\","
-				+ "			\"label\": \"org.onap.relationships.inventory.MemberOf\","
-				+ "			\"direction\": \"OUT\","
-				+ "			\"multiplicity\": \"MANY2ONE\","
-				+ "			\"contains-other-v\": \"NONE\","
-				+ "			\"delete-other-v\": \"NONE\","
-				+ "			\"SVC-INFRA\": \"${direction}\","
-				+ "			\"prevent-delete\": \"!${direction}\","
-				+ "			\"default\": \"true\","
-				+ "			\"description\":\"\""
-				+ "		},"
-				+ "		{"
-				+ "			\"from\": \"vce\","
-				+ "			\"to\": \"availability-zone\","
-				+ "			\"label\": \"org.onap.relationships.inventory.Uses\","
-				+ "			\"direction\": \"OUT\","
-				+ "			\"multiplicity\": \"MANY2MANY\","
-				+ "			\"contains-other-v\": \"NONE\","
-				+ "			\"delete-other-v\": \"NONE\","
-				+ "			\"SVC-INFRA\": \"NONE\","
-				+ "			\"prevent-delete\": \"!${direction}\","
-				+ "			\"default\": \"true\","
-				+ "			\"description\":\"\""
-				+ "		},"
-				+ "	]}";
-		BufferedWriter bw = new BufferedWriter(new FileWriter(EDGEFILENAME));
-		bw.write(json);
-		bw.close();
-	}
-	@AfterClass
-	public static void tearDownAfterClass() throws Exception {
-		File edges = new File(EDGEFILENAME);
-		edges.delete();
-	}
-	@Before
-	public void setUp() throws Exception {
+  String nodeName = "availability-zone";
+  String toNode = "complex";
+  SchemaVersion v10 = new SchemaVersion("v10");
+  @BeforeClass
+  public static void setUpBeforeClass() throws Exception {
+    String json = "{"
+        + "  \"rules\": ["
+        + "    {"
+        + "      \"from\": \"availability-zone\","
+        + "      \"to\": \"complex\","
+        + "      \"label\": \"org.onap.relationships.inventory.LocatedIn\","
+        + "      \"direction\": \"OUT\","
+        + "      \"multiplicity\": \"MANY2ONE\","
+        + "      \"contains-other-v\": \"NONE\","
+        + "      \"delete-other-v\": \"NONE\","
+        + "      \"SVC-INFRA\": \"NONE\","
+        + "      \"prevent-delete\": \"!${direction}\","
+        + "      \"default\": \"true\","
+        + "      \"description\":\"this description\""
+        + "    },"
+        + "    {"
+        + "      \"from\": \"availability-zone\","
+        + "      \"to\": \"service-capability\","
+        + "      \"label\": \"org.onap.relationships.inventory.AppliesTo\","
+        + "      \"direction\": \"OUT\","
+        + "      \"multiplicity\": \"MANY2MANY\","
+        + "      \"contains-other-v\": \"NONE\","
+        + "      \"delete-other-v\": \"NONE\","
+        + "      \"SVC-INFRA\": \"NONE\","
+        + "      \"prevent-delete\": \"!${direction}\","
+        + "      \"default\": \"true\","
+        + "      \"description\":\"\""
+        + "    },"
+        + "    {"
+        + "      \"from\": \"availability-zone\","
+        + "      \"to\": \"cloud-region\","
+        + "      \"label\": \"org.onap.relationships.inventory.BelongsTo\","
+        + "      \"direction\": \"OUT\","
+        + "      \"multiplicity\": \"MANY2ONE\","
+        + "      \"contains-other-v\": \"!${direction}\","
+        + "      \"delete-other-v\": \"!${direction}\","
+        + "      \"SVC-INFRA\": \"NONE\","
+        + "      \"prevent-delete\": \"NONE\","
+        + "      \"default\": \"true\","
+        + "      \"description\":\"\""
+        + "    },"
+        + "    {"
+        + "      \"from\": \"ctag-pool\","
+        + "      \"to\": \"availability-zone\","
+        + "      \"label\": \"org.onap.relationships.inventory.AppliesTo\","
+        + "      \"direction\": \"OUT\","
+        + "      \"multiplicity\": \"MANY2MANY\","
+        + "      \"contains-other-v\": \"${direction}\","
+        + "      \"delete-other-v\": \"NONE\","
+        + "      \"SVC-INFRA\": \"NONE\","
+        + "      \"prevent-delete\": \"!${direction}\","
+        + "      \"default\": \"true\","
+        + "      \"description\":\"\""
+        + "    },"
+        + "    {"
+        + "      \"from\": \"dvs-switch\","
+        + "      \"to\": \"availability-zone\","
+        + "      \"label\": \"org.onap.relationships.inventory.AppliesTo\","
+        + "      \"direction\": \"OUT\","
+        + "      \"multiplicity\": \"MANY2MANY\","
+        + "      \"contains-other-v\": \"NONE\","
+        + "      \"delete-other-v\": \"NONE\","
+        + "      \"SVC-INFRA\": \"NONE\","
+        + "      \"prevent-delete\": \"!${direction}\","
+        + "      \"default\": \"true\","
+        + "      \"description\":\"\""
+        + "    },"
+        + "    {"
+        + "      \"from\": \"generic-vnf\","
+        + "      \"to\": \"availability-zone\","
+        + "      \"label\": \"org.onap.relationships.inventory.Uses\","
+        + "      \"direction\": \"OUT\","
+        + "      \"multiplicity\": \"MANY2MANY\","
+        + "      \"contains-other-v\": \"NONE\","
+        + "      \"delete-other-v\": \"NONE\","
+        + "      \"SVC-INFRA\": \"${direction}\","
+        + "      \"prevent-delete\": \"!${direction}\","
+        + "      \"default\": \"true\","
+        + "      \"description\":\"\""
+        + "    },"
+        + "    {"
+        + "      \"from\": \"pserver\","
+        + "      \"to\": \"availability-zone\","
+        + "      \"label\": \"org.onap.relationships.inventory.MemberOf\","
+        + "      \"direction\": \"OUT\","
+        + "      \"multiplicity\": \"MANY2ONE\","
+        + "      \"contains-other-v\": \"NONE\","
+        + "      \"delete-other-v\": \"NONE\","
+        + "      \"SVC-INFRA\": \"${direction}\","
+        + "      \"prevent-delete\": \"!${direction}\","
+        + "      \"default\": \"true\","
+        + "      \"description\":\"\""
+        + "    },"
+        + "    {"
+        + "      \"from\": \"vce\","
+        + "      \"to\": \"availability-zone\","
+        + "      \"label\": \"org.onap.relationships.inventory.Uses\","
+        + "      \"direction\": \"OUT\","
+        + "      \"multiplicity\": \"MANY2MANY\","
+        + "      \"contains-other-v\": \"NONE\","
+        + "      \"delete-other-v\": \"NONE\","
+        + "      \"SVC-INFRA\": \"NONE\","
+        + "      \"prevent-delete\": \"!${direction}\","
+        + "      \"default\": \"true\","
+        + "      \"description\":\"\""
+        + "    },"
+        + "  ]}";
+    BufferedWriter bw = new BufferedWriter(new FileWriter(EDGEFILENAME));
+    bw.write(json);
+    bw.close();
+  }
+  @AfterClass
+  public static void tearDownAfterClass() throws Exception {
+    File edges = new File(EDGEFILENAME);
+    edges.delete();
+  }
+  @Before
+  public void setUp() throws Exception {
 
-	}
-	@Test
-	public void test() {
+  }
+  @Test
+  public void test() {
 
-		Map<SchemaVersion, List<String>> edges = ct.getEdgeFiles();
-		assertTrue(edges.containsKey(v10));
-		assertTrue(1 == edges.get(v10).size());
-		assertTrue("src/test/resources/dbedgerules/DbEdgeBusinessRules_test.json".equals(edges.get(v10).get(0)));
-	}
-	@Test
-	public void testGetDeleteOtherV() throws EdgeRuleNotFoundException {
-		String target = "availability-zone"+"|"+toNode+"-"+"NONE";
-		Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
-		SortedSet<String> ss=new TreeSet<String>(results.keySet());
-		for(String key : ss) {
-			results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey()+"-"+ed.getDeleteOtherV(), is(target)); } );
-		}
-	}
+    Map<SchemaVersion, List<String>> edges = ct.getEdgeFiles();
+    assertTrue(edges.containsKey(v10));
+    assertTrue(1 == edges.get(v10).size());
+    assertTrue("src/test/resources/dbedgerules/DbEdgeBusinessRules_test.json".equals(edges.get(v10).get(0)));
+  }
+  @Test
+  public void testGetDeleteOtherV() throws EdgeRuleNotFoundException {
+    String target = "availability-zone"+"|"+toNode+"-"+"NONE";
+    Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
+    SortedSet<String> ss=new TreeSet<String>(results.keySet());
+    for(String key : ss) {
+      results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey()+"-"+ed.getDeleteOtherV(), is(target)); } );
+    }
+  }
 
-	@Test
-	public void testGetPreventDelete() throws EdgeRuleNotFoundException {
-		String target = "availability-zone"+"|"+toNode+"-"+"IN";
-		Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
-		SortedSet<String> ss=new TreeSet<String>(results.keySet());
-		for(String key : ss) {
-			results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey()+"-"+ed.getPreventDelete(), is(target)); } );
-		}
-	}
+  @Test
+  public void testGetPreventDelete() throws EdgeRuleNotFoundException {
+    String target = "availability-zone"+"|"+toNode+"-"+"IN";
+    Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
+    SortedSet<String> ss=new TreeSet<String>(results.keySet());
+    for(String key : ss) {
+      results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey()+"-"+ed.getPreventDelete(), is(target)); } );
+    }
+  }
 
-	@Test
-	public void testGetAlsoDeleteFootnote() throws EdgeRuleNotFoundException {
-//		String toNode="cloud-region";
-//		String target = "availability-zone"+"|"+toNode+"-"+"(4)";
-		List<String> notedTypes = Arrays.asList("cloud-region", "ctag-pool");
-		Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
-		SortedSet<String> ss=new TreeSet<String>(results.keySet());
-		for(String key : ss) {
-			results.get(key).stream().filter((i) -> (i.getTo().equals("availability-zone") && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); String target = ed.getRuleKey()+"-"+(notedTypes.contains(ed.getTo()) ? "(4)" : ""); assertThat(ed.getRuleKey()+"-"+ed.getAlsoDeleteFootnote(ed.getFrom()), is(target)); } );
-		}
+  @Test
+  public void testGetAlsoDeleteFootnote() throws EdgeRuleNotFoundException {
+//    String toNode="cloud-region";
+//    String target = "availability-zone"+"|"+toNode+"-"+"(4)";
+    List<String> notedTypes = Arrays.asList("cloud-region", "ctag-pool");
+    Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
+    SortedSet<String> ss=new TreeSet<String>(results.keySet());
+    for(String key : ss) {
+      results.get(key).stream().filter((i) -> (i.getTo().equals("availability-zone") && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); String target = ed.getRuleKey()+"-"+(notedTypes.contains(ed.getTo()) ? "(4)" : ""); assertThat(ed.getRuleKey()+"-"+ed.getAlsoDeleteFootnote(ed.getFrom()), is(target)); } );
+    }
 /*
-		for (EdgeDescription ed : edges) {
-			String modResult = ed.getRuleKey() + "-" + ed.getAlsoDeleteFootnote(ed.getFrom());
-			assertThat(modResult, is(target));
-			ed.setDeleteOtherV("IN");
-			target = "availability-zone"+"|"+"complex"+"-"+"(4)";
-			modResult = ed.getRuleKey() + "-" + ed.getAlsoDeleteFootnote(ed.getFrom());
-			assertThat(modResult, is(target));
-			target = "availability-zone"+"|"+"complex"+"-"+"(1)";
-			modResult = ed.getRuleKey() + "-" + ed.getAlsoDeleteFootnote(ed.getTo());
-			assertThat(modResult, is(target));
-			ed.setDeleteOtherV("OUT");
-			target = "availability-zone"+"|"+"complex"+"-"+"(2)";
-			modResult = ed.getRuleKey() + "-" + ed.getAlsoDeleteFootnote(ed.getFrom());
-			assertThat(modResult, is(target));
-			target = "availability-zone"+"|"+"complex"+"-"+"(3)";
-			modResult = ed.getRuleKey() + "-" + ed.getAlsoDeleteFootnote(ed.getTo());
-			assertThat(modResult, is(target));
-		}
+    for (EdgeDescription ed : edges) {
+      String modResult = ed.getRuleKey() + "-" + ed.getAlsoDeleteFootnote(ed.getFrom());
+      assertThat(modResult, is(target));
+      ed.setDeleteOtherV("IN");
+      target = "availability-zone"+"|"+"complex"+"-"+"(4)";
+      modResult = ed.getRuleKey() + "-" + ed.getAlsoDeleteFootnote(ed.getFrom());
+      assertThat(modResult, is(target));
+      target = "availability-zone"+"|"+"complex"+"-"+"(1)";
+      modResult = ed.getRuleKey() + "-" + ed.getAlsoDeleteFootnote(ed.getTo());
+      assertThat(modResult, is(target));
+      ed.setDeleteOtherV("OUT");
+      target = "availability-zone"+"|"+"complex"+"-"+"(2)";
+      modResult = ed.getRuleKey() + "-" + ed.getAlsoDeleteFootnote(ed.getFrom());
+      assertThat(modResult, is(target));
+      target = "availability-zone"+"|"+"complex"+"-"+"(3)";
+      modResult = ed.getRuleKey() + "-" + ed.getAlsoDeleteFootnote(ed.getTo());
+      assertThat(modResult, is(target));
+    }
 */
-	}
+  }
 
-	@Test
-	public void testGetTo() throws EdgeRuleNotFoundException {
-		String target = "availability-zone"+"|"+toNode+"-"+toNode;
-		Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
-		SortedSet<String> ss=new TreeSet<String>(results.keySet());
-		for(String key : ss) {
-			results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey()+"-"+ed.getTo(), is(target)); } );
-		}
-	}
+  @Test
+  public void testGetTo() throws EdgeRuleNotFoundException {
+    String target = "availability-zone"+"|"+toNode+"-"+toNode;
+    Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
+    SortedSet<String> ss=new TreeSet<String>(results.keySet());
+    for(String key : ss) {
+      results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey()+"-"+ed.getTo(), is(target)); } );
+    }
+  }
 
-	@Test
-	public void testGetFrom() throws EdgeRuleNotFoundException {
-		String target = "availability-zone"+"|"+toNode+"-"+"availability-zone";
-		Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
-		SortedSet<String> ss=new TreeSet<String>(results.keySet());
-		for(String key : ss) {
-			results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey()+"-"+ed.getFrom(), is(target)); } );
-		}
-	}
+  @Test
+  public void testGetFrom() throws EdgeRuleNotFoundException {
+    String target = "availability-zone"+"|"+toNode+"-"+"availability-zone";
+    Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
+    SortedSet<String> ss=new TreeSet<String>(results.keySet());
+    for(String key : ss) {
+      results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey()+"-"+ed.getFrom(), is(target)); } );
+    }
+  }
 
-	@Test
-	public void testGetRuleKey() throws EdgeRuleNotFoundException {
-		String target = "availability-zone"+"|"+toNode;
-		Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
-		SortedSet<String> ss=new TreeSet<String>(results.keySet());
-		for(String key : ss) {
-			results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey(), is(target)); } );
-		}
-	}
+  @Test
+  public void testGetRuleKey() throws EdgeRuleNotFoundException {
+    String target = "availability-zone"+"|"+toNode;
+    Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
+    SortedSet<String> ss=new TreeSet<String>(results.keySet());
+    for(String key : ss) {
+      results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey(), is(target)); } );
+    }
+  }
 
-	@Test
-	public void testGetMultiplicity() throws EdgeRuleNotFoundException {
-		String target = "availability-zone"+"|"+toNode+"-"+"MANY2ONE";
-		Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
-		SortedSet<String> ss=new TreeSet<String>(results.keySet());
-		for(String key : ss) {
-			results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey()+"-"+ed.getMultiplicity(), is(target)); } );
-		}
-	}
+  @Test
+  public void testGetMultiplicity() throws EdgeRuleNotFoundException {
+    String target = "availability-zone"+"|"+toNode+"-"+"MANY2ONE";
+    Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
+    SortedSet<String> ss=new TreeSet<String>(results.keySet());
+    for(String key : ss) {
+      results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey()+"-"+ed.getMultiplicity(), is(target)); } );
+    }
+  }
 
-	@Test
-	public void testGetDirection() throws EdgeRuleNotFoundException {
-		String target = "availability-zone"+"|"+toNode+"-"+"OUT";
-		Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
-		SortedSet<String> ss=new TreeSet<String>(results.keySet());
-		for(String key : ss) {
-			results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey()+"-"+ed.getDirection(), is(target)); } );
-		}
-	}
+  @Test
+  public void testGetDirection() throws EdgeRuleNotFoundException {
+    String target = "availability-zone"+"|"+toNode+"-"+"OUT";
+    Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
+    SortedSet<String> ss=new TreeSet<String>(results.keySet());
+    for(String key : ss) {
+      results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey()+"-"+ed.getDirection(), is(target)); } );
+    }
+  }
 
-	@Test
-	public void testGetDescription() throws EdgeRuleNotFoundException {
-		String target = "availability-zone"+"|"+toNode+"-"+"this description";
-		Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
-		SortedSet<String> ss=new TreeSet<String>(results.keySet());
-		for(String key : ss) {
-			results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey()+"-"+ed.getDescription(), is(target)); } );
-		}
-	}
+  @Test
+  public void testGetDescription() throws EdgeRuleNotFoundException {
+    String target = "availability-zone"+"|"+toNode+"-"+"this description";
+    Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
+    SortedSet<String> ss=new TreeSet<String>(results.keySet());
+    for(String key : ss) {
+      results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey()+"-"+ed.getDescription(), is(target)); } );
+    }
+  }
 
-	@Test
-	public void testGetRelationshipDescription() throws EdgeRuleNotFoundException {
-		String target = "availability-zone"+"|"+toNode+"-"+"this description";
-		Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
-		SortedSet<String> ss=new TreeSet<String>(results.keySet());
-		for(String key : ss) {
-			results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey()+"-"+ed.getDescription(), is(target)); } );
-		}
-	}
+  @Test
+  public void testGetRelationshipDescription() throws EdgeRuleNotFoundException {
+    String target = "availability-zone"+"|"+toNode+"-"+"this description";
+    Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
+    SortedSet<String> ss=new TreeSet<String>(results.keySet());
+    for(String key : ss) {
+      results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey()+"-"+ed.getDescription(), is(target)); } );
+    }
+  }
 
-	@Test
-	public void testGetType() throws EdgeRuleNotFoundException {
-		String toNode = "cloud-region";
-		String target = "availability-zone"+"|"+toNode+"-"+"PARENT";
-		Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
-		SortedSet<String> ss=new TreeSet<String>(results.keySet());
-		for(String key : ss) {
-			results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey()+"-"+ed.getType(), is(target)); } );
-		}
-	}
+  @Test
+  public void testGetType() throws EdgeRuleNotFoundException {
+    String toNode = "cloud-region";
+    String target = "availability-zone"+"|"+toNode+"-"+"PARENT";
+    Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
+    SortedSet<String> ss=new TreeSet<String>(results.keySet());
+    for(String key : ss) {
+      results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey()+"-"+ed.getType(), is(target)); } );
+    }
+  }
 
-	@Test
-	public void testGetLabel() throws EdgeRuleNotFoundException {
-		String target = "availability-zone"+"|"+toNode+"-"+"org.onap.relationships.inventory.LocatedIn";
-		Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
-		SortedSet<String> ss=new TreeSet<String>(results.keySet());
-		for(String key : ss) {
-			results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey()+"-"+ed.getLabel(), is(target)); } );
-		}
-	}
+  @Test
+  public void testGetLabel() throws EdgeRuleNotFoundException {
+    String target = "availability-zone"+"|"+toNode+"-"+"org.onap.relationships.inventory.LocatedIn";
+    Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
+    SortedSet<String> ss=new TreeSet<String>(results.keySet());
+    for(String key : ss) {
+      results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey()+"-"+ed.getLabel(), is(target)); } );
+    }
+  }
 
-	@Test
-	public void testGetShortLabel() throws EdgeRuleNotFoundException {
-		String target = "availability-zone"+"|"+toNode+"-"+"LocatedIn";
-		Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
-		SortedSet<String> ss=new TreeSet<String>(results.keySet());
-		for(String key : ss) {
-			results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey()+"-"+ed.getShortLabel(), is(target)); } );
-		}
-	}
+  @Test
+  public void testGetShortLabel() throws EdgeRuleNotFoundException {
+    String target = "availability-zone"+"|"+toNode+"-"+"LocatedIn";
+    Multimap<String, EdgeRule> results = edgeIngestor.getAllRules(v10);
+    SortedSet<String> ss=new TreeSet<String>(results.keySet());
+    for(String key : ss) {
+      results.get(key).stream().filter((i) -> (i.getTo().equals(toNode) && (! i.isPrivateEdge()))).forEach((i) ->{ EdgeDescription ed = new EdgeDescription(i); assertThat(ed.getRuleKey()+"-"+ed.getShortLabel(), is(target)); } );
+    }
+  }
 }