Add new query format count and

support for path/tree

Issue-ID: AAI-602
Change-Id: I3e1bac256e679c0466fc3eceb52d440095b272d8
Signed-off-by: Maharajh, Robby (rx2202) <rx2202@att.com>

4 files changed, 344 insertions, 16 deletions

diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/CountQuerySupportTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/CountQuerySupportTest.java
new file mode 100644
index 00000000..488064e6
--- /dev/null
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/CountQuerySupportTest.java
@@ -0,0 +1,164 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+package org.onap.aai.serialization.queryformats;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import java.util.Arrays;
+import java.util.List;
+
+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;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.onap.aai.AAISetup;
+import org.onap.aai.dbmap.DBConnectionType;
+import org.onap.aai.exceptions.AAIException;
+import org.onap.aai.introspection.Loader;
+import org.onap.aai.introspection.LoaderFactory;
+import org.onap.aai.introspection.ModelType;
+import org.onap.aai.introspection.Version;
+import org.onap.aai.serialization.db.DBSerializer;
+import org.onap.aai.serialization.db.EdgeRules;
+import org.onap.aai.serialization.engines.QueryStyle;
+import org.onap.aai.serialization.engines.TitanDBEngine;
+import org.onap.aai.serialization.engines.TransactionalGraphEngine;
+import org.onap.aai.serialization.queryformats.exceptions.AAIFormatQueryResultFormatNotSupported;
+import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException;
+import org.onap.aai.serialization.queryformats.utils.UrlBuilder;
+
+import com.google.gson.JsonObject;
+
+public class CountQuerySupportTest extends AAISetup {
+
+	@Mock
+	private UrlBuilder urlBuilder;
+
+	private Graph graph;
+	private TransactionalGraphEngine dbEngine;
+	private Loader loader;
+	private final ModelType factoryType = ModelType.MOXY;
+	private final EdgeRules rules = EdgeRules.getInstance();
+	private Version version = Version.getLatest();
+	Vertex pserver1;
+	Vertex complex1;
+	Vertex complex2;
+
+	private DBSerializer serializer;
+	
+	private FormatFactory ff;
+	private Formatter formatter;
+
+	@Before
+	public void setUp() throws Exception {
+
+		MockitoAnnotations.initMocks(this);
+
+		graph = TinkerGraph.open();
+
+		pserver1 = graph.addVertex(T.label, "pserver", T.id, "2", "aai-node-type", "pserver", "hostname",
+				"hostname-1");
+		complex1 = graph.addVertex(T.label, "complex", T.id, "3", "aai-node-type", "complex",
+				"physical-location-id", "physical-location-id-1", "country", "US");
+		
+		complex2 = graph.addVertex(T.label, "complex", T.id, "4", "aai-node-type", "complex",
+				"physical-location-id", "physical-location-id-2", "country", "US");
+
+		GraphTraversalSource g = graph.traversal();
+		rules.addEdge(g, pserver1, complex1);
+		
+		createLoaderEngineSetup();
+
+	}
+	
+	@After
+	public void tearDown() throws Exception {
+		graph.close();
+	}
+
+	@Test
+	public void verifyComplexVertexCountTest1() throws AAIFormatVertexException, AAIException, AAIFormatQueryResultFormatNotSupported {
+		List<Object> complexList = Arrays.asList(this.complex1, this.complex2 );
+		JsonObject jo = this.formatter.output(complexList);
+		assertEquals(2, jo.get("results").getAsJsonArray().get(0).getAsJsonObject().get("complex").getAsInt());
+	}
+	
+	@Test
+	public void verifyPserverVertexCountTest1() throws AAIFormatVertexException, AAIException, AAIFormatQueryResultFormatNotSupported {
+		List<Object> pserverList = Arrays.asList(this.pserver1 );
+		JsonObject jo = this.formatter.output(pserverList);
+		assertEquals(1, jo.get("results").getAsJsonArray().get(0).getAsJsonObject().get("pserver").getAsInt());
+	}
+	
+	@Test
+	public void verifyComplexVertexCountTest2() throws AAIFormatVertexException, AAIException, AAIFormatQueryResultFormatNotSupported {
+		List<Object> list = Arrays.asList(this.complex1, this.pserver1, this.complex2 );
+		JsonObject jo = this.formatter.output(list);
+		assertEquals(2, jo.get("results").getAsJsonArray().get(0).getAsJsonObject().get("complex").getAsInt());
+	}
+	
+	@Test
+	public void verifyPserverVertexCountTest2() throws AAIFormatVertexException, AAIException, AAIFormatQueryResultFormatNotSupported {
+		List<Object> list = Arrays.asList(this.complex1, this.pserver1, this.complex2 );
+		JsonObject jo = this.formatter.output(list);
+		assertEquals(1, jo.get("results").getAsJsonArray().get(0).getAsJsonObject().get("pserver").getAsInt());
+	}
+	
+	@Test
+	public void verifyLongTest() throws AAIFormatVertexException, AAIException, AAIFormatQueryResultFormatNotSupported {
+		List<Object> complexList = Arrays.asList(Long.valueOf(22L) );
+		JsonObject jo = this.formatter.output(complexList);
+		assertEquals(22, jo.get("results").getAsJsonArray().get(0).getAsJsonObject().get("count").getAsInt());
+	}
+
+
+	public void createLoaderEngineSetup() throws AAIException {
+
+		if (loader == null) {
+			loader = LoaderFactory.createLoaderForVersion(factoryType, version);
+			dbEngine = spy(new TitanDBEngine(QueryStyle.TRAVERSAL, DBConnectionType.CACHED, loader));
+			serializer = new DBSerializer(version, dbEngine, factoryType, "Junit");
+			
+			ff = new FormatFactory(loader, serializer);
+			formatter = ff.get(Format.count);
+
+			
+			TransactionalGraphEngine.Admin spyAdmin = spy(dbEngine.asAdmin());
+
+			when(dbEngine.tx()).thenReturn(graph);
+			when(dbEngine.asAdmin()).thenReturn(spyAdmin);
+
+			when(spyAdmin.getReadOnlyTraversalSource())
+					.thenReturn(graph.traversal(GraphTraversalSource.build().with(ReadOnlyStrategy.instance())));
+			when(spyAdmin.getTraversalSource()).thenReturn(graph.traversal());
+		}
+	}
+}
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/MultiFormatTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/MultiFormatTest.java
new file mode 100644
index 00000000..fde1307e
--- /dev/null
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/MultiFormatTest.java
@@ -0,0 +1,172 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+package org.onap.aai.serialization.queryformats;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import java.io.UnsupportedEncodingException;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.onap.aai.AAISetup;
+import org.onap.aai.dbmap.DBConnectionType;
+import org.onap.aai.exceptions.AAIException;
+import org.onap.aai.introspection.Loader;
+import org.onap.aai.introspection.LoaderFactory;
+import org.onap.aai.introspection.ModelType;
+import org.onap.aai.introspection.Version;
+import org.onap.aai.serialization.db.DBSerializer;
+import org.onap.aai.serialization.db.EdgeRules;
+import org.onap.aai.serialization.engines.QueryStyle;
+import org.onap.aai.serialization.engines.TitanDBEngine;
+import org.onap.aai.serialization.engines.TransactionalGraphEngine;
+import org.onap.aai.serialization.queryformats.exceptions.AAIFormatQueryResultFormatNotSupported;
+import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException;
+import org.onap.aai.serialization.queryformats.utils.UrlBuilder;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+public class MultiFormatTest extends AAISetup {
+
+	@Mock
+	private UrlBuilder urlBuilder;
+
+	private Graph graph;
+	private TransactionalGraphEngine dbEngine;
+	private Loader loader;
+	private IdURL idFormat;
+	private final ModelType factoryType = ModelType.MOXY;
+	private final EdgeRules rules = EdgeRules.getInstance();
+	private Tree<?> resultTree;
+	private Path resultPath;
+	private Version version = Version.v11;
+	private JsonObject expectedTreeIdFormat = new JsonParser()
+			.parse("{\"nodes\":[{\"resource-type\":\"generic-vnf\",\"nodes\":[{\"resource-type\":\"vserver\",\"nodes\":[{\"resource-type\":\"pserver\"}]},{\"resource-type\":\"pserver\",\"nodes\":[{\"resource-type\":\"complex\"}]}]}]}").getAsJsonObject();
+	private JsonObject expectedPathIdFormat = new JsonParser()
+			.parse("{\"path\":[{\"resource-type\":\"generic-vnf\"},{\"resource-type\":\"vserver\"},{\"resource-type\":\"pserver\"},{\"resource-type\":\"complex\"}]}").getAsJsonObject();
+
+	@Before
+	public void setUp() throws Exception {
+
+		MockitoAnnotations.initMocks(this);
+
+		graph = TinkerGraph.open();
+
+		Vertex gnvf1 = graph.addVertex(T.label, "generic-vnf", T.id, "0", "aai-node-type", "generic-vnf", "vnf-id",
+				"vnf-id-1", "vnf-name", "vnf-name-1");
+		Vertex vserver1 = graph.addVertex(T.label, "vserver", T.id, "1", "aai-node-type", "vserver", "vserver-id",
+				"vserver-id-1", "vserver-name", "vserver-name-1");
+		Vertex pserver1 = graph.addVertex(T.label, "pserver", T.id, "2", "aai-node-type", "pserver", "hostname",
+				"hostname-1");
+		Vertex complex1 = graph.addVertex(T.label, "complex", T.id, "3", "aai-node-type", "complex",
+				"physical-location-id", "physical-location-id-1", "country", "US");
+
+		Vertex pserver2 = graph.addVertex(T.label, "pserver", T.id, "5", "aai-node-type", "pserver", "hostname",
+				"hostname-2");
+		Vertex complex2 = graph.addVertex(T.label, "complex", T.id, "6", "aai-node-type", "complex",
+				"physical-location-id", "physical-location-id-2", "country", "US");
+
+		GraphTraversalSource g = graph.traversal();
+		rules.addEdge(g, gnvf1, vserver1);
+		rules.addEdge(g, vserver1, pserver1);
+		rules.addEdge(g, pserver1, complex1);
+		rules.addEdge(g, gnvf1, pserver2);
+		rules.addEdge(g, pserver2, complex2);
+
+		resultTree = graph.traversal().V("0").out().out().tree().next();
+		resultPath = graph.traversal().V("0").out().hasId("1").out().hasId("2").out().hasId("3").path().next();
+	}
+
+	@Test
+	public void testTreeResultQueryIdFormat()
+			throws AAIFormatVertexException, AAIException, AAIFormatQueryResultFormatNotSupported {
+
+		createLoaderEngineSetup();
+		idFormat = new IdURL(loader, urlBuilder);
+
+		assertNotNull(dbEngine.tx());
+		assertNotNull(dbEngine.asAdmin());
+
+		JsonObject json = idFormat.formatObject(resultTree);
+		
+		assertEquals(this.expectedTreeIdFormat, json);
+
+	}
+	
+	@Test
+	public void testPathResultQueryIdFormat()
+			throws AAIFormatVertexException, AAIException, AAIFormatQueryResultFormatNotSupported {
+
+		createLoaderEngineSetup();
+		idFormat = new IdURL(loader, urlBuilder);
+
+		assertNotNull(dbEngine.tx());
+		assertNotNull(dbEngine.asAdmin());
+
+		JsonObject json = idFormat.formatObject(resultPath);
+		
+		assertEquals(this.expectedPathIdFormat, json);
+
+	}
+
+	
+	@Test(expected = AAIFormatQueryResultFormatNotSupported.class)
+	public void testThrowsExceptionIfObjectNotSupported() throws AAIFormatVertexException,
+			AAIException, UnsupportedEncodingException, AAIFormatQueryResultFormatNotSupported {
+
+		loader = mock(Loader.class);
+		idFormat = new IdURL(loader, urlBuilder);
+		idFormat.formatObject(new String());
+	}
+
+	public void createLoaderEngineSetup() {
+
+		if (loader == null) {
+			loader = LoaderFactory.createLoaderForVersion(factoryType, version);
+			dbEngine = spy(new TitanDBEngine(QueryStyle.TRAVERSAL, DBConnectionType.CACHED, loader));
+
+			TransactionalGraphEngine.Admin spyAdmin = spy(dbEngine.asAdmin());
+
+			when(dbEngine.tx()).thenReturn(graph);
+			when(dbEngine.asAdmin()).thenReturn(spyAdmin);
+
+			when(spyAdmin.getReadOnlyTraversalSource())
+					.thenReturn(graph.traversal(GraphTraversalSource.build().with(ReadOnlyStrategy.instance())));
+			when(spyAdmin.getTraversalSource()).thenReturn(graph.traversal());
+		}
+	}
+}
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/RawFormatTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/RawFormatTest.java
index 37a2a4f0..a33349fd 100644
--- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/RawFormatTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/RawFormatTest.java
@@ -1,14 +1,14 @@
-/*-
+/**
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,22 +16,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-
 package org.onap.aai.serialization.queryformats;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
-import java.io.UnsupportedEncodingException;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Path;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
 import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.T;
@@ -53,14 +47,10 @@ import org.onap.aai.serialization.db.EdgeRules;
 import org.onap.aai.serialization.engines.QueryStyle;
 import org.onap.aai.serialization.engines.TitanDBEngine;
 import org.onap.aai.serialization.engines.TransactionalGraphEngine;
-import org.onap.aai.serialization.queryformats.RawFormat.Builder;
 import org.onap.aai.serialization.queryformats.exceptions.AAIFormatQueryResultFormatNotSupported;
 import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException;
 import org.onap.aai.serialization.queryformats.utils.UrlBuilder;
 
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
 public class RawFormatTest extends AAISetup {
 
 	@Mock
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/SimpleFormatTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/SimpleFormatTest.java
index 5e400116..ec89aa30 100644
--- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/SimpleFormatTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/SimpleFormatTest.java
@@ -19,6 +19,7 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
+
 package org.onap.aai.serialization.queryformats;
 
 import com.google.gson.JsonObject;
@@ -33,6 +34,7 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.onap.aai.AAISetup;
 import org.onap.aai.dbmap.DBConnectionType;
 import org.onap.aai.exceptions.AAIException;
 import org.onap.aai.introspection.Loader;
@@ -56,7 +58,7 @@ import static org.mockito.Matchers.anyObject;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.*;
 
-public class SimpleFormatTest {
+public class SimpleFormatTest extends AAISetup {
 
 	@Mock
 	private UrlBuilder urlBuilder;