Reduce the number of problems in aai-common by removing unused imports

[aai/aai-common.git] / aai-core / src / test / java / org / onap / aai / introspection / sideeffect / PrivateEdgeTest.java

diff --git a/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/PrivateEdgeTest.java b/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/PrivateEdgeTest.java
index 6a7bfd3..edace19 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/PrivateEdgeTest.java
+++ b/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/PrivateEdgeTest.java
@@ -20,6 +20,20 @@
 
 package org.onap.aai.introspection.sideeffect;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.StringContains.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -43,20 +57,6 @@ import org.onap.aai.serialization.engines.QueryStyle;
 import org.onap.aai.serialization.engines.TransactionalGraphEngine;
 import org.springframework.test.annotation.DirtiesContext;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.StringContains.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
 @RunWith(value = Parameterized.class)
 @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
 public class PrivateEdgeTest extends AAISetup {
@@ -84,49 +84,30 @@ public class PrivateEdgeTest extends AAISetup {
         System.setProperty("AJSC_HOME", ".");
         System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local");
 
-        graph.traversal()
-            .addV()
-            .property("aai-node-type", "model")
-            .property("model-invariant-id", "key1")
-            .property(AAIProperties.AAI_URI, "/service-design-and-creation/models/model/key1")
-            .as("v1")
-            .addV()
-            .property("aai-node-type", "model-ver")
-            .property("model-ver", "myValue")
-            .property("model-version-id", "key2")
-            .property("model-version", "testValue")
-            .property(AAIProperties.AAI_URI, "/service-design-and-creation/models/model/key1/model-vers/model-ver/key2")
-            .as("v2")
-            .addE("org.onap.relationships.inventory.BelongsTo").to("v1").from("v2")
-            .property(EdgeProperty.CONTAINS.toString(), true)
-            .addV()
-            .property("aai-node-type", "model")
-            .property("model-invariant-id", "key100")
-            .property(AAIProperties.AAI_URI, "/service-design-and-creation/models/model/key100")
-            .as("v3")
-            .addV()
-            .property("aai-node-type", "model-ver")
-            .property("model-ver", "myValue")
-            .property("model-version-id", "key200")
-            .property("model-version", "testValue")
-            .property(AAIProperties.AAI_URI, "/service-design-and-creation/models/model/key100/model-vers/model-ver/key200")
-            .as("v4")
-            .addE("org.onap.relationships.inventory.BelongsTo").to("v3").from("v4")
-            .property(EdgeProperty.CONTAINS.toString(), true)
-            .addV()
-            .property("aai-node-type", "model")
-            .property("model-invariant-id", "key3")
-            .property(AAIProperties.AAI_URI, "/service-design-and-creation/models/model/key3")
-            .as("v5")
-            .addV()
-            .property("aai-node-type", "model-ver")
-            .property("model-ver", "myValue")
-            .property("model-version-id", "key4")
-            .property(AAIProperties.AAI_URI, "/service-design-and-creation/models/model/key3/model-vers/model-ver/key4")
-            .as("v6")
-            .addE("org.onap.relationships.inventory.BelongsTo").to("v5").from("v6")
-            .property(EdgeProperty.CONTAINS.toString(), true)
-            .next();
+        graph.traversal().addV().property("aai-node-type", "model").property("model-invariant-id", "key1")
+                .property(AAIProperties.AAI_URI, "/service-design-and-creation/models/model/key1").as("v1").addV()
+                .property("aai-node-type", "model-ver").property("model-ver", "myValue")
+                .property("model-version-id", "key2").property("model-version", "testValue")
+                .property(AAIProperties.AAI_URI,
+                        "/service-design-and-creation/models/model/key1/model-vers/model-ver/key2")
+                .as("v2").addE("org.onap.relationships.inventory.BelongsTo").to("v1").from("v2")
+                .property(EdgeProperty.CONTAINS.toString(), true).addV().property("aai-node-type", "model")
+                .property("model-invariant-id", "key100")
+                .property(AAIProperties.AAI_URI, "/service-design-and-creation/models/model/key100").as("v3").addV()
+                .property("aai-node-type", "model-ver").property("model-ver", "myValue")
+                .property("model-version-id", "key200").property("model-version", "testValue")
+                .property(AAIProperties.AAI_URI,
+                        "/service-design-and-creation/models/model/key100/model-vers/model-ver/key200")
+                .as("v4").addE("org.onap.relationships.inventory.BelongsTo").to("v3").from("v4")
+                .property(EdgeProperty.CONTAINS.toString(), true).addV().property("aai-node-type", "model")
+                .property("model-invariant-id", "key3")
+                .property(AAIProperties.AAI_URI, "/service-design-and-creation/models/model/key3").as("v5").addV()
+                .property("aai-node-type", "model-ver").property("model-ver", "myValue")
+                .property("model-version-id", "key4")
+                .property(AAIProperties.AAI_URI,
+                        "/service-design-and-creation/models/model/key3/model-vers/model-ver/key4")
+                .as("v6").addE("org.onap.relationships.inventory.BelongsTo").to("v5").from("v6")
+                .property(EdgeProperty.CONTAINS.toString(), true).next();
         graph.tx().commit();
     }
 
@@ -138,7 +119,8 @@ public class PrivateEdgeTest extends AAISetup {
 
     @Before
     public void initMock() {
-        Loader loader = loaderFactory.createLoaderForVersion(introspectorFactoryType, schemaVersions.getDefaultVersion());
+        Loader loader =
+                loaderFactory.createLoaderForVersion(introspectorFactoryType, schemaVersions.getDefaultVersion());
         MockitoAnnotations.initMocks(this);
         dbEngine = new JanusGraphDBEngine(queryStyle, loader);
     }
@@ -157,12 +139,8 @@ public class PrivateEdgeTest extends AAISetup {
         when(spy.asAdmin()).thenReturn(adminSpy);
         when(adminSpy.getTraversalSource()).thenReturn(traversal);
 
-        Vertex selfV = traversal.addV("generic-vnf")
-            .property("aai-node-type", "generic-vnf")
-            .property("vnf-id", "myId")
-            .property("aai-uri", obj.getURI())
-            .property("model-invariant-id", "key1")
-            .next();
+        Vertex selfV = traversal.addV("generic-vnf").property("aai-node-type", "generic-vnf").property("vnf-id", "myId")
+                .property("aai-uri", obj.getURI()).property("model-invariant-id", "key1").next();
 
         thrown.expectMessage(containsString("Cannot complete privateEdge uri"));
         DBSerializer serializer =