AAI-1523 Batch reformat aai-core

[aai/aai-common.git] / aai-core / src / test / java / org / onap / aai / serialization / queryformats / ResourceWithSoTTest.java

diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceWithSoTTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceWithSoTTest.java
index ad28e69..75fe6ec 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceWithSoTTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceWithSoTTest.java
@@ -17,9 +17,17 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.aai.serialization.queryformats;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
 import com.google.gson.JsonObject;
+
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
 import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -42,12 +50,6 @@ import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexExcepti
 import org.onap.aai.serialization.queryformats.utils.UrlBuilder;
 import org.onap.aai.setup.SchemaVersion;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
 public class ResourceWithSoTTest extends AAISetup {
     @Mock
     private UrlBuilder urlBuilder;
@@ -57,9 +59,9 @@ public class ResourceWithSoTTest extends AAISetup {
     private Vertex patchVertex1;
     private Vertex patchVertex2;
 
-    private JsonObject jsonPutObj = new JsonObject() ;
-    private JsonObject jsonPatchObj1 = new JsonObject() ;
-    private JsonObject jsonPatchObj2 = new JsonObject() ;
+    private JsonObject jsonPutObj = new JsonObject();
+    private JsonObject jsonPatchObj1 = new JsonObject();
+    private JsonObject jsonPatchObj2 = new JsonObject();
 
     private SchemaVersion version;
     private ResourceWithSoT resourceWithSoT;
@@ -87,12 +89,8 @@ public class ResourceWithSoTTest extends AAISetup {
         jsonPutObj.addProperty("last-mod-source-of-truth", "user_a");
         jsonPutObj.addProperty("last-action-performed", "Created");
 
-        putVertex = graph.addVertex(
-            "aai-created-ts", timeNowInMs,
-            "aai-last-mod-ts", timeNowInMs,
-            "source-of-truth", "user_a",
-            "last-mod-source-of-truth", "user_a"
-        );
+        putVertex = graph.addVertex("aai-created-ts", timeNowInMs, "aai-last-mod-ts", timeNowInMs, "source-of-truth",
+                "user_a", "last-mod-source-of-truth", "user_a");
 
         // PATCH / MODIFY with differing source of truths
         jsonPatchObj1.addProperty("aai-created-ts", timeNowInMs);
@@ -101,12 +99,8 @@ public class ResourceWithSoTTest extends AAISetup {
         jsonPatchObj1.addProperty("last-mod-source-of-truth", "user_b");
         jsonPatchObj1.addProperty("last-action-performed", "Modified");
 
-        patchVertex1 = graph.addVertex(
-            "aai-created-ts", timeNowInMs,
-            "aai-last-mod-ts", timeNowInMs,
-            "source-of-truth", "user_a",
-            "last-mod-source-of-truth", "user_b"
-        );
+        patchVertex1 = graph.addVertex("aai-created-ts", timeNowInMs, "aai-last-mod-ts", timeNowInMs, "source-of-truth",
+                "user_a", "last-mod-source-of-truth", "user_b");
 
         // PATCH / MODIFY with differing time stamps
         jsonPatchObj2.addProperty("aai-created-ts", timeNowInMs);
@@ -115,12 +109,8 @@ public class ResourceWithSoTTest extends AAISetup {
         jsonPatchObj2.addProperty("last-mod-source-of-truth", "user_a");
         jsonPatchObj2.addProperty("last-action-performed", "Modified");
 
-        patchVertex2 = graph.addVertex(
-            "aai-created-ts", timeNowInMs,
-            "aai-last-mod-ts", Long.toString(currentTimeMs + 1000),
-            "source-of-truth", "user_a",
-            "last-mod-source-of-truth", "user_a"
-        );
+        patchVertex2 = graph.addVertex("aai-created-ts", timeNowInMs, "aai-last-mod-ts",
+                Long.toString(currentTimeMs + 1000), "source-of-truth", "user_a", "last-mod-source-of-truth", "user_a");
 
         graph = TinkerGraph.open();
         createLoaderEngineSetup();
@@ -148,7 +138,8 @@ public class ResourceWithSoTTest extends AAISetup {
         JsonObject json1 = resourceWithSoT.getJsonFromVertex(patchVertex1).get();
         assertEquals(jsonPatchObj1, json1);
 
-        // Timestamps that have a large span in time difference will (likely) indicate that the transaction was not a create (thus, modify)
+        // Timestamps that have a large span in time difference will (likely) indicate that the transaction was not a
+        // create (thus, modify)
         JsonObject json2 = resourceWithSoT.getJsonFromVertex(patchVertex2).get();
         assertEquals(jsonPatchObj2, json2);
     }
@@ -163,7 +154,7 @@ public class ResourceWithSoTTest extends AAISetup {
 
         if (loader == null) {
             loader = loaderFactory.createLoaderForVersion(factoryType, version);
-            //loader = LoaderFactory.createLoaderForVersion(factoryType, version);
+            // loader = LoaderFactory.createLoaderForVersion(factoryType, version);
             dbEngine = spy(new JanusGraphDBEngine(QueryStyle.TRAVERSAL, DBConnectionType.CACHED, loader));
             serializer = new DBSerializer(version, dbEngine, factoryType, "Junit");
             resourceWithSoT = new ResourceWithSoT.Builder(loader, serializer, urlBuilder).build();
@@ -174,7 +165,7 @@ public class ResourceWithSoTTest extends AAISetup {
             when(dbEngine.asAdmin()).thenReturn(spyAdmin);
 
             when(spyAdmin.getReadOnlyTraversalSource())
-                .thenReturn(graph.traversal(GraphTraversalSource.build().with(ReadOnlyStrategy.instance())));
+                    .thenReturn(graph.traversal(GraphTraversalSource.build().with(ReadOnlyStrategy.instance())));
             when(spyAdmin.getTraversalSource()).thenReturn(graph.traversal());
         }
     }