AAI-1523 checkstyle warnings for aai-core query

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

diff --git a/aai-core/src/test/java/org/onap/aai/query/builder/ExcludeQueryTest.java b/aai-core/src/test/java/org/onap/aai/query/builder/ExcludeQueryTest.java
index 73fe2c8..e466de4 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/query/builder/ExcludeQueryTest.java
+++ b/aai-core/src/test/java/org/onap/aai/query/builder/ExcludeQueryTest.java
@@ -48,89 +48,89 @@ import static org.junit.Assert.assertTrue;
 @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
 public class ExcludeQueryTest extends AAISetup {
 
-       @Autowired
-       EdgeSerializer edgeSer;
-       
-       private Loader loader;
-       
-       @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, "cloud-region","availability-zone").getVerticesExcludeByProperty("hypervisor-type", "hypervisortype-11").store("x").cap("x").unfold().dedup();
-       }
-       
-       @Test
-       public void gremlinQueryExcludeTest() throws AAIException {
-               Graph graph = TinkerGraph.open();
-               GraphTraversalSource g = graph.traversal();
-               
-               Vertex cloudregion = graph.addVertex(T.label, "cloud-region", T.id, "0", "aai-node-type", "cloud-region", "cloud-region-id", "cloud-region-id-1", "cloud-owner", "cloud-owner-1");
-               Vertex availibityzone = graph.addVertex(T.label, "availability-zone", T.id, "1", "aai-node-type", "availability-zone", "availability-zone-name", "az-name-1", "hypervisor-type", "hypervisortype-1");
-               Vertex availibityzone11 = graph.addVertex(T.label, "availability-zone", T.id, "11", "aai-node-type", "availability-zone", "availability-zone-name", "az-name-11", "hypervisor-type", "hypervisortype-11");
-               
-               
-               Vertex cloudregion1 = graph.addVertex(T.label, "cloud-region", T.id, "3", "aai-node-type", "cloud-region", "cloud-region-id", "cloud-region-id-10", "cloud-owner", "cloud-owner-10");
-               Vertex availibityzone1 = graph.addVertex(T.label, "availability-zone", T.id, "4", "aai-node-type", "availability-zone", "availability-zone-name", "az-name-10", "hypervisor-type", "hypervisortype-10");
-               Vertex availibityzone12 = graph.addVertex(T.label, "availability-zone", T.id, "12", "aai-node-type", "availability-zone", "availability-zone-name", "az-name-12", "hypervisor-type", "hypervisortype-12");
-               
-               edgeSer.addTreeEdge(g, cloudregion, availibityzone);
-               edgeSer.addTreeEdge(g, cloudregion, availibityzone11);
-               
-               
-               
-               edgeSer.addTreeEdge(g, cloudregion1, availibityzone1);
-               edgeSer.addTreeEdge(g, cloudregion1, availibityzone12);
-               
-               List<Vertex> expected = new ArrayList<>();
-               expected.add(availibityzone);
-               
-               GremlinTraversal<Vertex> qb =  new GremlinTraversal<>(loader, g, cloudregion);
-               QueryBuilder q = buildTestQuery(qb);
-               
-               List<Vertex> results = q.toList();
+    @Autowired
+    EdgeSerializer edgeSer;
+    
+    private Loader loader;
+    
+    @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, "cloud-region","availability-zone").getVerticesExcludeByProperty("hypervisor-type", "hypervisortype-11").store("x").cap("x").unfold().dedup();
+    }
+    
+    @Test
+    public void gremlinQueryExcludeTest() throws AAIException {
+        Graph graph = TinkerGraph.open();
+        GraphTraversalSource g = graph.traversal();
+        
+        Vertex cloudregion = graph.addVertex(T.label, "cloud-region", T.id, "0", "aai-node-type", "cloud-region", "cloud-region-id", "cloud-region-id-1", "cloud-owner", "cloud-owner-1");
+        Vertex availibityzone = graph.addVertex(T.label, "availability-zone", T.id, "1", "aai-node-type", "availability-zone", "availability-zone-name", "az-name-1", "hypervisor-type", "hypervisortype-1");
+        Vertex availibityzone11 = graph.addVertex(T.label, "availability-zone", T.id, "11", "aai-node-type", "availability-zone", "availability-zone-name", "az-name-11", "hypervisor-type", "hypervisortype-11");
+        
+        
+        Vertex cloudregion1 = graph.addVertex(T.label, "cloud-region", T.id, "3", "aai-node-type", "cloud-region", "cloud-region-id", "cloud-region-id-10", "cloud-owner", "cloud-owner-10");
+        Vertex availibityzone1 = graph.addVertex(T.label, "availability-zone", T.id, "4", "aai-node-type", "availability-zone", "availability-zone-name", "az-name-10", "hypervisor-type", "hypervisortype-10");
+        Vertex availibityzone12 = graph.addVertex(T.label, "availability-zone", T.id, "12", "aai-node-type", "availability-zone", "availability-zone-name", "az-name-12", "hypervisor-type", "hypervisortype-12");
+        
+        edgeSer.addTreeEdge(g, cloudregion, availibityzone);
+        edgeSer.addTreeEdge(g, cloudregion, availibityzone11);
+        
+        
+        
+        edgeSer.addTreeEdge(g, cloudregion1, availibityzone1);
+        edgeSer.addTreeEdge(g, cloudregion1, availibityzone12);
+        
+        List<Vertex> expected = new ArrayList<>();
+        expected.add(availibityzone);
+        
+        GremlinTraversal<Vertex> qb =  new GremlinTraversal<>(loader, g, cloudregion);
+        QueryBuilder q = buildTestQuery(qb);
+        
+        List<Vertex> results = q.toList();
 
-               assertTrue("results match", expected.containsAll(results) && results.containsAll(expected));
-       }
+        assertTrue("results match", expected.containsAll(results) && results.containsAll(expected));
+    }
 
