AAI-1523 Batch reformat aai-core
[aai/aai-common.git] / aai-core / src / test / java / org / onap / aai / parsers / query / GraphTraversalTest.java
index 478f8bf..1f34731 100644 (file)
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.aai.parsers.query;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.Matchers.hasProperty;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertEquals;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.UriBuilder;
+
 import org.apache.tinkerpop.gremlin.process.traversal.P;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
@@ -35,26 +52,11 @@ import org.onap.aai.db.props.AAIProperties;
 import org.onap.aai.exceptions.AAIException;
 import org.onap.aai.introspection.ModelType;
 import org.onap.aai.rest.RestTokens;
-import org.onap.aai.serialization.engines.QueryStyle;
 import org.onap.aai.serialization.engines.JanusGraphDBEngine;
+import org.onap.aai.serialization.engines.QueryStyle;
 import org.onap.aai.serialization.engines.TransactionalGraphEngine;
 import org.springframework.test.annotation.DirtiesContext;
 
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.UriBuilder;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.Matchers.hasProperty;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertEquals;
-
 @RunWith(value = Parameterized.class)
 @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
 public class GraphTraversalTest extends DataLinkSetup {
@@ -67,32 +69,26 @@ public class GraphTraversalTest extends DataLinkSetup {
 
     @Parameterized.Parameters(name = "QueryStyle.{0}")
     public static Collection<Object[]> data() {
-        return Arrays.asList(new Object[][]{
-                {QueryStyle.TRAVERSAL},
-                {QueryStyle.TRAVERSAL_URI}
-        });
+        return Arrays.asList(new Object[][] {{QueryStyle.TRAVERSAL}, {QueryStyle.TRAVERSAL_URI}});
     }
 
-    @Rule public ExpectedException thrown = ExpectedException.none();
-
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
 
     /**
      * Configure.
+     * 
      * @throws Exception
      * @throws SecurityException
      * @throws NoSuchFieldException
      */
     @Before
     public void configure() throws Exception {
-        dbEngine =
-                new JanusGraphDBEngine(queryStyle,
-                    loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getDefaultVersion()),
-                    false);
-
-        dbEngineDepthVersion =
-                new JanusGraphDBEngine(queryStyle,
-                    loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getDepthVersion()),
-                    false);
+        dbEngine = new JanusGraphDBEngine(queryStyle,
+                loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getDefaultVersion()), false);
+
+        dbEngineDepthVersion = new JanusGraphDBEngine(queryStyle,
+                loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getDepthVersion()), false);
     }
 
     /**
@@ -107,25 +103,15 @@ public class GraphTraversalTest extends DataLinkSetup {
 
         QueryParser query = dbEngine.getQueryBuilder().createQueryFromURI(uri);
 
-        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start().has("physical-location-id", "key1").has("aai-node-type", "complex");
-        assertEquals(
-                "gremlin query should be " + expected.toString(),
-                expected.toString(),
+        GraphTraversal<Vertex, Vertex> expected =
+                __.<Vertex>start().has("physical-location-id", "key1").has("aai-node-type", "complex");
+        assertEquals("gremlin query should be " + expected.toString(), expected.toString(),
                 query.getQueryBuilder().getQuery().toString());
-        assertEquals(
-                "parent gremlin query should be equal to normal query",
-                expected.toString(),
+        assertEquals("parent gremlin query should be equal to normal query", expected.toString(),
                 query.getQueryBuilder().getParentQuery().getQuery().toString());
-        assertEquals(
-                "result type should be complex",
-                "complex",
-                query.getResultType());
-        assertEquals(
-                "result type should be empty",
-                "",
-                query.getParentResultType());
-        assertEquals("dependent",false, query.isDependent());
-
+        assertEquals("result type should be complex", "complex", query.getResultType());
+        assertEquals("result type should be empty", "", query.getParentResultType());
+        assertEquals("dependent", false, query.isDependent());
 
     }
 
@@ -137,33 +123,21 @@ public class GraphTraversalTest extends DataLinkSetup {
      */
     @Test
     public void childQuery() throws UnsupportedEncodingException, AAIException {
-        URI uri = UriBuilder.fromPath("cloud-infrastructure/complexes/complex/key1/ctag-pools/ctag-pool/key2/key3").build();
+        URI uri = UriBuilder.fromPath("cloud-infrastructure/complexes/complex/key1/ctag-pools/ctag-pool/key2/key3")
+                .build();
         QueryParser query = dbEngine.getQueryBuilder().createQueryFromURI(uri);
-        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start()
-                .has("physical-location-id", "key1").has("aai-node-type", "complex")
-                .in("org.onap.relationships.inventory.BelongsTo")
-                .has("aai-node-type", "ctag-pool")
-                .has("target-pe", "key2").has("availability-zone-name", "key3");
-        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start()
-                .has("physical-location-id", "key1").has("aai-node-type", "complex");
-        assertEquals(
-                "gremlin query should be " + expected.toString(),
-                expected.toString(),
+        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start().has("physical-location-id", "key1")
+                .has("aai-node-type", "complex").in("org.onap.relationships.inventory.BelongsTo")
+                .has("aai-node-type", "ctag-pool").has("target-pe", "key2").has("availability-zone-name", "key3");
+        GraphTraversal<Vertex, Vertex> expectedParent =
+                __.<Vertex>start().has("physical-location-id", "key1").has("aai-node-type", "complex");
+        assertEquals("gremlin query should be " + expected.toString(), expected.toString(),
                 query.getQueryBuilder().getQuery().toString());
-        assertEquals(
-                "parent gremlin query should be equal the query for complex",
-                expectedParent.toString(),
+        assertEquals("parent gremlin query should be equal the query for complex", expectedParent.toString(),
                 query.getQueryBuilder().getParentQuery().getQuery().toString());
-        assertEquals(
-                "result type should be complex",
-                "complex",
-                query.getParentResultType());
-        assertEquals(
-                "result type should be ctag-pool",
-                "ctag-pool",
-                query.getResultType());
-        assertEquals("dependent",true, query.isDependent());
-
+        assertEquals("result type should be complex", "complex", query.getParentResultType());
+        assertEquals("result type should be ctag-pool", "ctag-pool", query.getResultType());
+        assertEquals("dependent", true, query.isDependent());
 
     }
 
@@ -175,42 +149,24 @@ public class GraphTraversalTest extends DataLinkSetup {
      */
     @Test
     public void namingExceptions() throws UnsupportedEncodingException, AAIException {
-        URI uri = UriBuilder.fromPath("network/vces/vce/key1/port-groups/port-group/key2/cvlan-tags/cvlan-tag/655").build();
+        URI uri = UriBuilder.fromPath("network/vces/vce/key1/port-groups/port-group/key2/cvlan-tags/cvlan-tag/655")
+                .build();
         QueryParser query = dbEngine.getQueryBuilder().createQueryFromURI(uri);
-        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start()
-                .has("vnf-id", "key1").has("aai-node-type", "vce")
-                .in("org.onap.relationships.inventory.BelongsTo")
-                .has("aai-node-type", "port-group")
+        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start().has("vnf-id", "key1").has("aai-node-type", "vce")
+                .in("org.onap.relationships.inventory.BelongsTo").has("aai-node-type", "port-group")
                 .has("interface-id", "key2").in("org.onap.relationships.inventory.BelongsTo")
-                .has("aai-node-type", "cvlan-tag")
-                .has("cvlan-tag", 655);
-        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start()
-                .has("vnf-id", "key1").has("aai-node-type", "vce")
-                .in("org.onap.relationships.inventory.BelongsTo")
-                .has("aai-node-type", "port-group")
-                .has("interface-id", "key2");
-        assertEquals(
-                "gremlin query should be " + expected.toString(),
-                expected.toString(),
+                .has("aai-node-type", "cvlan-tag").has("cvlan-tag", 655);
+        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start().has("vnf-id", "key1")
+                .has("aai-node-type", "vce").in("org.onap.relationships.inventory.BelongsTo")
+                .has("aai-node-type", "port-group").has("interface-id", "key2");
+        assertEquals("gremlin query should be " + expected.toString(), expected.toString(),
                 query.getQueryBuilder().getQuery().toString());
-        assertEquals(
-                "parent gremlin query should be equal the query for port group",
-                expectedParent.toString(),
+        assertEquals("parent gremlin query should be equal the query for port group", expectedParent.toString(),
                 query.getQueryBuilder().getParentQuery().getQuery().toString());
-        assertEquals(
-                "result type should be cvlan-tag",
-                "cvlan-tag",
-                query.getResultType());
-        assertEquals(
-                "result type should be port-group",
-                "port-group",
-                query.getParentResultType());
-        assertEquals(
-                "contaner type should be empty",
-                "",
-                query.getContainerType());
-        assertEquals("dependent",true, query.isDependent());
-
+        assertEquals("result type should be cvlan-tag", "cvlan-tag", query.getResultType());
+        assertEquals("result type should be port-group", "port-group", query.getParentResultType());
+        assertEquals("contaner type should be empty", "", query.getContainerType());
+        assertEquals("dependent", true, query.isDependent());
 
     }
 
@@ -225,39 +181,21 @@ public class GraphTraversalTest extends DataLinkSetup {
     public void getAll() throws UnsupportedEncodingException, AAIException {
         URI uri = UriBuilder.fromPath("network/vces/vce/key1/port-groups/port-group/key2/cvlan-tags").build();
         QueryParser query = dbEngine.getQueryBuilder().createQueryFromURI(uri);
-        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start()
-                .has("vnf-id", "key1").has("aai-node-type", "vce")
-                .in("org.onap.relationships.inventory.BelongsTo")
-                .has("aai-node-type", "port-group")
+        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start().has("vnf-id", "key1").has("aai-node-type", "vce")
+                .in("org.onap.relationships.inventory.BelongsTo").has("aai-node-type", "port-group")
                 .has("interface-id", "key2").in("org.onap.relationships.inventory.BelongsTo")
                 .has("aai-node-type", "cvlan-tag");
-        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start()
-                .has("vnf-id", "key1").has("aai-node-type", "vce")
-                .in("org.onap.relationships.inventory.BelongsTo")
-                .has("aai-node-type", "port-group")
-                .has("interface-id", "key2");
-        assertEquals(
-                "gremlin query should be " + expected.toString(),
-                expected.toString(),
+        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start().has("vnf-id", "key1")
+                .has("aai-node-type", "vce").in("org.onap.relationships.inventory.BelongsTo")
+                .has("aai-node-type", "port-group").has("interface-id", "key2");
+        assertEquals("gremlin query should be " + expected.toString(), expected.toString(),
                 query.getQueryBuilder().getQuery().toString());
-        assertEquals(
-                "parent gremlin query should be equal the query for port group",
-                expectedParent.toString(),
+        assertEquals("parent gremlin query should be equal the query for port group", expectedParent.toString(),
                 query.getQueryBuilder().getParentQuery().getQuery().toString());
-        assertEquals(
-                "result type should be port-group",
-                "port-group",
-                query.getParentResultType());
-        assertEquals(
-                "result type should be cvlan-tag",
-                "cvlan-tag",
-                query.getResultType());
-        assertEquals(
-                "container type should be cvlan-tags",
-                "cvlan-tags",
-                query.getContainerType());
-        assertEquals("dependent",true, query.isDependent());
-
+        assertEquals("result type should be port-group", "port-group", query.getParentResultType());
+        assertEquals("result type should be cvlan-tag", "cvlan-tag", query.getResultType());
+        assertEquals("container type should be cvlan-tags", "cvlan-tags", query.getContainerType());
+        assertEquals("dependent", true, query.isDependent());
 
     }
 
@@ -265,36 +203,19 @@ public class GraphTraversalTest extends DataLinkSetup {
     public void getAllParent() throws UnsupportedEncodingException, AAIException {
         URI uri = UriBuilder.fromPath("cloud-infrastructure/pservers").build();
         QueryParser query = dbEngine.getQueryBuilder().createQueryFromURI(uri);
-        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start()
-                .has("aai-node-type", "pserver");
-        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start()
-                .has("aai-node-type", "pserver");
-        assertEquals(
-                "gremlin query should be " + expected.toString(),
-                expected.toString(),
+        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start().has("aai-node-type", "pserver");
+        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start().has("aai-node-type", "pserver");
+        assertEquals("gremlin query should be " + expected.toString(), expected.toString(),
                 query.getQueryBuilder().getQuery().toString());
-        assertEquals(
-                "parent gremlin query should be equal the query for pserver",
-                expectedParent.toString(),
+        assertEquals("parent gremlin query should be equal the query for pserver", expectedParent.toString(),
                 query.getQueryBuilder().getParentQuery().getQuery().toString());
-        assertEquals(
-                "parent result type should be empty",
-                "",
-                query.getParentResultType());
-        assertEquals(
-                "result type should be pserver",
-                "pserver",
-                query.getResultType());
-        assertEquals(
-                "container type should be pservers",
-                "pservers",
-                query.getContainerType());
-        assertEquals("dependent",false, query.isDependent());
-
+        assertEquals("parent result type should be empty", "", query.getParentResultType());
+        assertEquals("result type should be pserver", "pserver", query.getResultType());
+        assertEquals("container type should be pservers", "pservers", query.getContainerType());
+        assertEquals("dependent", false, query.isDependent());
 
     }
 
-
     /**
      * Gets the via query param.
      *
@@ -304,86 +225,58 @@ public class GraphTraversalTest extends DataLinkSetup {
      */
     @Test
     public void getViaQueryParam() throws UnsupportedEncodingException, AAIException {
-        URI uri = UriBuilder.fromPath("cloud-infrastructure/cloud-regions/cloud-region/mycloudowner/mycloudregionid/tenants/tenant").build();
+        URI uri = UriBuilder
+                .fromPath("cloud-infrastructure/cloud-regions/cloud-region/mycloudowner/mycloudregionid/tenants/tenant")
+                .build();
         MultivaluedMap<String, String> map = new MultivaluedHashMap<>();
         map.putSingle("tenant-name", "Tenant1");
         QueryParser query = dbEngine.getQueryBuilder().createQueryFromURI(uri, map);
-        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start()
-                .has("cloud-owner", "mycloudowner").has("cloud-region-id", "mycloudregionid")
-                .has("aai-node-type", "cloud-region")
-                .in("org.onap.relationships.inventory.BelongsTo")
-                .has("aai-node-type", "tenant")
-                .has("tenant-name", "Tenant1");
-
-        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start()
-                .has("cloud-owner", "mycloudowner").has("cloud-region-id", "mycloudregionid")
-                .has("aai-node-type", "cloud-region");
-
-        assertEquals(
-                "gremlin query should be " + expected.toString(),
-                expected.toString(),
+        GraphTraversal<Vertex, Vertex> expected =
+                __.<Vertex>start().has("cloud-owner", "mycloudowner").has("cloud-region-id", "mycloudregionid")
+                        .has("aai-node-type", "cloud-region").in("org.onap.relationships.inventory.BelongsTo")
+                        .has("aai-node-type", "tenant").has("tenant-name", "Tenant1");
+
+        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start().has("cloud-owner", "mycloudowner")
+                .has("cloud-region-id", "mycloudregionid").has("aai-node-type", "cloud-region");
+
+        assertEquals("gremlin query should be " + expected.toString(), expected.toString(),
                 query.getQueryBuilder().getQuery().toString());
-        assertEquals(
-                "parent gremlin query should be equal the query for cloud-region",
-                expectedParent.toString(),
+        assertEquals("parent gremlin query should be equal the query for cloud-region", expectedParent.toString(),
                 query.getQueryBuilder().getParentQuery().getQuery().toString());
-        assertEquals(
-                "result type should be cloud-region",
-                "cloud-region",
-                query.getParentResultType());
-        assertEquals(
-                "result type should be tenant",
-                "tenant",
-                query.getResultType());
-        assertEquals(
-                "container type should be empty",
-                "",
-                query.getContainerType());
-        assertEquals("dependent",true, query.isDependent());
+        assertEquals("result type should be cloud-region", "cloud-region", query.getParentResultType());
+        assertEquals("result type should be tenant", "tenant", query.getResultType());
+        assertEquals("container type should be empty", "", query.getContainerType());
+        assertEquals("dependent", true, query.isDependent());
 
     }
 
     @Test
     public void getViaDuplicateQueryParam() throws UnsupportedEncodingException, AAIException {
-        URI uri = UriBuilder.fromPath("cloud-infrastructure/cloud-regions/cloud-region/mycloudowner/mycloudregionid/tenants/tenant").build();
+        URI uri = UriBuilder
+                .fromPath("cloud-infrastructure/cloud-regions/cloud-region/mycloudowner/mycloudregionid/tenants/tenant")
+                .build();
         MultivaluedMap<String, String> map = new MultivaluedHashMap<>();
         List<String> values = new ArrayList<>();
         values.add("Tenant1");
         values.add("Tenant2");
         map.put("tenant-name", values);
         QueryParser query = dbEngine.getQueryBuilder().createQueryFromURI(uri, map);
-        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start()
-                .has("cloud-owner", "mycloudowner").has("cloud-region-id", "mycloudregionid")
-                .has("aai-node-type", "cloud-region")
-                .in("org.onap.relationships.inventory.BelongsTo")
-                .has("aai-node-type", "tenant")
-                .has("tenant-name", P.within(values));
-
-        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start()
-                .has("cloud-owner", "mycloudowner").has("cloud-region-id", "mycloudregionid")
-                .has("aai-node-type", "cloud-region");
-
-        assertEquals(
-                "gremlin query should be " + expected.toString(),
-                expected.toString(),
+        GraphTraversal<Vertex, Vertex> expected =
+                __.<Vertex>start().has("cloud-owner", "mycloudowner").has("cloud-region-id", "mycloudregionid")
+                        .has("aai-node-type", "cloud-region").in("org.onap.relationships.inventory.BelongsTo")
+                        .has("aai-node-type", "tenant").has("tenant-name", P.within(values));
+
+        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start().has("cloud-owner", "mycloudowner")
+                .has("cloud-region-id", "mycloudregionid").has("aai-node-type", "cloud-region");
+
+        assertEquals("gremlin query should be " + expected.toString(), expected.toString(),
                 query.getQueryBuilder().getQuery().toString());
-        assertEquals(
-                "parent gremlin query should be equal the query for cloud-region",
-                expectedParent.toString(),
+        assertEquals("parent gremlin query should be equal the query for cloud-region", expectedParent.toString(),
                 query.getQueryBuilder().getParentQuery().getQuery().toString());
-        assertEquals(
-                "result type should be cloud-region",
-                "cloud-region",
-                query.getParentResultType());
-        assertEquals(
-                "result type should be tenant",
-                "tenant",
-                query.getResultType());
-        assertEquals(
-                "container type should be empty",
-                "",
-                query.getContainerType());
-        assertEquals("dependent",true, query.isDependent());
+        assertEquals("result type should be cloud-region", "cloud-region", query.getParentResultType());
+        assertEquals("result type should be tenant", "tenant", query.getResultType());
+        assertEquals("container type should be empty", "", query.getContainerType());
+        assertEquals("dependent", true, query.isDependent());
 
     }
 
@@ -400,34 +293,19 @@ public class GraphTraversalTest extends DataLinkSetup {
         MultivaluedMap<String, String> map = new MultivaluedHashMap<>();
         map.putSingle("prov-status", "up");
         QueryParser query = dbEngine.getQueryBuilder().createQueryFromURI(uri, map);
-        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start()
-                .has("aai-node-type", "vnfc")
-                .has("prov-status", "up");
+        GraphTraversal<Vertex, Vertex> expected =
+                __.<Vertex>start().has("aai-node-type", "vnfc").has("prov-status", "up");
 
-        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start()
-                .has("aai-node-type", "vnfc");
+        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start().has("aai-node-type", "vnfc");
 
-        assertEquals(
-                "gremlin query should be " + expected.toString(),
-                expected.toString(),
+        assertEquals("gremlin query should be " + expected.toString(), expected.toString(),
                 query.getQueryBuilder().getQuery().toString());
-        assertEquals(
-                "parent",
-                expectedParent.toString(),
+        assertEquals("parent", expectedParent.toString(),
                 query.getQueryBuilder().getParentQuery().getQuery().toString());
-        assertEquals(
-                "parent result type should be empty",
-                "",
-                query.getParentResultType());
-        assertEquals(
-                "result type should be vnfc",
-                "vnfc",
-                query.getResultType());
-        assertEquals(
-                "container type should be empty",
-                "vnfcs",
-                query.getContainerType());
-        assertEquals("dependent",true, query.isDependent());
+        assertEquals("parent result type should be empty", "", query.getParentResultType());
+        assertEquals("result type should be vnfc", "vnfc", query.getResultType());
+        assertEquals("container type should be empty", "vnfcs", query.getContainerType());
+        assertEquals("dependent", true, query.isDependent());
 
     }
 
@@ -445,40 +323,21 @@ public class GraphTraversalTest extends DataLinkSetup {
         map.putSingle("cvlan-tag", "333");
         QueryParser query = dbEngine.getQueryBuilder().createQueryFromURI(uri, map);
 
-        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start()
-                .has("vnf-id", "key1").has("aai-node-type", "vce")
-                .in("org.onap.relationships.inventory.BelongsTo")
-                .has("aai-node-type", "port-group")
+        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start().has("vnf-id", "key1").has("aai-node-type", "vce")
+                .in("org.onap.relationships.inventory.BelongsTo").has("aai-node-type", "port-group")
                 .has("interface-id", "key2").in("org.onap.relationships.inventory.BelongsTo")
-                .has("aai-node-type", "cvlan-tag")
-                .has("cvlan-tag", 333);
-        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start()
-                .has("vnf-id", "key1").has("aai-node-type", "vce")
-                .in("org.onap.relationships.inventory.BelongsTo")
-                .has("aai-node-type", "port-group")
-                .has("interface-id", "key2");
-        assertEquals(
-                "gremlin query should be " + expected.toString(),
-                expected.toString(),
+                .has("aai-node-type", "cvlan-tag").has("cvlan-tag", 333);
+        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start().has("vnf-id", "key1")
+                .has("aai-node-type", "vce").in("org.onap.relationships.inventory.BelongsTo")
+                .has("aai-node-type", "port-group").has("interface-id", "key2");
+        assertEquals("gremlin query should be " + expected.toString(), expected.toString(),
                 query.getQueryBuilder().getQuery().toString());
-        assertEquals(
-                "parent gremlin query should be equal the query for port group",
-                expectedParent.toString(),
+        assertEquals("parent gremlin query should be equal the query for port group", expectedParent.toString(),
                 query.getQueryBuilder().getParentQuery().getQuery().toString());
-        assertEquals(
-                "result type should be port-group",
-                "port-group",
-                query.getParentResultType());
-        assertEquals(
-                "result type should be cvlan-tag",
-                "cvlan-tag",
-                query.getResultType());
-        assertEquals(
-                "container type should be cvlan-tags",
-                "cvlan-tags",
-                query.getContainerType());
-        assertEquals("dependent",true, query.isDependent());
-
+        assertEquals("result type should be port-group", "port-group", query.getParentResultType());
+        assertEquals("result type should be cvlan-tag", "cvlan-tag", query.getResultType());
+        assertEquals("container type should be cvlan-tags", "cvlan-tags", query.getContainerType());
+        assertEquals("dependent", true, query.isDependent());
 
     }
 
@@ -494,29 +353,18 @@ public class GraphTraversalTest extends DataLinkSetup {
 
         QueryParser query = dbEngine.getQueryBuilder().createQueryFromURI(uri);
 
-        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start()
-                .has("vnf-id", "key1").has(AAIProperties.NODE_TYPE, P.within("vce", "generic-vnf"));
+        GraphTraversal<Vertex, Vertex> expected =
+                __.<Vertex>start().has("vnf-id", "key1").has(AAIProperties.NODE_TYPE, P.within("vce", "generic-vnf"));
 
         GraphTraversal<Vertex, Vertex> expectedParent = expected;
-        assertEquals(
-                "gremlin query should be " + expected.toString(),
-                expected.toString(),
+        assertEquals("gremlin query should be " + expected.toString(), expected.toString(),
                 query.getQueryBuilder().getQuery().toString());
-        assertEquals(
-                "parent gremlin query should be equal the query for port group",
-                expectedParent.toString(),
+        assertEquals("parent gremlin query should be equal the query for port group", expectedParent.toString(),
                 query.getQueryBuilder().getParentQuery().getQuery().toString());
-        assertEquals(
-                "result type should be empty",
-                "",
-                query.getParentResultType());
-        assertEquals(
-                "result type should be vnf",
-                "vnf",
-                query.getResultType());
-
-        assertEquals("dependent",false, query.isDependent());
+        assertEquals("result type should be empty", "", query.getParentResultType());
+        assertEquals("result type should be vnf", "vnf", query.getResultType());
 
+        assertEquals("dependent", false, query.isDependent());
 
     }
 
@@ -540,30 +388,21 @@ public class GraphTraversalTest extends DataLinkSetup {
 
         QueryParser query = dbEngine.getQueryBuilder().createQueryFromURI(uri);
 
-        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start()
-                .has("vnf-id", "key1").has(AAIProperties.NODE_TYPE, P.within("vce", "generic-vnf"))
-                .union(__.in("org.onap.relationships.inventory.BelongsTo").has(AAIProperties.NODE_TYPE, "vf-module")).has("vf-module-id", "key2");
+        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start().has("vnf-id", "key1")
+                .has(AAIProperties.NODE_TYPE, P.within("vce", "generic-vnf"))
+                .union(__.in("org.onap.relationships.inventory.BelongsTo").has(AAIProperties.NODE_TYPE, "vf-module"))
+                .has("vf-module-id", "key2");
 
-        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start()
-                .has("vnf-id", "key1").has(AAIProperties.NODE_TYPE, P.within("vce", "generic-vnf"));
-        assertEquals(
-                "gremlin query should be " + expected.toString(),
-                expected.toString(),
+        GraphTraversal<Vertex, Vertex> expectedParent =
+                __.<Vertex>start().has("vnf-id", "key1").has(AAIProperties.NODE_TYPE, P.within("vce", "generic-vnf"));
+        assertEquals("gremlin query should be " + expected.toString(), expected.toString(),
                 query.getQueryBuilder().getQuery().toString());
-        assertEquals(
-                "parent gremlin query should be equal the query for ",
-                expectedParent.toString(),
+        assertEquals("parent gremlin query should be equal the query for ", expectedParent.toString(),
                 query.getQueryBuilder().getParentQuery().getQuery().toString());
-        assertEquals(
-                "result type should be vnf",
-                "vnf",
-                query.getParentResultType());
-        assertEquals(
-                "result type should be vf-module",
-                "vf-module",
-                query.getResultType());
+        assertEquals("result type should be vnf", "vnf", query.getParentResultType());
+        assertEquals("result type should be vf-module", "vf-module", query.getResultType());
 
-        assertEquals("dependent",true, query.isDependent());
+        assertEquals("dependent", true, query.isDependent());
 
     }
 
@@ -603,34 +442,19 @@ public class GraphTraversalTest extends DataLinkSetup {
         values.add("start");
         map.put("prov-status", values);
         QueryParser query = dbEngine.getQueryBuilder().createQueryFromURI(uri, map);
-        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start()
-                .has("aai-node-type", "vnfc")
-                .has("prov-status", P.within(values));
+        GraphTraversal<Vertex, Vertex> expected =
+                __.<Vertex>start().has("aai-node-type", "vnfc").has("prov-status", P.within(values));
 
-        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start()
-                .has("aai-node-type", "vnfc");
+        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start().has("aai-node-type", "vnfc");
 
-        assertEquals(
-                "gremlin query should be " + expected.toString(),
-                expected.toString(),
+        assertEquals("gremlin query should be " + expected.toString(), expected.toString(),
                 query.getQueryBuilder().getQuery().toString());
-        assertEquals(
-                "parent",
-                expectedParent.toString(),
+        assertEquals("parent", expectedParent.toString(),
                 query.getQueryBuilder().getParentQuery().getQuery().toString());
-        assertEquals(
-                "parent result type should be empty",
-                "",
-                query.getParentResultType());
-        assertEquals(
-                "result type should be vnfc",
-                "vnfc",
-                query.getResultType());
-        assertEquals(
-                "container type should be empty",
-                "vnfcs",
-                query.getContainerType());
-        assertEquals("dependent",true, query.isDependent());
+        assertEquals("parent result type should be empty", "", query.getParentResultType());
+        assertEquals("result type should be vnfc", "vnfc", query.getResultType());
+        assertEquals("container type should be empty", "vnfcs", query.getContainerType());
+        assertEquals("dependent", true, query.isDependent());
 
     }
 
@@ -640,31 +464,18 @@ public class GraphTraversalTest extends DataLinkSetup {
         MultivaluedMap<String, String> map = new MultivaluedHashMap<>();
         map.putSingle("persona-model-customization-id", "key2");
         QueryParser query = dbEngineDepthVersion.getQueryBuilder().createQueryFromURI(uri, map);
-        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start()
-                .has("aai-node-type", "generic-vnf")
-                .has("model-customization-id", "key2");
-        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start()
-                .has("aai-node-type", "generic-vnf");
-
-        assertEquals(
-                "gremlin query should be " + expected.toString(),
-                expected.toString(),
+        GraphTraversal<Vertex, Vertex> expected =
+                __.<Vertex>start().has("aai-node-type", "generic-vnf").has("model-customization-id", "key2");
+        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start().has("aai-node-type", "generic-vnf");
+
+        assertEquals("gremlin query should be " + expected.toString(), expected.toString(),
                 query.getQueryBuilder().getQuery().toString());
-        assertEquals(
-                "parent",
-                expectedParent.toString(),
+        assertEquals("parent", expectedParent.toString(),
                 query.getQueryBuilder().getParentQuery().getQuery().toString());
 
-        assertEquals(
-                "result type should be",
-                "generic-vnf",
-                query.getResultType());
-        assertEquals(
-                "result type should be empty",
-                "",
-                query.getParentResultType());
-        assertEquals("dependent",true, query.isDependent());
-
+        assertEquals("result type should be", "generic-vnf", query.getResultType());
+        assertEquals("result type should be empty", "", query.getParentResultType());
+        assertEquals("dependent", true, query.isDependent());
 
     }
 
@@ -674,30 +485,19 @@ public class GraphTraversalTest extends DataLinkSetup {
         MultivaluedMap<String, String> map = new MultivaluedHashMap<>();
         map.putSingle("global-route-target", "key2");
         QueryParser query = dbEngineDepthVersion.getQueryBuilder().createQueryFromURI(uri, map);
-        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start()
-                .has("aai-node-type", "vpn-binding")
-                .where(__.in("org.onap.relationships.inventory.BelongsTo").has(AAIProperties.NODE_TYPE, "route-target").has("global-route-target", "key2"));
-        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start()
-                .has("aai-node-type", "vpn-binding");
-
-        assertEquals(
-                "gremlin query should be " + expected.toString(),
-                expected.toString(),
+        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start().has("aai-node-type", "vpn-binding")
+                .where(__.in("org.onap.relationships.inventory.BelongsTo").has(AAIProperties.NODE_TYPE, "route-target")
+                        .has("global-route-target", "key2"));
+        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start().has("aai-node-type", "vpn-binding");
+
+        assertEquals("gremlin query should be " + expected.toString(), expected.toString(),
                 query.getQueryBuilder().getQuery().toString());
-        assertEquals(
-                "parent",
-                expectedParent.toString(),
+        assertEquals("parent", expectedParent.toString(),
                 query.getQueryBuilder().getParentQuery().getQuery().toString());
 
-        assertEquals(
-                "result type should be",
-                "vpn-binding",
-                query.getResultType());
-        assertEquals(
-                "result type should be empty",
-                "",
-                query.getParentResultType());
-        assertEquals("dependent",true, query.isDependent());
+        assertEquals("result type should be", "vpn-binding", query.getResultType());
+        assertEquals("result type should be empty", "", query.getParentResultType());
+        assertEquals("dependent", true, query.isDependent());
     }
 
     @Test
@@ -705,107 +505,70 @@ public class GraphTraversalTest extends DataLinkSetup {
         URI uri = UriBuilder.fromPath("cloud-infrastructure/complexes/complex/key1/related-to/pservers").build();
 
         QueryParser query = dbEngineDepthVersion.getQueryBuilder().createQueryFromURI(uri);
-        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start()
-                .has("physical-location-id", "key1")
-                .has("aai-node-type", "complex")
-                .in("org.onap.relationships.inventory.LocatedIn").has("aai-node-type", "pserver");
-        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start()
-                .has("physical-location-id", "key1")
-                .has("aai-node-type", "complex");
-
-        assertEquals(
-                "gremlin query should be " + expected.toString(),
-                expected.toString(),
+        GraphTraversal<Vertex, Vertex> expected =
+                __.<Vertex>start().has("physical-location-id", "key1").has("aai-node-type", "complex")
+                        .in("org.onap.relationships.inventory.LocatedIn").has("aai-node-type", "pserver");
+        GraphTraversal<Vertex, Vertex> expectedParent =
+                __.<Vertex>start().has("physical-location-id", "key1").has("aai-node-type", "complex");
+
+        assertEquals("gremlin query should be " + expected.toString(), expected.toString(),
                 query.getQueryBuilder().getQuery().toString());
-        assertEquals(
-                "parent",
-                expectedParent.toString(),
+        assertEquals("parent", expectedParent.toString(),
                 query.getQueryBuilder().getParentQuery().getQuery().toString());
 
-        assertEquals(
-                "result type should be",
-                "pserver",
-                query.getResultType());
-        assertEquals(
-                "result type should be",
-                "complex",
-                query.getParentResultType());
-        //this is controversial but we're not allowing writes on this currently
-        assertEquals("dependent",true, query.isDependent());
+        assertEquals("result type should be", "pserver", query.getResultType());
+        assertEquals("result type should be", "complex", query.getParentResultType());
+        // this is controversial but we're not allowing writes on this currently
+        assertEquals("dependent", true, query.isDependent());
     }
 
     @Test
     public void specificCousin() throws UnsupportedEncodingException, AAIException {
-        URI uri = UriBuilder.fromPath("cloud-infrastructure/complexes/complex/key1/related-to/pservers/pserver/key2").build();
+        URI uri = UriBuilder.fromPath("cloud-infrastructure/complexes/complex/key1/related-to/pservers/pserver/key2")
+                .build();
 
         QueryParser query = dbEngineDepthVersion.getQueryBuilder().createQueryFromURI(uri);
-        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start()
-                .has("physical-location-id", "key1")
-                .has("aai-node-type", "complex")
-                .in("org.onap.relationships.inventory.LocatedIn").has("aai-node-type", "pserver")
-                .has("hostname", "key2");
-        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start()
-                .has("physical-location-id", "key1")
-                .has("aai-node-type", "complex");
-
-        assertEquals(
-                "gremlin query should be " + expected.toString(),
-                expected.toString(),
+        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start().has("physical-location-id", "key1")
+                .has("aai-node-type", "complex").in("org.onap.relationships.inventory.LocatedIn")
+                .has("aai-node-type", "pserver").has("hostname", "key2");
+        GraphTraversal<Vertex, Vertex> expectedParent =
+                __.<Vertex>start().has("physical-location-id", "key1").has("aai-node-type", "complex");
+
+        assertEquals("gremlin query should be " + expected.toString(), expected.toString(),
                 query.getQueryBuilder().getQuery().toString());
-        assertEquals(
-                "parent",
-                expectedParent.toString(),
+        assertEquals("parent", expectedParent.toString(),
                 query.getQueryBuilder().getParentQuery().getQuery().toString());
 
-        assertEquals(
-                "result type should be",
-                "pserver",
-                query.getResultType());
-        assertEquals(
-                "result type should be",
-                "complex",
-                query.getParentResultType());
-        //this is controversial but we're not allowing writes on this currently
-        assertEquals("dependent",true, query.isDependent());
+        assertEquals("result type should be", "pserver", query.getResultType());
+        assertEquals("result type should be", "complex", query.getParentResultType());
+        // this is controversial but we're not allowing writes on this currently
+        assertEquals("dependent", true, query.isDependent());
     }
 
     @Test
     public void doubleSpecificCousin() throws UnsupportedEncodingException, AAIException {
-        URI uri = UriBuilder.fromPath("cloud-infrastructure/complexes/complex/key1/related-to/pservers/pserver/key2/related-to/vservers/vserver/key3").build();
+        URI uri = UriBuilder.fromPath(
+                "cloud-infrastructure/complexes/complex/key1/related-to/pservers/pserver/key2/related-to/vservers/vserver/key3")
+                .build();
 
         QueryParser query = dbEngineDepthVersion.getQueryBuilder().createQueryFromURI(uri);
-        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start()
-                .has("physical-location-id", "key1")
-                .has("aai-node-type", "complex")
-                .in("org.onap.relationships.inventory.LocatedIn").has("aai-node-type", "pserver")
-                .has("hostname", "key2")
-                .in("tosca.relationships.HostedOn").has("aai-node-type", "vserver")
-                .has("vserver-id", "key3");
-        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start()
-                .has("physical-location-id", "key1")
-                .has("aai-node-type", "complex")
-                .in("org.onap.relationships.inventory.LocatedIn").has("aai-node-type", "pserver")
-                .has("hostname", "key2");
-
-        assertEquals(
-                "gremlin query should be " + expected.toString(),
-                expected.toString(),
+        GraphTraversal<Vertex, Vertex> expected = __.<Vertex>start().has("physical-location-id", "key1")
+                .has("aai-node-type", "complex").in("org.onap.relationships.inventory.LocatedIn")
+                .has("aai-node-type", "pserver").has("hostname", "key2").in("tosca.relationships.HostedOn")
+                .has("aai-node-type", "vserver").has("vserver-id", "key3");
+        GraphTraversal<Vertex, Vertex> expectedParent = __.<Vertex>start().has("physical-location-id", "key1")
+                .has("aai-node-type", "complex").in("org.onap.relationships.inventory.LocatedIn")
+                .has("aai-node-type", "pserver").has("hostname", "key2");
+
+        assertEquals("gremlin query should be " + expected.toString(), expected.toString(),
                 query.getQueryBuilder().getQuery().toString());
-        assertEquals(
-                "parent",
-                expectedParent.toString(),
+        assertEquals("parent", expectedParent.toString(),
                 query.getQueryBuilder().getParentQuery().getQuery().toString());
 
-        assertEquals(
-                "result type should be",
-                "vserver",
-                query.getResultType());
-        assertEquals(
-                "result type should be",
-                "pserver",
-                query.getParentResultType());
-        //this is controversial but we're not allowing writes on this currently
-        assertEquals("dependent",true, query.isDependent());
+        assertEquals("result type should be", "vserver", query.getResultType());
+        assertEquals("result type should be", "pserver", query.getParentResultType());
+        // this is controversial but we're not allowing writes on this currently
+        assertEquals("dependent", true, query.isDependent());
     }
 
     @Test