AAI-1523 Batch reformat aai-core

[aai/aai-common.git] / aai-core / src / test / java / org / onap / aai / query / builder / UntilTest.java

diff --git a/aai-core/src/test/java/org/onap/aai/query/builder/UntilTest.java b/aai-core/src/test/java/org/onap/aai/query/builder/UntilTest.java
index c529037..dcf11ba 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/query/builder/UntilTest.java
+++ b/aai-core/src/test/java/org/onap/aai/query/builder/UntilTest.java
@@ -17,8 +17,14 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.aai.query.builder;
 
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.T;
@@ -28,47 +34,41 @@ import org.junit.Before;
 import org.junit.Test;
 import org.onap.aai.AAISetup;
 import org.onap.aai.db.props.AAIProperties;
+import org.onap.aai.edges.enums.EdgeType;
 import org.onap.aai.exceptions.AAIException;
 import org.onap.aai.introspection.Loader;
 import org.onap.aai.introspection.ModelType;
-
 import org.onap.aai.serialization.db.EdgeSerializer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.annotation.DirtiesContext;
-import org.onap.aai.edges.enums.EdgeType;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.Assert.assertTrue;
 
 @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
 public class UntilTest extends AAISetup {
 
     private Loader loader;
-    
+
     @Autowired
     EdgeSerializer edgeSer;
-    
+
     @Before
     public void setup() throws Exception {
         loader = loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getDefaultVersion());
     }
-    
-    private QueryBuilder<Vertex> buildTestQuery(QueryBuilder<Vertex> qb) throws AAIException{
-        return qb.until(qb.newInstance().getVerticesByProperty("aai-node-type", "l-interface")).repeat(
-                qb.newInstance().union(
+
+    private QueryBuilder<Vertex> buildTestQuery(QueryBuilder<Vertex> qb) throws AAIException {
+        return qb.until(qb.newInstance().getVerticesByProperty("aai-node-type", "l-interface"))
+                .repeat(qb.newInstance().union(
                         qb.newInstance().createEdgeTraversal(EdgeType.TREE, "cloud-region", "tenant"),
                         qb.newInstance().createEdgeTraversal(EdgeType.TREE, "tenant", "vserver"),
-                        qb.newInstance().createEdgeTraversal(EdgeType.TREE, "vserver", "l-interface")
-            )).store("x").cap("x").unfold().dedup();
+                        qb.newInstance().createEdgeTraversal(EdgeType.TREE, "vserver", "l-interface")))
+                .store("x").cap("x").unfold().dedup();
     }
-    
+
     @Test
     public void gremlinQueryUntilTest() throws AAIException {
         Graph graph = TinkerGraph.open();
         GraphTraversalSource g = graph.traversal();
-        
+
         Vertex v1 = graph.addVertex(T.id, 1, "aai-node-type", "cloud-region");
         Vertex v2 = graph.addVertex(T.id, 2, "aai-node-type", "tenant");
         Vertex v3 = graph.addVertex(T.id, 3, "aai-node-type", "vserver");
@@ -78,10 +78,10 @@ public class UntilTest extends AAISetup {
         edgeSer.addTreeEdge(g, v3, v4);
         List<Vertex> expected = new ArrayList<>();
         expected.add(v4);
-        
-        GremlinTraversal<Vertex> qb =  new GremlinTraversal<>(loader, g, v1);
+
+        GremlinTraversal<Vertex> qb = new GremlinTraversal<>(loader, g, v1);
         QueryBuilder q = buildTestQuery(qb);
-        
+
         List<Vertex> results = q.toList();
 
         assertTrue("results match", expected.containsAll(results) && results.containsAll(expected));
@@ -91,7 +91,7 @@ public class UntilTest extends AAISetup {
     public void traversalQueryUntilTest() throws AAIException {
         Graph graph = TinkerGraph.open();
         GraphTraversalSource g = graph.traversal();
-        
+
         Vertex v1 = graph.addVertex(T.id, 1, "aai-node-type", "cloud-region");
         Vertex v2 = graph.addVertex(T.id, 2, "aai-node-type", "tenant");
         Vertex v3 = graph.addVertex(T.id, 3, "aai-node-type", "vserver");
@@ -101,15 +101,13 @@ public class UntilTest extends AAISetup {
         edgeSer.addTreeEdge(g, v3, v4);
         List<Vertex> expected = new ArrayList<>();
         expected.add(v4);
-        
-        TraversalQuery<Vertex> qb =  new TraversalQuery<>(loader, g, v1);
+
+        TraversalQuery<Vertex> qb = new TraversalQuery<>(loader, g, v1);
         QueryBuilder<Vertex> q = buildTestQuery(qb);
-        
+
         List<Vertex> results = q.toList();
 
         assertTrue("results match", expected.containsAll(results) && results.containsAll(expected));
     }
-    
-    
 
 }