-       @Test
-       public void traversalQueryExcludeTest() throws AAIException {
-               Graph graph = TinkerGraph.open();
-               GraphTraversalSource g = graph.traversal();
-               
-               
-               Vertex cloudregion = graph.addVertex(T.label, "cloud-region", T.id, "0", "aai-node-type", "cloud-region", "cloud-region-id", "cloud-region-id-1", "cloud-owner", "cloud-owner-1");
-               Vertex availibityzone = graph.addVertex(T.label, "availability-zone", T.id, "1", "aai-node-type", "availability-zone", "availability-zone-name", "az-name-1", "hypervisor-type", "hypervisortype-1");
-               Vertex availibityzone11 = graph.addVertex(T.label, "availability-zone", T.id, "11", "aai-node-type", "availability-zone", "availability-zone-name", "az-name-11", "hypervisor-type", "hypervisortype-11");
-               
-               
-               Vertex cloudregion1 = graph.addVertex(T.label, "cloud-region", T.id, "3", "aai-node-type", "cloud-region", "cloud-region-id", "cloud-region-id-10", "cloud-owner", "cloud-owner-10");
-               Vertex availibityzone1 = graph.addVertex(T.label, "availability-zone", T.id, "4", "aai-node-type", "availability-zone", "availability-zone-name", "az-name-10", "hypervisor-type", "hypervisortype-10");
-               Vertex availibityzone12 = graph.addVertex(T.label, "availability-zone", T.id, "12", "aai-node-type", "availability-zone", "availability-zone-name", "az-name-12", "hypervisor-type", "hypervisortype-12");
-               
-               edgeSer.addTreeEdge(g, cloudregion, availibityzone);
-               edgeSer.addTreeEdge(g, cloudregion, availibityzone11);
-               
-               
-               
-               edgeSer.addTreeEdge(g, cloudregion1, availibityzone1);
-               edgeSer.addTreeEdge(g, cloudregion1, availibityzone12);
-               
-               List<Vertex> expected = new ArrayList<>();
-               expected.add(availibityzone);
-               
-               
-               
-               
-               TraversalQuery<Vertex> qb =  new TraversalQuery<>(loader, g, cloudregion);
-               QueryBuilder<Vertex> q = buildTestQuery(qb);
-               
-               List<Vertex> results = q.toList();
+    @Test
+    public void traversalQueryExcludeTest() throws AAIException {
+        Graph graph = TinkerGraph.open();
+        GraphTraversalSource g = graph.traversal();
+        
+        
+        Vertex cloudregion = graph.addVertex(T.label, "cloud-region", T.id, "0", "aai-node-type", "cloud-region", "cloud-region-id", "cloud-region-id-1", "cloud-owner", "cloud-owner-1");
+        Vertex availibityzone = graph.addVertex(T.label, "availability-zone", T.id, "1", "aai-node-type", "availability-zone", "availability-zone-name", "az-name-1", "hypervisor-type", "hypervisortype-1");
+        Vertex availibityzone11 = graph.addVertex(T.label, "availability-zone", T.id, "11", "aai-node-type", "availability-zone", "availability-zone-name", "az-name-11", "hypervisor-type", "hypervisortype-11");
+        
+        
+        Vertex cloudregion1 = graph.addVertex(T.label, "cloud-region", T.id, "3", "aai-node-type", "cloud-region", "cloud-region-id", "cloud-region-id-10", "cloud-owner", "cloud-owner-10");
+        Vertex availibityzone1 = graph.addVertex(T.label, "availability-zone", T.id, "4", "aai-node-type", "availability-zone", "availability-zone-name", "az-name-10", "hypervisor-type", "hypervisortype-10");
+        Vertex availibityzone12 = graph.addVertex(T.label, "availability-zone", T.id, "12", "aai-node-type", "availability-zone", "availability-zone-name", "az-name-12", "hypervisor-type", "hypervisortype-12");
+        
+        edgeSer.addTreeEdge(g, cloudregion, availibityzone);
+        edgeSer.addTreeEdge(g, cloudregion, availibityzone11);
+        
+        
+        
+        edgeSer.addTreeEdge(g, cloudregion1, availibityzone1);
+        edgeSer.addTreeEdge(g, cloudregion1, availibityzone12);
+        
+        List<Vertex> expected = new ArrayList<>();
+        expected.add(availibityzone);
+        
+        
+        
+        
+        TraversalQuery<Vertex> qb =  new TraversalQuery<>(loader, g, cloudregion);
+        QueryBuilder<Vertex> q = buildTestQuery(qb);
+        
+        List<Vertex> results = q.toList();
 
-               assertTrue("results match", expected.containsAll(results) && results.containsAll(expected));
-       }
+        assertTrue("results match", expected.containsAll(results) && results.containsAll(expected));
+    }