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

[aai/aai-common.git] / aai-core / src / test / java / org / onap / aai / serialization / db / DbSerializerDeltasTest.java

diff --git a/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializerDeltasTest.java b/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializerDeltasTest.java
index de8f222..b8d3f75 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializerDeltasTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializerDeltasTest.java
@@ -20,9 +20,18 @@
 
 package org.onap.aai.serialization.db;
 
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.junit.Assert.*;
+
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.*;
+
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.janusgraph.core.JanusGraphFactory;
@@ -50,19 +59,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.TestPropertySource;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.*;
-
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.*;
-
 @RunWith(value = Parameterized.class)
 @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
-@TestPropertySource(properties = {
-    "delta.events.enabled=true",
-    })
+@TestPropertySource(properties = {"delta.events.enabled=true",})
 public class DbSerializerDeltasTest extends AAISetup {
 
     // to use, set thrown.expect to whatever your test needs
@@ -110,27 +109,27 @@ public class DbSerializerDeltasTest extends AAISetup {
     public void createTopLevelThenUpdateTest() throws AAIException, UnsupportedEncodingException, URISyntaxException {
         engine.startTransaction();
 
-        DBSerializer dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "AAI-TEST", AAIProperties.MINIMUM_DEPTH);
+        DBSerializer dbserLocal =
+                new DBSerializer(version, engine, introspectorFactoryType, "AAI-TEST", AAIProperties.MINIMUM_DEPTH);
         Introspector gvnf = loader.introspectorFromName("generic-vnf");
         Vertex gvnfVert = dbserLocal.createNewVertex(gvnf);
         QueryParser uriQuery =
-            dbEngine.getQueryBuilder().createQueryFromURI(new URI("/network/generic-vnfs/generic-vnf/myvnf"));
+                dbEngine.getQueryBuilder().createQueryFromURI(new URI("/network/generic-vnfs/generic-vnf/myvnf"));
 
         gvnf.setValue("vnf-id", "myvnf");
         gvnf.setValue("vnf-type", "typo");
         dbserLocal.serializeToDb(gvnf, gvnfVert, uriQuery, "generic-vnf", gvnf.marshal(false));
-        assertTrue("Original created vertex exists", engine.tx().traversal().V()
-            .has("aai-node-type", "generic-vnf")
-            .has("vnf-id", "myvnf")
-            .has("vnf-type", "typo")
-            .hasNext());
-
-
-        assertEquals(DeltaAction.CREATE, dbserLocal.getObjectDeltas().get("/network/generic-vnfs/generic-vnf/myvnf").getAction());
-        assertEquals(4L, dbserLocal.getObjectDeltas().get("/network/generic-vnfs/generic-vnf/myvnf").getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
-        assertEquals(5L, dbserLocal.getObjectDeltas().get("/network/generic-vnfs/generic-vnf/myvnf").getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
+        assertTrue("Original created vertex exists", engine.tx().traversal().V().has("aai-node-type", "generic-vnf")
+                .has("vnf-id", "myvnf").has("vnf-type", "typo").hasNext());
+
+        assertEquals(DeltaAction.CREATE,
+                dbserLocal.getObjectDeltas().get("/network/generic-vnfs/generic-vnf/myvnf").getAction());
+        assertEquals(4L, dbserLocal.getObjectDeltas().get("/network/generic-vnfs/generic-vnf/myvnf").getPropertyDeltas()
+                .values().stream().filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
+        assertEquals(5L, dbserLocal.getObjectDeltas().get("/network/generic-vnfs/generic-vnf/myvnf").getPropertyDeltas()
+                .values().stream().filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
         dbserLocal.getObjectDeltas().values().forEach(od -> {
-            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID) ) {
+            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID)) {
                 fail(od.getUri() + " is missing " + AAIProperties.AAI_UUID);
             } else if (od.getPropertyDeltas().get(AAIProperties.AAI_UUID) == null) {
                 fail(od.getUri() + " " + AAIProperties.AAI_UUID + " is null");
@@ -141,20 +140,20 @@ public class DbSerializerDeltasTest extends AAISetup {
 
         gvnf = dbserLocal.getLatestVersionView(gvnfVert);
         gvnf.setValue("vnf-type", "new-typo");
-        dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "AAI-TEST", AAIProperties.MINIMUM_DEPTH);
+        dbserLocal =
+                new DBSerializer(version, engine, introspectorFactoryType, "AAI-TEST", AAIProperties.MINIMUM_DEPTH);
         dbserLocal.serializeToDb(gvnf, gvnfVert, uriQuery, "generic-vnf", gvnf.marshal(false));
-        assertTrue("Vertex is updated", engine.tx().traversal().V()
-            .has("aai-node-type", "generic-vnf")
-            .has("vnf-id", "myvnf")
-            .has("vnf-type", "new-typo")
-            .hasNext());
-
-
-        assertEquals(DeltaAction.UPDATE, dbserLocal.getObjectDeltas().get("/network/generic-vnfs/generic-vnf/myvnf").getAction());
-        assertEquals(4L, dbserLocal.getObjectDeltas().get("/network/generic-vnfs/generic-vnf/myvnf").getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
-        assertEquals(4L, dbserLocal.getObjectDeltas().get("/network/generic-vnfs/generic-vnf/myvnf").getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.UPDATE)).count());
+        assertTrue("Vertex is updated", engine.tx().traversal().V().has("aai-node-type", "generic-vnf")
+                .has("vnf-id", "myvnf").has("vnf-type", "new-typo").hasNext());
+
+        assertEquals(DeltaAction.UPDATE,
+                dbserLocal.getObjectDeltas().get("/network/generic-vnfs/generic-vnf/myvnf").getAction());
+        assertEquals(4L, dbserLocal.getObjectDeltas().get("/network/generic-vnfs/generic-vnf/myvnf").getPropertyDeltas()
+                .values().stream().filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
+        assertEquals(4L, dbserLocal.getObjectDeltas().get("/network/generic-vnfs/generic-vnf/myvnf").getPropertyDeltas()
+                .values().stream().filter(d -> d.getAction().equals(DeltaAction.UPDATE)).count());
         dbserLocal.getObjectDeltas().values().forEach(od -> {
-            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID) ) {
+            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID)) {
                 fail(od.getUri() + " is missing " + AAIProperties.AAI_UUID);
             } else if (od.getPropertyDeltas().get(AAIProperties.AAI_UUID) == null) {
                 fail(od.getUri() + " " + AAIProperties.AAI_UUID + " is null");
@@ -165,31 +164,30 @@ public class DbSerializerDeltasTest extends AAISetup {
     }
 
     @Test
-    public void createTopLevelThenCreateChildTest() throws AAIException, UnsupportedEncodingException, URISyntaxException {
+    public void createTopLevelThenCreateChildTest()
+            throws AAIException, UnsupportedEncodingException, URISyntaxException {
         engine.startTransaction();
 
-        DBSerializer dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "AAI-TEST", AAIProperties.MINIMUM_DEPTH);
+        DBSerializer dbserLocal =
+                new DBSerializer(version, engine, introspectorFactoryType, "AAI-TEST", AAIProperties.MINIMUM_DEPTH);
         Introspector gvnf = loader.introspectorFromName("generic-vnf");
         Vertex gvnfVert = dbserLocal.createNewVertex(gvnf);
         final String vnfUri = "/network/generic-vnfs/generic-vnf/myvnf";
-        QueryParser uriQuery =
-            dbEngine.getQueryBuilder().createQueryFromURI(new URI(vnfUri));
+        QueryParser uriQuery = dbEngine.getQueryBuilder().createQueryFromURI(new URI(vnfUri));
 
         gvnf.setValue("vnf-id", "myvnf");
         gvnf.setValue("vnf-type", "typo");
         dbserLocal.serializeToDb(gvnf, gvnfVert, uriQuery, "generic-vnf", gvnf.marshal(false));
-        assertTrue("Original created vertex exists", engine.tx().traversal().V()
-            .has("aai-node-type", "generic-vnf")
-            .has("vnf-id", "myvnf")
-            .has("vnf-type", "typo")
-            .hasNext());
-
+        assertTrue("Original created vertex exists", engine.tx().traversal().V().has("aai-node-type", "generic-vnf")
+                .has("vnf-id", "myvnf").has("vnf-type", "typo").hasNext());
 
         assertEquals(DeltaAction.CREATE, dbserLocal.getObjectDeltas().get(vnfUri).getAction());
-        assertEquals(4L, dbserLocal.getObjectDeltas().get(vnfUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
-        assertEquals(5L, dbserLocal.getObjectDeltas().get(vnfUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
+        assertEquals(4L, dbserLocal.getObjectDeltas().get(vnfUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
+        assertEquals(5L, dbserLocal.getObjectDeltas().get(vnfUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
         dbserLocal.getObjectDeltas().values().forEach(od -> {
-            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID) ) {
+            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID)) {
                 fail(od.getUri() + " is missing " + AAIProperties.AAI_UUID);
             } else if (od.getPropertyDeltas().get(AAIProperties.AAI_UUID) == null) {
                 fail(od.getUri() + " " + AAIProperties.AAI_UUID + " is null");
@@ -198,7 +196,8 @@ public class DbSerializerDeltasTest extends AAISetup {
             }
         });
 
-        dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "AAI-TEST", AAIProperties.MINIMUM_DEPTH);
+        dbserLocal =
+                new DBSerializer(version, engine, introspectorFactoryType, "AAI-TEST", AAIProperties.MINIMUM_DEPTH);
         Introspector vf = loader.introspectorFromName("vf-module");
         Vertex vfVertex = dbserLocal.createNewVertex(vf);
         final String vfUri = "/network/generic-vnfs/generic-vnf/myvnf/vf-modules/vf-module/myvf";
@@ -206,24 +205,19 @@ public class DbSerializerDeltasTest extends AAISetup {
 
         vf.setValue("vf-module-id", "myvf");
         dbserLocal.serializeToDb(vf, vfVertex, uriQuery, "vf-module", vf.marshal(false));
-        assertTrue("Vertex is creted", engine.tx().traversal().V()
-            .has("aai-node-type", "vf-module")
-            .has("vf-module-id", "myvf")
-            .hasNext());
-        assertTrue("Vf module has edge to gvnf", engine.tx().traversal().V()
-            .has("aai-node-type", "vf-module")
-            .has("vf-module-id", "myvf")
-            .both()
-            .has("aai-node-type", "generic-vnf")
-            .has("vnf-id", "myvnf")
-            .hasNext());
-
+        assertTrue("Vertex is creted",
+                engine.tx().traversal().V().has("aai-node-type", "vf-module").has("vf-module-id", "myvf").hasNext());
+        assertTrue("Vf module has edge to gvnf",
+                engine.tx().traversal().V().has("aai-node-type", "vf-module").has("vf-module-id", "myvf").both()
+                        .has("aai-node-type", "generic-vnf").has("vnf-id", "myvnf").hasNext());
 
         assertEquals(DeltaAction.CREATE, dbserLocal.getObjectDeltas().get(vfUri).getAction());
-        assertEquals(4L, dbserLocal.getObjectDeltas().get(vfUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
-        assertEquals(4L, dbserLocal.getObjectDeltas().get(vfUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
+        assertEquals(4L, dbserLocal.getObjectDeltas().get(vfUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
+        assertEquals(4L, dbserLocal.getObjectDeltas().get(vfUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
         dbserLocal.getObjectDeltas().values().forEach(od -> {
-            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID) ) {
+            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID)) {
                 fail(od.getUri() + " is missing " + AAIProperties.AAI_UUID);
             } else if (od.getPropertyDeltas().get(AAIProperties.AAI_UUID) == null) {
                 fail(od.getUri() + " " + AAIProperties.AAI_UUID + " is null");
@@ -234,15 +228,16 @@ public class DbSerializerDeltasTest extends AAISetup {
     }
 
     @Test
-    public void createTopWithChildThenDeleteTopTest() throws AAIException, UnsupportedEncodingException, URISyntaxException {
+    public void createTopWithChildThenDeleteTopTest()
+            throws AAIException, UnsupportedEncodingException, URISyntaxException {
         engine.startTransaction();
 
-        DBSerializer dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "AAI-TEST", AAIProperties.MINIMUM_DEPTH);
+        DBSerializer dbserLocal =
+                new DBSerializer(version, engine, introspectorFactoryType, "AAI-TEST", AAIProperties.MINIMUM_DEPTH);
         Introspector gvnf = loader.introspectorFromName("generic-vnf");
         Vertex gvnfVert = dbserLocal.createNewVertex(gvnf);
         final String vnfUri = "/network/generic-vnfs/generic-vnf/myvnf";
-        QueryParser uriQuery =
-            dbEngine.getQueryBuilder().createQueryFromURI(new URI(vnfUri));
+        QueryParser uriQuery = dbEngine.getQueryBuilder().createQueryFromURI(new URI(vnfUri));
 
         gvnf.setValue("vnf-id", "myvnf");
         gvnf.setValue("vnf-type", "typo");
@@ -260,32 +255,28 @@ public class DbSerializerDeltasTest extends AAISetup {
         Gson gson = new GsonBuilder().create();
         System.out.println(gson.toJsonTree(dbserLocal.getObjectDeltas().values()));
 
-        assertTrue("Original created vertex exists", engine.tx().traversal().V()
-            .has("aai-node-type", "generic-vnf")
-            .has("vnf-id", "myvnf")
-            .has("vnf-type", "typo")
-            .hasNext());
-        assertTrue("Vertex is creted", engine.tx().traversal().V()
-            .has("aai-node-type", "vf-module")
-            .has("vf-module-id", "myvf")
-            .hasNext());
-        assertTrue("Vf module has edge to gvnf", engine.tx().traversal().V()
-            .has("aai-node-type", "vf-module")
-            .has("vf-module-id", "myvf")
-            .both()
-            .has("aai-node-type", "generic-vnf")
-            .has("vnf-id", "myvnf")
-            .hasNext());
+        assertTrue("Original created vertex exists", engine.tx().traversal().V().has("aai-node-type", "generic-vnf")
+                .has("vnf-id", "myvnf").has("vnf-type", "typo").hasNext());
+        assertTrue("Vertex is creted",
+                engine.tx().traversal().V().has("aai-node-type", "vf-module").has("vf-module-id", "myvf").hasNext());
+        assertTrue("Vf module has edge to gvnf",
+                engine.tx().traversal().V().has("aai-node-type", "vf-module").has("vf-module-id", "myvf").both()
+                        .has("aai-node-type", "generic-vnf").has("vnf-id", "myvnf").hasNext());
 
         assertEquals(DeltaAction.CREATE, dbserLocal.getObjectDeltas().get(vnfUri).getAction());
-        assertEquals(4L, dbserLocal.getObjectDeltas().get(vnfUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
-        assertEquals(5L, dbserLocal.getObjectDeltas().get(vnfUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
+        assertEquals(4L, dbserLocal.getObjectDeltas().get(vnfUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
+        assertEquals(5L, dbserLocal.getObjectDeltas().get(vnfUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
         assertEquals(DeltaAction.CREATE, dbserLocal.getObjectDeltas().get(vfUri).getAction());
-        assertEquals(4L, dbserLocal.getObjectDeltas().get(vfUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
-        assertEquals(4L, dbserLocal.getObjectDeltas().get(vfUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
-        assertEquals(1L, dbserLocal.getObjectDeltas().get(vfUri).getRelationshipDeltas().stream().filter(d -> d.getAction().equals(DeltaAction.CREATE_REL)).count());
+        assertEquals(4L, dbserLocal.getObjectDeltas().get(vfUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
+        assertEquals(4L, dbserLocal.getObjectDeltas().get(vfUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
+        assertEquals(1L, dbserLocal.getObjectDeltas().get(vfUri).getRelationshipDeltas().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.CREATE_REL)).count());
         dbserLocal.getObjectDeltas().values().forEach(od -> {
-            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID) ) {
+            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID)) {
                 fail(od.getUri() + " is missing " + AAIProperties.AAI_UUID);
             } else if (od.getPropertyDeltas().get(AAIProperties.AAI_UUID) == null) {
                 fail(od.getUri() + " " + AAIProperties.AAI_UUID + " is null");
@@ -294,36 +285,37 @@ public class DbSerializerDeltasTest extends AAISetup {
             }
         });
 
-        dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "AAI-TEST", AAIProperties.MINIMUM_DEPTH);
+        dbserLocal =
+                new DBSerializer(version, engine, introspectorFactoryType, "AAI-TEST", AAIProperties.MINIMUM_DEPTH);
         gvnf = dbserLocal.getLatestVersionView(gvnfVert);
         String rv = gvnf.getValue(AAIProperties.RESOURCE_VERSION);
         dbserLocal.delete(engine.tx().traversal().V(gvnfVert).next(), rv, true);
         System.out.println(gson.toJsonTree(dbserLocal.getObjectDeltas().values()));
 
-        assertFalse("generic-vnf no longer exists", engine.tx().traversal().V()
-            .has("aai-node-type", "generic-vnf")
-            .hasNext());
-        assertFalse("vf-module no longer exists", engine.tx().traversal().V()
-            .has("aai-node-type", "vf-module")
-            .hasNext());
+        assertFalse("generic-vnf no longer exists",
+                engine.tx().traversal().V().has("aai-node-type", "generic-vnf").hasNext());
+        assertFalse("vf-module no longer exists",
+                engine.tx().traversal().V().has("aai-node-type", "vf-module").hasNext());
 
         assertEquals(DeltaAction.DELETE, dbserLocal.getObjectDeltas().get(vnfUri).getAction());
-        assertEquals(12L, dbserLocal.getObjectDeltas().get(vnfUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.DELETE)).count());assertEquals(DeltaAction.DELETE, dbserLocal.getObjectDeltas().get(vfUri).getAction());
-        assertEquals(11L, dbserLocal.getObjectDeltas().get(vfUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.DELETE)).count());
+        assertEquals(12L, dbserLocal.getObjectDeltas().get(vnfUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.DELETE)).count());
+        assertEquals(DeltaAction.DELETE, dbserLocal.getObjectDeltas().get(vfUri).getAction());
+        assertEquals(11L, dbserLocal.getObjectDeltas().get(vfUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.DELETE)).count());
     }
 
-
-
     @Test
-    public void createComplexPserverWithRelDeleteRel() throws AAIException, UnsupportedEncodingException, URISyntaxException {
+    public void createComplexPserverWithRelDeleteRel()
+            throws AAIException, UnsupportedEncodingException, URISyntaxException {
         engine.startTransaction();
 
-        DBSerializer dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "AAI-TEST", AAIProperties.MINIMUM_DEPTH);
+        DBSerializer dbserLocal =
+                new DBSerializer(version, engine, introspectorFactoryType, "AAI-TEST", AAIProperties.MINIMUM_DEPTH);
         Introspector complex = loader.introspectorFromName("complex");
         Vertex complexV = dbserLocal.createNewVertex(complex);
         final String complexUri = "/cloud-infrastructure/complexes/complex/c-id";
-        QueryParser uriQuery =
-            dbEngine.getQueryBuilder().createQueryFromURI(new URI(complexUri));
+        QueryParser uriQuery = dbEngine.getQueryBuilder().createQueryFromURI(new URI(complexUri));
 
         complex.setValue("physical-location-id", "c-id");
         complex.setValue("physical-location-type", "type");
@@ -333,17 +325,16 @@ public class DbSerializerDeltasTest extends AAISetup {
         complex.setValue("country", "abc");
         complex.setValue("region", "ef");
         dbserLocal.serializeToDb(complex, complexV, uriQuery, "complex", complex.marshal(false));
-        assertTrue("Complex created", engine.tx().traversal().V()
-            .has("aai-node-type", "complex")
-            .has("physical-location-id", "c-id")
-            .hasNext());
-
+        assertTrue("Complex created", engine.tx().traversal().V().has("aai-node-type", "complex")
+                .has("physical-location-id", "c-id").hasNext());
 
         assertEquals(DeltaAction.CREATE, dbserLocal.getObjectDeltas().get(complexUri).getAction());
-        assertEquals(4L, dbserLocal.getObjectDeltas().get(complexUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
-        assertEquals(10L, dbserLocal.getObjectDeltas().get(complexUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
+        assertEquals(4L, dbserLocal.getObjectDeltas().get(complexUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
+        assertEquals(10L, dbserLocal.getObjectDeltas().get(complexUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
         dbserLocal.getObjectDeltas().values().forEach(od -> {
-            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID) ) {
+            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID)) {
                 fail(od.getUri() + " is missing " + AAIProperties.AAI_UUID);
             } else if (od.getPropertyDeltas().get(AAIProperties.AAI_UUID) == null) {
                 fail(od.getUri() + " " + AAIProperties.AAI_UUID + " is null");
@@ -352,13 +343,12 @@ public class DbSerializerDeltasTest extends AAISetup {
             }
         });
 
-
-        dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "AAI-TEST", AAIProperties.MINIMUM_DEPTH);
+        dbserLocal =
+                new DBSerializer(version, engine, introspectorFactoryType, "AAI-TEST", AAIProperties.MINIMUM_DEPTH);
         Introspector pserver = loader.introspectorFromName("pserver");
         Vertex pserverV = dbserLocal.createNewVertex(pserver);
         final String pserverUri = "/cloud-infrastructure/pservers/pserver/ps";
-        uriQuery =
-            dbEngine.getQueryBuilder().createQueryFromURI(new URI(pserverUri));
+        uriQuery = dbEngine.getQueryBuilder().createQueryFromURI(new URI(pserverUri));
 
         Introspector relationship = loader.introspectorFromName("relationship");
         relationship.setValue("related-to", "complex");
@@ -372,25 +362,20 @@ public class DbSerializerDeltasTest extends AAISetup {
         System.out.println(pserver.marshal(true));
 
         dbserLocal.serializeToDb(pserver, pserverV, uriQuery, "pserver", pserver.marshal(false));
-        assertTrue("Pserver created", engine.tx().traversal().V()
-            .has("aai-node-type", "pserver")
-            .has("hostname", "ps")
-            .hasNext());
-        assertTrue("Pserver has edge to complex", engine.tx().traversal().V()
-            .has("aai-node-type", "pserver")
-            .has("hostname", "ps")
-            .bothE()
-            .otherV()
-            .has("aai-node-type", "complex")
-            .hasNext());
-
+        assertTrue("Pserver created",
+                engine.tx().traversal().V().has("aai-node-type", "pserver").has("hostname", "ps").hasNext());
+        assertTrue("Pserver has edge to complex", engine.tx().traversal().V().has("aai-node-type", "pserver")
+                .has("hostname", "ps").bothE().otherV().has("aai-node-type", "complex").hasNext());
 
         assertEquals(DeltaAction.CREATE, dbserLocal.getObjectDeltas().get(pserverUri).getAction());
-        assertEquals(4L, dbserLocal.getObjectDeltas().get(pserverUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
-        assertEquals(4L, dbserLocal.getObjectDeltas().get(pserverUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
-        assertEquals(1L, dbserLocal.getObjectDeltas().get(pserverUri).getRelationshipDeltas().stream().filter(d -> d.getAction().equals(DeltaAction.CREATE_REL)).count());
+        assertEquals(4L, dbserLocal.getObjectDeltas().get(pserverUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
+        assertEquals(4L, dbserLocal.getObjectDeltas().get(pserverUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
+        assertEquals(1L, dbserLocal.getObjectDeltas().get(pserverUri).getRelationshipDeltas().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.CREATE_REL)).count());
         dbserLocal.getObjectDeltas().values().forEach(od -> {
-            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID) ) {
+            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID)) {
                 fail(od.getUri() + " is missing " + AAIProperties.AAI_UUID);
             } else if (od.getPropertyDeltas().get(AAIProperties.AAI_UUID) == null) {
                 fail(od.getUri() + " " + AAIProperties.AAI_UUID + " is null");
@@ -399,25 +384,22 @@ public class DbSerializerDeltasTest extends AAISetup {
             }
         });
 
-
-        dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "AAI-TEST", AAIProperties.MINIMUM_DEPTH);
+        dbserLocal =
+                new DBSerializer(version, engine, introspectorFactoryType, "AAI-TEST", AAIProperties.MINIMUM_DEPTH);
         dbserLocal.touchStandardVertexProperties(pserverV, false);
         dbserLocal.deleteEdge(relationship, pserverV);
-        assertFalse("Pserver no longer has edge to complex", engine.tx().traversal().V()
-            .has("aai-node-type", "pserver")
-            .has("hostname", "ps")
-            .bothE()
-            .otherV()
-            .has("aai-node-type", "complex")
-            .hasNext());
-
+        assertFalse("Pserver no longer has edge to complex", engine.tx().traversal().V().has("aai-node-type", "pserver")
+                .has("hostname", "ps").bothE().otherV().has("aai-node-type", "complex").hasNext());
 
         assertEquals(DeltaAction.UPDATE, dbserLocal.getObjectDeltas().get(pserverUri).getAction());
-        assertEquals(4L, dbserLocal.getObjectDeltas().get(pserverUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
-        assertEquals(3L, dbserLocal.getObjectDeltas().get(pserverUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.UPDATE)).count());
-        assertEquals(1L, dbserLocal.getObjectDeltas().get(pserverUri).getRelationshipDeltas().stream().filter(d -> d.getAction().equals(DeltaAction.DELETE_REL)).count());
+        assertEquals(4L, dbserLocal.getObjectDeltas().get(pserverUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
+        assertEquals(3L, dbserLocal.getObjectDeltas().get(pserverUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.UPDATE)).count());
+        assertEquals(1L, dbserLocal.getObjectDeltas().get(pserverUri).getRelationshipDeltas().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.DELETE_REL)).count());
         dbserLocal.getObjectDeltas().values().forEach(od -> {
-            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID) ) {
+            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID)) {
                 fail(od.getUri() + " is missing " + AAIProperties.AAI_UUID);
             } else if (od.getPropertyDeltas().get(AAIProperties.AAI_UUID) == null) {
                 fail(od.getUri() + " " + AAIProperties.AAI_UUID + " is null");
@@ -428,19 +410,18 @@ public class DbSerializerDeltasTest extends AAISetup {
     }
 
     @Test
-    public void createComplexPserverWithRelUpdatePserverToDeleteRelAddPinterfaceThenDeleteComplex() throws AAIException, UnsupportedEncodingException, URISyntaxException {
+    public void createComplexPserverWithRelUpdatePserverToDeleteRelAddPinterfaceThenDeleteComplex()
+            throws AAIException, UnsupportedEncodingException, URISyntaxException {
         engine.startTransaction();
 
-        Gson gson = new GsonBuilder()
-            .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_DASHES)
-            .create();
+        Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_DASHES).create();
 
-        DBSerializer dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "create-complex", AAIProperties.MINIMUM_DEPTH);
+        DBSerializer dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "create-complex",
+                AAIProperties.MINIMUM_DEPTH);
         Introspector complex = loader.introspectorFromName("complex");
         Vertex complexV = dbserLocal.createNewVertex(complex);
         final String complexUri = "/cloud-infrastructure/complexes/complex/c-id-b";
-        QueryParser uriQuery =
-            dbEngine.getQueryBuilder().createQueryFromURI(new URI(complexUri));
+        QueryParser uriQuery = dbEngine.getQueryBuilder().createQueryFromURI(new URI(complexUri));
 
         complex.setValue("physical-location-id", "c-id-b");
         complex.setValue("physical-location-type", "type");
@@ -454,15 +435,15 @@ public class DbSerializerDeltasTest extends AAISetup {
         System.out.println("Create Complex");
         System.out.println(gson.toJsonTree(dbserLocal.getObjectDeltas().values()));
 
-        assertTrue("Complex created", engine.tx().traversal().V()
-            .has("aai-node-type", "complex")
-            .has("physical-location-id", "c-id-b")
-            .hasNext());
+        assertTrue("Complex created", engine.tx().traversal().V().has("aai-node-type", "complex")
+                .has("physical-location-id", "c-id-b").hasNext());
         assertEquals(DeltaAction.CREATE, dbserLocal.getObjectDeltas().get(complexUri).getAction());
-        assertEquals(4L, dbserLocal.getObjectDeltas().get(complexUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
-        assertEquals(10L, dbserLocal.getObjectDeltas().get(complexUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
+        assertEquals(4L, dbserLocal.getObjectDeltas().get(complexUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
+        assertEquals(10L, dbserLocal.getObjectDeltas().get(complexUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
         dbserLocal.getObjectDeltas().values().forEach(od -> {
-            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID) ) {
+            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID)) {
                 fail(od.getUri() + " is missing " + AAIProperties.AAI_UUID);
             } else if (od.getPropertyDeltas().get(AAIProperties.AAI_UUID) == null) {
                 fail(od.getUri() + " " + AAIProperties.AAI_UUID + " is null");
@@ -471,13 +452,12 @@ public class DbSerializerDeltasTest extends AAISetup {
             }
         });
 
-
-        dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "create-pserver", AAIProperties.MINIMUM_DEPTH);
+        dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "create-pserver",
+                AAIProperties.MINIMUM_DEPTH);
         Introspector pserver = loader.introspectorFromName("pserver");
         Vertex pserverV = dbserLocal.createNewVertex(pserver);
         final String pserverUri = "/cloud-infrastructure/pservers/pserver/ps-b";
-        uriQuery =
-            dbEngine.getQueryBuilder().createQueryFromURI(new URI(pserverUri));
+        uriQuery = dbEngine.getQueryBuilder().createQueryFromURI(new URI(pserverUri));
 
         Introspector relationship = loader.introspectorFromName("relationship");
         relationship.setValue("related-to", "complex");
@@ -502,35 +482,29 @@ public class DbSerializerDeltasTest extends AAISetup {
         System.out.println("Create Pserver with pinterface and relationship to complex ");
         System.out.println(gson.toJsonTree(dbserLocal.getObjectDeltas().values()));
 
-        assertTrue("Pserver created", engine.tx().traversal().V()
-            .has("aai-node-type", "pserver")
-            .has("hostname", "ps-b")
-            .hasNext());
-        assertTrue("Pserver has edge to complex", engine.tx().traversal().V()
-            .has("aai-node-type", "pserver")
-            .has("hostname", "ps-b")
-            .bothE()
-            .otherV()
-            .has("aai-node-type", "complex")
-            .hasNext());
-        assertTrue("Pserver has edge to pinterface", engine.tx().traversal().V()
-            .has("aai-node-type", "pserver")
-            .has("hostname", "ps-b")
-            .bothE()
-            .otherV()
-            .has("aai-node-type", "p-interface")
-            .hasNext());
+        assertTrue("Pserver created",
+                engine.tx().traversal().V().has("aai-node-type", "pserver").has("hostname", "ps-b").hasNext());
+        assertTrue("Pserver has edge to complex", engine.tx().traversal().V().has("aai-node-type", "pserver")
+                .has("hostname", "ps-b").bothE().otherV().has("aai-node-type", "complex").hasNext());
+        assertTrue("Pserver has edge to pinterface", engine.tx().traversal().V().has("aai-node-type", "pserver")
+                .has("hostname", "ps-b").bothE().otherV().has("aai-node-type", "p-interface").hasNext());
 
         assertEquals(DeltaAction.CREATE, dbserLocal.getObjectDeltas().get(pserverUri).getAction());
-        assertEquals(4L, dbserLocal.getObjectDeltas().get(pserverUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
-        assertEquals(5L, dbserLocal.getObjectDeltas().get(pserverUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
-        assertEquals(1L, dbserLocal.getObjectDeltas().get(pserverUri).getRelationshipDeltas().stream().filter(d -> d.getAction().equals(DeltaAction.CREATE_REL)).count());
+        assertEquals(4L, dbserLocal.getObjectDeltas().get(pserverUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
+        assertEquals(5L, dbserLocal.getObjectDeltas().get(pserverUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
+        assertEquals(1L, dbserLocal.getObjectDeltas().get(pserverUri).getRelationshipDeltas().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.CREATE_REL)).count());
         assertEquals(DeltaAction.CREATE, dbserLocal.getObjectDeltas().get(pintUri).getAction());
-        assertEquals(4L, dbserLocal.getObjectDeltas().get(pintUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
-        assertEquals(4L, dbserLocal.getObjectDeltas().get(pintUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
-        assertEquals(1L, dbserLocal.getObjectDeltas().get(pintUri).getRelationshipDeltas().stream().filter(d -> d.getAction().equals(DeltaAction.CREATE_REL)).count());
+        assertEquals(4L, dbserLocal.getObjectDeltas().get(pintUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
+        assertEquals(4L, dbserLocal.getObjectDeltas().get(pintUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
+        assertEquals(1L, dbserLocal.getObjectDeltas().get(pintUri).getRelationshipDeltas().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.CREATE_REL)).count());
         dbserLocal.getObjectDeltas().values().forEach(od -> {
-            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID) ) {
+            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID)) {
                 fail(od.getUri() + " is missing " + AAIProperties.AAI_UUID);
             } else if (od.getPropertyDeltas().get(AAIProperties.AAI_UUID) == null) {
                 fail(od.getUri() + " " + AAIProperties.AAI_UUID + " is null");
@@ -539,7 +513,8 @@ public class DbSerializerDeltasTest extends AAISetup {
             }
         });
 
-        dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "update-pserver", AAIProperties.MINIMUM_DEPTH);
+        dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "update-pserver",
+                AAIProperties.MINIMUM_DEPTH);
         pserver = dbserLocal.getLatestVersionView(pserverV);
         relationshipList = loader.introspectorFromName("relationship-list");
         relationshipList.setValue("relationship", Collections.emptyList());
@@ -552,21 +527,19 @@ public class DbSerializerDeltasTest extends AAISetup {
         System.out.println("Update pserver removing relationship to complex");
         System.out.println(gson.toJsonTree(dbserLocal.getObjectDeltas().values()));
 
-        assertFalse("Pserver no longer has edge to complex", engine.tx().traversal().V()
-            .has("aai-node-type", "pserver")
-            .has("hostname", "ps-b")
-            .bothE()
-            .otherV()
-            .has("aai-node-type", "complex")
-            .hasNext());
+        assertFalse("Pserver no longer has edge to complex", engine.tx().traversal().V().has("aai-node-type", "pserver")
+                .has("hostname", "ps-b").bothE().otherV().has("aai-node-type", "complex").hasNext());
 
         assertEquals(DeltaAction.UPDATE, dbserLocal.getObjectDeltas().get(pserverUri).getAction());
-        assertEquals(4L, dbserLocal.getObjectDeltas().get(pserverUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
-        assertEquals(4L, dbserLocal.getObjectDeltas().get(pserverUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.UPDATE)).count());
-        assertEquals(1L, dbserLocal.getObjectDeltas().get(pserverUri).getRelationshipDeltas().stream().filter(d -> d.getAction().equals(DeltaAction.DELETE_REL)).count());
+        assertEquals(4L, dbserLocal.getObjectDeltas().get(pserverUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
+        assertEquals(4L, dbserLocal.getObjectDeltas().get(pserverUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.UPDATE)).count());
+        assertEquals(1L, dbserLocal.getObjectDeltas().get(pserverUri).getRelationshipDeltas().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.DELETE_REL)).count());
         assertFalse(dbserLocal.getObjectDeltas().containsKey(pintUri));
         dbserLocal.getObjectDeltas().values().forEach(od -> {
-            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID) ) {
+            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID)) {
                 fail(od.getUri() + " is missing " + AAIProperties.AAI_UUID);
             } else if (od.getPropertyDeltas().get(AAIProperties.AAI_UUID) == null) {
                 fail(od.getUri() + " " + AAIProperties.AAI_UUID + " is null");
@@ -575,7 +548,8 @@ public class DbSerializerDeltasTest extends AAISetup {
             }
         });
 
-        dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "delete-pserver", AAIProperties.MINIMUM_DEPTH);
+        dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "delete-pserver",
+                AAIProperties.MINIMUM_DEPTH);
         pserver = dbserLocal.getLatestVersionView(pserverV);
         String rv = pserver.getValue(AAIProperties.RESOURCE_VERSION);
         dbserLocal.delete(engine.tx().traversal().V(pserverV).next(), rv, true);
@@ -583,16 +557,16 @@ public class DbSerializerDeltasTest extends AAISetup {
         System.out.println("Delete pserver");
         System.out.println(gson.toJsonTree(dbserLocal.getObjectDeltas().values()));
 
-        assertFalse("pserver no longer exists", engine.tx().traversal().V()
-            .has("aai-node-type", "pserver")
-            .hasNext());
+        assertFalse("pserver no longer exists", engine.tx().traversal().V().has("aai-node-type", "pserver").hasNext());
 
         assertEquals(DeltaAction.DELETE, dbserLocal.getObjectDeltas().get(pserverUri).getAction());
-        assertEquals(12L, dbserLocal.getObjectDeltas().get(pserverUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.DELETE)).count());
+        assertEquals(12L, dbserLocal.getObjectDeltas().get(pserverUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.DELETE)).count());
         assertEquals(DeltaAction.DELETE, dbserLocal.getObjectDeltas().get(pintUri).getAction());
-        assertEquals(10L, dbserLocal.getObjectDeltas().get(pintUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.DELETE)).count());
+        assertEquals(10L, dbserLocal.getObjectDeltas().get(pintUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.DELETE)).count());
         dbserLocal.getObjectDeltas().values().forEach(od -> {
-            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID) ) {
+            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID)) {
                 fail(od.getUri() + " is missing " + AAIProperties.AAI_UUID);
             } else if (od.getPropertyDeltas().get(AAIProperties.AAI_UUID) == null) {
                 fail(od.getUri() + " " + AAIProperties.AAI_UUID + " is null");
@@ -602,42 +576,37 @@ public class DbSerializerDeltasTest extends AAISetup {
         });
     }
 
-
     // /network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}/vig-servers/vig-server/{vig-address-type}
     // ipaddress-v4-vig
     @Test
     public void createNodeWithListTest() throws AAIException, UnsupportedEncodingException, URISyntaxException {
-        Gson gson = new GsonBuilder()
-            .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_DASHES)
-            .create();
+        Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_DASHES).create();
 
         engine.startTransaction();
 
         /*
          * Create the parent ipsec-configuration
          */
-        DBSerializer dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "create-ipsec", AAIProperties.MINIMUM_DEPTH);
+        DBSerializer dbserLocal =
+                new DBSerializer(version, engine, introspectorFactoryType, "create-ipsec", AAIProperties.MINIMUM_DEPTH);
         Introspector ipsec = loader.introspectorFromName("ipsec-configuration");
         Vertex ipsecVert = dbserLocal.createNewVertex(ipsec);
         final String ipsecUri = "/network/ipsec-configurations/ipsec-configuration/ipsec";
-        QueryParser uriQuery =
-            dbEngine.getQueryBuilder().createQueryFromURI(new URI(ipsecUri));
+        QueryParser uriQuery = dbEngine.getQueryBuilder().createQueryFromURI(new URI(ipsecUri));
 
         ipsec.setValue("ipsec-configuration-id", "ipsec");
         dbserLocal.serializeToDb(ipsec, ipsecVert, uriQuery, "generic-vnf", ipsec.marshal(false));
         assertTrue("Original created vertex exists", engine.tx().traversal().V()
-            .has("aai-node-type", "ipsec-configuration")
-            .has("ipsec-configuration-id", "ipsec")
-            .hasNext());
+                .has("aai-node-type", "ipsec-configuration").has("ipsec-configuration-id", "ipsec").hasNext());
 
         System.out.println(gson.toJsonTree(dbserLocal.getObjectDeltas().values()));
         assertEquals(DeltaAction.CREATE, dbserLocal.getObjectDeltas().get(ipsecUri).getAction());
-        assertEquals(4L,
-            dbserLocal.getObjectDeltas().get(ipsecUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
-        assertEquals(4L,
-            dbserLocal.getObjectDeltas().get(ipsecUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
+        assertEquals(4L, dbserLocal.getObjectDeltas().get(ipsecUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
+        assertEquals(4L, dbserLocal.getObjectDeltas().get(ipsecUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
         dbserLocal.getObjectDeltas().values().forEach(od -> {
-            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID) ) {
+            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID)) {
                 fail(od.getUri() + " is missing " + AAIProperties.AAI_UUID);
             } else if (od.getPropertyDeltas().get(AAIProperties.AAI_UUID) == null) {
                 fail(od.getUri() + " " + AAIProperties.AAI_UUID + " is null");
@@ -649,7 +618,8 @@ public class DbSerializerDeltasTest extends AAISetup {
         /*
          * Create child vig-server with list property vig-address-type
          */
-        dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "create-child-vig-server", AAIProperties.MINIMUM_DEPTH);
+        dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "create-child-vig-server",
+                AAIProperties.MINIMUM_DEPTH);
         Introspector vig = loader.introspectorFromName("vig-server");
         Vertex vigVertex = dbserLocal.createNewVertex(vig);
         final String vigUri = "/network/ipsec-configurations/ipsec-configuration/ipsec/vig-servers/vig-server/vig";
@@ -661,27 +631,22 @@ public class DbSerializerDeltasTest extends AAISetup {
         list.add("address-2");
         vig.setValue("ipaddress-v4-vig", list);
         dbserLocal.serializeToDb(vig, vigVertex, uriQuery, "vf-module", vig.marshal(false));
-        assertTrue("Vertex is creted", engine.tx().traversal().V()
-            .has("aai-node-type", "vig-server")
-            .has("vig-address-type", "vig")
-            .hasNext());
-        assertTrue("Vf module has edge to gvnf", engine.tx().traversal().V()
-            .has("aai-node-type", "vig-server")
-            .has("vig-address-type", "vig")
-            .both()
-            .has("aai-node-type", "ipsec-configuration")
-            .has("ipsec-configuration-id", "ipsec")
-            .hasNext());
+        assertTrue("Vertex is creted", engine.tx().traversal().V().has("aai-node-type", "vig-server")
+                .has("vig-address-type", "vig").hasNext());
+        assertTrue("Vf module has edge to gvnf",
+                engine.tx().traversal().V().has("aai-node-type", "vig-server").has("vig-address-type", "vig").both()
+                        .has("aai-node-type", "ipsec-configuration").has("ipsec-configuration-id", "ipsec").hasNext());
 
         System.out.println(gson.toJsonTree(dbserLocal.getObjectDeltas().values()));
         assertEquals(DeltaAction.CREATE, dbserLocal.getObjectDeltas().get(vigUri).getAction());
-        assertEquals(4L,
-            dbserLocal.getObjectDeltas().get(vigUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
-        assertEquals(5L,
-            dbserLocal.getObjectDeltas().get(vigUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
-        assertThat(dbserLocal.getObjectDeltas().get(vigUri).getPropertyDeltas().get("ipaddress-v4-vig").getValue(), instanceOf(List.class));
+        assertEquals(4L, dbserLocal.getObjectDeltas().get(vigUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
+        assertEquals(5L, dbserLocal.getObjectDeltas().get(vigUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.CREATE)).count());
+        assertThat(dbserLocal.getObjectDeltas().get(vigUri).getPropertyDeltas().get("ipaddress-v4-vig").getValue(),
+                instanceOf(List.class));
         dbserLocal.getObjectDeltas().values().forEach(od -> {
-            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID) ) {
+            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID)) {
                 fail(od.getUri() + " is missing " + AAIProperties.AAI_UUID);
             } else if (od.getPropertyDeltas().get(AAIProperties.AAI_UUID) == null) {
                 fail(od.getUri() + " " + AAIProperties.AAI_UUID + " is null");
@@ -693,7 +658,8 @@ public class DbSerializerDeltasTest extends AAISetup {
         /*
          * Update child vig-server with new list for vig-address-type
          */
-        dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "update-child-vig-server", AAIProperties.MINIMUM_DEPTH);
+        dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "update-child-vig-server",
+                AAIProperties.MINIMUM_DEPTH);
         vig = dbserLocal.getLatestVersionView(vigVertex);
         uriQuery = engine.getQueryBuilder(ipsecVert).createQueryFromURI(new URI(vigUri));
 
@@ -702,28 +668,24 @@ public class DbSerializerDeltasTest extends AAISetup {
         list.add("address-4");
         vig.setValue("ipaddress-v4-vig", list);
         dbserLocal.serializeToDb(vig, vigVertex, uriQuery, "vf-module", vig.marshal(false));
-        assertTrue("Vertex is still there", engine.tx().traversal().V()
-            .has("aai-node-type", "vig-server")
-            .has("vig-address-type", "vig")
-            .hasNext());
-        assertTrue("Vf module has edge to gvnf", engine.tx().traversal().V()
-            .has("aai-node-type", "vig-server")
-            .has("vig-address-type", "vig")
-            .both()
-            .has("aai-node-type", "ipsec-configuration")
-            .has("ipsec-configuration-id", "ipsec")
-            .hasNext());
+        assertTrue("Vertex is still there", engine.tx().traversal().V().has("aai-node-type", "vig-server")
+                .has("vig-address-type", "vig").hasNext());
+        assertTrue("Vf module has edge to gvnf",
+                engine.tx().traversal().V().has("aai-node-type", "vig-server").has("vig-address-type", "vig").both()
+                        .has("aai-node-type", "ipsec-configuration").has("ipsec-configuration-id", "ipsec").hasNext());
 
         System.out.println(gson.toJsonTree(dbserLocal.getObjectDeltas().values()));
         assertEquals(DeltaAction.UPDATE, dbserLocal.getObjectDeltas().get(vigUri).getAction());
-        assertEquals(4L,
-            dbserLocal.getObjectDeltas().get(vigUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
-        assertEquals(4L,
-            dbserLocal.getObjectDeltas().get(vigUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.UPDATE)).count());
-        assertThat(dbserLocal.getObjectDeltas().get(vigUri).getPropertyDeltas().get("ipaddress-v4-vig").getValue(), instanceOf(List.class));
-        assertThat(dbserLocal.getObjectDeltas().get(vigUri).getPropertyDeltas().get("ipaddress-v4-vig").getOldValue(), instanceOf(List.class));
+        assertEquals(4L, dbserLocal.getObjectDeltas().get(vigUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.STATIC)).count());
+        assertEquals(4L, dbserLocal.getObjectDeltas().get(vigUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.UPDATE)).count());
+        assertThat(dbserLocal.getObjectDeltas().get(vigUri).getPropertyDeltas().get("ipaddress-v4-vig").getValue(),
+                instanceOf(List.class));
+        assertThat(dbserLocal.getObjectDeltas().get(vigUri).getPropertyDeltas().get("ipaddress-v4-vig").getOldValue(),
+                instanceOf(List.class));
         dbserLocal.getObjectDeltas().values().forEach(od -> {
-            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID) ) {
+            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID)) {
                 fail(od.getUri() + " is missing " + AAIProperties.AAI_UUID);
             } else if (od.getPropertyDeltas().get(AAIProperties.AAI_UUID) == null) {
                 fail(od.getUri() + " " + AAIProperties.AAI_UUID + " is null");
@@ -732,26 +694,28 @@ public class DbSerializerDeltasTest extends AAISetup {
             }
         });
         /*
-        * Delete top level
+         * Delete top level
          */
-        dbserLocal = new DBSerializer(version, engine, introspectorFactoryType, "delete-ipsec", AAIProperties.MINIMUM_DEPTH);
+        dbserLocal =
+                new DBSerializer(version, engine, introspectorFactoryType, "delete-ipsec", AAIProperties.MINIMUM_DEPTH);
         ipsec = dbserLocal.getLatestVersionView(ipsecVert);
         String rv = ipsec.getValue(AAIProperties.RESOURCE_VERSION);
         dbserLocal.delete(engine.tx().traversal().V(ipsecVert).next(), rv, true);
         System.out.println(gson.toJsonTree(dbserLocal.getObjectDeltas().values()));
 
-        assertFalse("ipsec-configuration no longer exists", engine.tx().traversal().V()
-            .has("aai-node-type", "ipsec-configuration")
-            .hasNext());
-        assertFalse("vig-server no longer exists", engine.tx().traversal().V()
-            .has("aai-node-type", "vig-server")
-            .hasNext());
+        assertFalse("ipsec-configuration no longer exists",
+                engine.tx().traversal().V().has("aai-node-type", "ipsec-configuration").hasNext());
+        assertFalse("vig-server no longer exists",
+                engine.tx().traversal().V().has("aai-node-type", "vig-server").hasNext());
 
         assertEquals(DeltaAction.DELETE, dbserLocal.getObjectDeltas().get(ipsecUri).getAction());
-        assertEquals(9L, dbserLocal.getObjectDeltas().get(ipsecUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.DELETE)).count());assertEquals(DeltaAction.DELETE, dbserLocal.getObjectDeltas().get(vigUri).getAction());
-        assertEquals(10L, dbserLocal.getObjectDeltas().get(vigUri).getPropertyDeltas().values().stream().filter(d -> d.getAction().equals(DeltaAction.DELETE)).count());
+        assertEquals(9L, dbserLocal.getObjectDeltas().get(ipsecUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.DELETE)).count());
+        assertEquals(DeltaAction.DELETE, dbserLocal.getObjectDeltas().get(vigUri).getAction());
+        assertEquals(10L, dbserLocal.getObjectDeltas().get(vigUri).getPropertyDeltas().values().stream()
+                .filter(d -> d.getAction().equals(DeltaAction.DELETE)).count());
         dbserLocal.getObjectDeltas().values().forEach(od -> {
-            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID) ) {
+            if (!od.getPropertyDeltas().containsKey(AAIProperties.AAI_UUID)) {
                 fail(od.getUri() + " is missing " + AAIProperties.AAI_UUID);
             } else if (od.getPropertyDeltas().get(AAIProperties.AAI_UUID) == null) {
                 fail(od.getUri() + " " + AAIProperties.AAI_UUID + " is null");