AAI-1523 checkstyle warnings for aai-core query

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

diff --git a/aai-core/src/test/java/org/onap/aai/query/builder/SimplePathTest.java b/aai-core/src/test/java/org/onap/aai/query/builder/SimplePathTest.java
index 68340fd..0a987c9 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/query/builder/SimplePathTest.java
+++ b/aai-core/src/test/java/org/onap/aai/query/builder/SimplePathTest.java
@@ -43,80 +43,80 @@ import static org.junit.Assert.assertTrue;
 @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
 public class SimplePathTest extends AAISetup {
 
-       public Loader loader;
-       
-       @Autowired
-       EdgeSerializer edgeSer;
-       
-       @Before
-       public void setup() throws Exception {
-               loader = loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getDefaultVersion());
-       }
+    public 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.createEdgeTraversal(EdgeType.TREE, "generic-vnf", "l-interface")
-                               .until(qb.newInstance().getVerticesByProperty("aai-node-type", "generic-vnf"))
-                               .repeat(qb.newInstance().union(
-                                                       qb.newInstance().createEdgeTraversal(EdgeType.TREE, "generic-vnf", "l-interface"),
-                                                       qb.newInstance().createEdgeTraversal(EdgeType.TREE, "l-interface", "generic-vnf"),
-                                                       qb.newInstance().createEdgeTraversal(EdgeType.COUSIN, "l-interface", "logical-link"),
-                                                       qb.newInstance().createEdgeTraversal(EdgeType.COUSIN, "logical-link", "l-interface")
-                                               ).simplePath())
-                               .store("x").cap("x").unfold().dedup();
-       }
-       
-       private GraphTraversalSource setupGraph() throws AAIException{
-               Graph graph = TinkerGraph.open();
-               GraphTraversalSource g = graph.traversal();
-               
-               Vertex gvnf1 = graph.addVertex(T.label, "generic-vnf", T.id, "00", "aai-node-type", "generic-vnf", 
-                               "vnf-id", "gvnf1", "vnf-name", "genvnfname1", "nf-type", "sample-nf-type");
+    private QueryBuilder<Vertex> buildTestQuery(QueryBuilder<Vertex> qb) throws AAIException {
+        return qb.createEdgeTraversal(EdgeType.TREE, "generic-vnf", "l-interface")
+                .until(qb.newInstance().getVerticesByProperty("aai-node-type", "generic-vnf"))
+                .repeat(qb.newInstance().union(
+                            qb.newInstance().createEdgeTraversal(EdgeType.TREE, "generic-vnf", "l-interface"),
+                            qb.newInstance().createEdgeTraversal(EdgeType.TREE, "l-interface", "generic-vnf"),
+                            qb.newInstance().createEdgeTraversal(EdgeType.COUSIN, "l-interface", "logical-link"),
+                            qb.newInstance().createEdgeTraversal(EdgeType.COUSIN, "logical-link", "l-interface")
+                        ).simplePath())
+                .store("x").cap("x").unfold().dedup();
+    }
+    
+    private GraphTraversalSource setupGraph() throws AAIException{
+        Graph graph = TinkerGraph.open();
+        GraphTraversalSource g = graph.traversal();
+        
+        Vertex gvnf1 = graph.addVertex(T.label, "generic-vnf", T.id, "00", "aai-node-type", "generic-vnf", 
+                "vnf-id", "gvnf1", "vnf-name", "genvnfname1", "nf-type", "sample-nf-type");
 
-               Vertex lint1 = graph.addVertex(T.label, "l-interface", T.id, "10", "aai-node-type", "l-interface",
-                                               "interface-name", "lint1", "is-port-mirrored", "true", "in-maint", "true", "is-ip-unnumbered", "false");
-               
-               Vertex loglink1 = graph.addVertex(T.label, "logical-link", T.id, "20", "aai-node-type", "logical-link",
-                                               "link-name", "loglink1", "in-maint", "false", "link-type", "sausage");
-               
-               Vertex lint2 = graph.addVertex(T.label, "l-interface", T.id, "11", "aai-node-type", "l-interface",
-                                               "interface-name", "lint2", "is-port-mirrored", "true", "in-maint", "true", "is-ip-unnumbered", "false");
-               
-               Vertex lint3 = graph.addVertex(T.label, "l-interface", T.id, "12", "aai-node-type", "l-interface",
-                               "interface-name", "lint3", "is-port-mirrored", "true", "in-maint", "true", "is-ip-unnumbered", "false");
-               
-               Vertex gvnf2 = graph.addVertex(T.label, "generic-vnf", T.id, "01", "aai-node-type", "generic-vnf", 
-                               "vnf-id", "gvnf2", "vnf-name", "genvnfname2", "nf-type", "sample-nf-type");
-               
-               edgeSer.addTreeEdge(g, gvnf1, lint1);
-               edgeSer.addEdge(g, lint1, loglink1);
-               edgeSer.addEdge(g, loglink1, lint2);
-               edgeSer.addEdge(g, loglink1, lint3);
-               edgeSer.addTreeEdge(g, gvnf2, lint3);
-               
-               return g;
-       }
-       
-       @Test
-       public void gremlinQueryTest() throws AAIException {
-               GraphTraversalSource g = setupGraph();
-               List<Vertex> expected = g.V("01").toList();
-               Vertex start = g.V("00").toList().get(0);
-               
-               GremlinTraversal<Vertex> qb = new GremlinTraversal<>(loader, g, start);
-               QueryBuilder<Vertex> q = buildTestQuery(qb);
-               List<Vertex> results = q.toList();
-               assertTrue("results match", expected.containsAll(results) && results.containsAll(expected));
-       }
+        Vertex lint1 = graph.addVertex(T.label, "l-interface", T.id, "10", "aai-node-type", "l-interface",
+                        "interface-name", "lint1", "is-port-mirrored", "true", "in-maint", "true", "is-ip-unnumbered", "false");
+        
+        Vertex loglink1 = graph.addVertex(T.label, "logical-link", T.id, "20", "aai-node-type", "logical-link",
+                        "link-name", "loglink1", "in-maint", "false", "link-type", "sausage");
+        
+        Vertex lint2 = graph.addVertex(T.label, "l-interface", T.id, "11", "aai-node-type", "l-interface",
+                        "interface-name", "lint2", "is-port-mirrored", "true", "in-maint", "true", "is-ip-unnumbered", "false");
+        
+        Vertex lint3 = graph.addVertex(T.label, "l-interface", T.id, "12", "aai-node-type", "l-interface",
+                "interface-name", "lint3", "is-port-mirrored", "true", "in-maint", "true", "is-ip-unnumbered", "false");
+        
+        Vertex gvnf2 = graph.addVertex(T.label, "generic-vnf", T.id, "01", "aai-node-type", "generic-vnf", 
+                "vnf-id", "gvnf2", "vnf-name", "genvnfname2", "nf-type", "sample-nf-type");
+        
+        edgeSer.addTreeEdge(g, gvnf1, lint1);
+        edgeSer.addEdge(g, lint1, loglink1);
+        edgeSer.addEdge(g, loglink1, lint2);
+        edgeSer.addEdge(g, loglink1, lint3);
+        edgeSer.addTreeEdge(g, gvnf2, lint3);
+        
+        return g;
+    }
+    
+    @Test
+    public void gremlinQueryTest() throws AAIException {
+        GraphTraversalSource g = setupGraph();
+        List<Vertex> expected = g.V("01").toList();
+        Vertex start = g.V("00").toList().get(0);
+        
+        GremlinTraversal<Vertex> qb = new GremlinTraversal<>(loader, g, start);
+        QueryBuilder<Vertex> q = buildTestQuery(qb);
+        List<Vertex> results = q.toList();
+        assertTrue("results match", expected.containsAll(results) && results.containsAll(expected));
+    }
 
-       @Test
-       public void traversalQueryTest() throws AAIException {
-               GraphTraversalSource g = setupGraph();
-               List<Vertex> expected = g.V("01").toList();
-               Vertex start = g.V("00").toList().get(0);
-               
-               TraversalQuery<Vertex> qb = new TraversalQuery<>(loader, g, start);
-               QueryBuilder<Vertex> q = buildTestQuery(qb);
-               List<Vertex> results = q.toList();
-               assertTrue("results match", expected.containsAll(results) && results.containsAll(expected));
-       }
+    @Test
+    public void traversalQueryTest() throws AAIException {
+        GraphTraversalSource g = setupGraph();
+        List<Vertex> expected = g.V("01").toList();
+        Vertex start = g.V("00").toList().get(0);
+        
+        TraversalQuery<Vertex> qb = new TraversalQuery<>(loader, g, start);
+        QueryBuilder<Vertex> q = buildTestQuery(qb);
+        List<Vertex> results = q.toList();
+        assertTrue("results match", expected.containsAll(results) && results.containsAll(expected));
+    }
 }