--- /dev/null
+/**
+ * ============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 java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.javatuples.Pair;
+import org.onap.aai.db.props.AAIProperties;
+import org.onap.aai.serialization.queryformats.exceptions.AAIFormatQueryResultFormatNotSupported;
+import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException;
+
+import com.google.gson.JsonObject;
+
+public class Count implements FormatMapper {
+
+ @Override
+ public JsonObject formatObject(Object o) throws AAIFormatVertexException, AAIFormatQueryResultFormatNotSupported {
+ @SuppressWarnings("unchecked")
+ List<Object> list = (List<Object>) o;
+
+ final JsonObject countResult = new JsonObject();
+
+ list.stream().map(this::getCount)
+ .filter( Optional<Pair<String, Long>>::isPresent )
+ .map(Optional<Pair<String, Long>>::get)
+ .collect( Collectors.toConcurrentMap( Pair::getValue0, Pair::getValue1, Long::sum ) )
+ .forEach( (k,v) -> countResult.addProperty(k, v) );
+
+ return countResult;
+ }
+
+ @Override
+ public int parallelThreshold() {
+ return 20;
+ }
+
+ private Optional<Pair<String, Long>> getCount(Object o){
+
+ Pair<String, Long> pair = null;
+
+ if (o instanceof Vertex) {
+ Vertex v = (Vertex) o;
+ pair = Pair.with(v.property(AAIProperties.NODE_TYPE).value().toString(), 1L);
+ } else if (o instanceof Tree) {
+ pair = Pair.with("trees", 1L);
+ } else if (o instanceof Path) {
+ pair = Pair.with("paths", 1L);
+ } else if (o instanceof Long) {
+ pair = Pair.with("count", (Long)o);
+ }
+
+ if (pair == null) {
+ return Optional.<Pair<String, Long>>empty();
+ }
+
+ return Optional.<Pair<String, Long>>of(pair);
+ }
+
+}
public enum Format {
graphson,
- pathed, id, resource,
+ pathed,
+ id,
+ resource,
simple,
resource_and_url,
console,
- raw
+ raw,
+ count
}
public Formatter get(Format format, MultivaluedMap<String, String> params) throws AAIException {
- Formatter formattter = null;
+ Formatter formatter = null;
switch (format) {
case graphson :
- formattter = new Formatter(inject(new GraphSON(), params));
+ formatter = new Formatter(inject(new GraphSON(), params));
break;
case pathed :
- formattter = new Formatter(inject(new PathedURL(loader, urlBuilder), params));
+ formatter = new Formatter(inject(new PathedURL(loader, urlBuilder), params));
break;
case id :
- formattter = new Formatter(inject(new IdURL(loader, urlBuilder), params));
+ formatter = new Formatter(inject(new IdURL(loader, urlBuilder), params));
break;
case resource :
- formattter = new Formatter(inject(new Resource.Builder(loader, serializer, urlBuilder), params).build());
+ formatter = new Formatter(inject(new Resource.Builder(loader, serializer, urlBuilder), params).build());
break;
case resource_and_url :
- formattter = new Formatter(inject(new Resource.Builder(loader, serializer, urlBuilder).includeUrl(), params).build());
+ formatter = new Formatter(inject(new Resource.Builder(loader, serializer, urlBuilder).includeUrl(), params).build());
break;
case raw :
- formattter = new Formatter(inject(new RawFormat.Builder(loader, serializer, urlBuilder), params).build());
+ formatter = new Formatter(inject(new RawFormat.Builder(loader, serializer, urlBuilder), params).build());
break;
case simple :
- formattter = new Formatter(inject(new RawFormat.Builder(loader, serializer, urlBuilder).depth(0).modelDriven(), params).build());
+ formatter = new Formatter(inject(new RawFormat.Builder(loader, serializer, urlBuilder).depth(0).modelDriven(), params).build());
break;
case console :
- formattter = new Formatter(inject(new Console(), params));
+ formatter = new Formatter(inject(new Console(), params));
+ break;
+ case count :
+ formatter = new Formatter(inject(new Count(), params));
break;
default :
break;
}
- return formattter;
+ return formatter;
}
private <T> T inject (T obj, MultivaluedMap<String, String> params) throws QueryParamInjectionException {
*/
package org.onap.aai.serialization.queryformats;
-import com.google.gson.JsonObject;
+import org.onap.aai.serialization.queryformats.exceptions.AAIFormatQueryResultFormatNotSupported;
import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException;
+import com.google.gson.JsonObject;
public interface FormatMapper {
- public JsonObject formatObject(Object v) throws AAIFormatVertexException;
+ public JsonObject formatObject(Object o) throws AAIFormatVertexException, AAIFormatQueryResultFormatNotSupported;
public int parallelThreshold();
}
*/
package org.onap.aai.serialization.queryformats;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.onap.aai.serialization.queryformats.exceptions.AAIFormatQueryResultFormatNotSupported;
+import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException;
+
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
-import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Stream;
public class Formatter {
protected JsonParser parser = new JsonParser();
protected final FormatMapper format;
- public Formatter (FormatMapper format) {
+
+ public Formatter(FormatMapper format) {
this.format = format;
}
-
- public JsonObject output(List<Object> vertices) {
+
+ public JsonObject output(List<Object> queryResults) {
+
Stream<Object> stream = null;
JsonObject result = new JsonObject();
JsonArray body = new JsonArray();
- if (vertices.size() >= format.parallelThreshold()) {
- stream = vertices.parallelStream();
- } else {
- stream = vertices.stream();
- }
- final boolean isParallel = stream.isParallel();
- stream.map(v -> {
+
+ if (this.format instanceof Count) {
+ JsonObject countResult;
try {
- return Optional.<JsonObject>of(format.formatObject(v));
- } catch (AAIFormatVertexException e) {
- LOGGER.warn("Failed to format vertex, returning a partial list", e);
+ countResult = format.formatObject(queryResults);
+ body.add(countResult);
+ } catch (Exception e) {
+ LOGGER.warn("Failed to format result type of the query", e);
}
+ } else {
+ if (queryResults.size() >= format.parallelThreshold()) {
+ stream = queryResults.parallelStream();
+ } else {
+ stream = queryResults.stream();
+ }
+
+ final boolean isParallel = stream.isParallel();
+
+ stream.map(o -> {
+ try {
+ return Optional.<JsonObject>of(format.formatObject(o));
+ } catch (AAIFormatVertexException e) {
+ LOGGER.warn("Failed to format vertex, returning a partial list", e);
+ } catch (AAIFormatQueryResultFormatNotSupported e) {
+ LOGGER.warn("Failed to format result type of the query", e);
+ }
- return Optional.<JsonObject>empty();
- }).forEach(obj -> {
- if (obj.isPresent()) {
- if (isParallel) {
- synchronized (body) {
- body.add(obj.get());
+ return Optional.<JsonObject>empty();
+ })
+ .filter(Optional<JsonObject>::isPresent)
+ .map(Optional<JsonObject>::get)
+ .forEach(json -> {
+ if (isParallel) {
+ synchronized (body) {
+ body.add(json);
+ }
+ } else {
+ body.add(json);
}
- } else {
- body.add(obj.get());
- }
- }
- });
-
+ });
+
+ }
result.add("results", body);
-
return result.getAsJsonObject();
}
-
+
}
import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException;
import org.onap.aai.serialization.queryformats.utils.UrlBuilder;
-public class IdURL implements FormatMapper {
+public class IdURL extends MultiFormatMapper {
private final UrlBuilder urlBuilder;
private final JsonParser parser;
}
@Override
- public JsonObject formatObject(Object input) throws AAIFormatVertexException {
- Vertex v = (Vertex)input;
+ protected JsonObject getJsonFromVertex(Vertex v) throws AAIFormatVertexException {
+
try {
final Introspector searchResult = this.loader.introspectorFromName("result-data");
--- /dev/null
+/**\r
+ * ============LICENSE_START=======================================================\r
+ * org.onap.aai\r
+ * ================================================================================\r
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
+ * ================================================================================\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ * ============LICENSE_END=========================================================\r
+ *\r
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
+ */\r
+package org.onap.aai.serialization.queryformats;\r
+\r
+import java.util.Iterator;\r
+import java.util.List;\r
+\r
+import org.apache.tinkerpop.gremlin.process.traversal.Path;\r
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;\r
+import org.apache.tinkerpop.gremlin.structure.Vertex;\r
+import org.onap.aai.serialization.queryformats.exceptions.AAIFormatQueryResultFormatNotSupported;\r
+import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException;\r
+\r
+import com.google.gson.JsonArray;\r
+import com.google.gson.JsonObject;\r
+\r
+public abstract class MultiFormatMapper implements FormatMapper {\r
+\r
+ @Override\r
+ public JsonObject formatObject(Object input) throws AAIFormatVertexException, AAIFormatQueryResultFormatNotSupported {\r
+ if (input instanceof Vertex) {\r
+ return this.getJsonFromVertex((Vertex) input);\r
+ } else if (input instanceof Tree) {\r
+ return this.getJsonFomTree((Tree<?>) input);\r
+ } else if (input instanceof Path) {\r
+ return this.getJsonFromPath((Path) input);\r
+ } else {\r
+ throw new AAIFormatQueryResultFormatNotSupported();\r
+ }\r
+ }\r
+\r
+ protected abstract JsonObject getJsonFromVertex(Vertex input) throws AAIFormatVertexException;\r
+\r
+ protected JsonObject getJsonFromPath(Path input) throws AAIFormatVertexException {\r
+ List<Object> path = input.objects();\r
+\r
+ JsonObject jo = new JsonObject();\r
+ JsonArray ja = new JsonArray();\r
+ \r
+ for (Object o : path) {\r
+ if (o instanceof Vertex) {\r
+ ja.add(this.getJsonFromVertex((Vertex)o));\r
+ }\r
+ }\r
+ \r
+ jo.add("path", ja);\r
+ return jo;\r
+ }\r
+\r
+ protected JsonObject getJsonFomTree(Tree<?> tree) throws AAIFormatVertexException {\r
+ \r
+ if (tree.isEmpty()) {\r
+ return new JsonObject();\r
+ }\r
+ \r
+ JsonObject t = new JsonObject();\r
+ JsonArray ja = this.getNodesArray(tree);\r
+ if (ja.size() > 0) {\r
+ t.add("nodes", ja);\r
+ }\r
+ \r
+ return t;\r
+ }\r
+ \r
+ private JsonArray getNodesArray (Tree<?> tree) throws AAIFormatVertexException {\r
+ \r
+ JsonArray nodes = new JsonArray();\r
+ Iterator<?> it = tree.keySet().iterator();\r
+\r
+ while (it.hasNext()) {\r
+ Object o = it.next();\r
+ JsonObject me = new JsonObject();\r
+ if (o instanceof Vertex) {\r
+ me = this.getJsonFromVertex((Vertex) o);\r
+ }\r
+ JsonArray ja = this.getNodesArray((Tree<?>) tree.get(o));\r
+ if (ja.size() > 0) {\r
+ me.add("nodes", ja);\r
+ }\r
+ nodes.add(me);\r
+ }\r
+ return nodes;\r
+ }\r
+ \r
+ \r
+ @Override\r
+ public int parallelThreshold() {\r
+ return 100;\r
+ }\r
+\r
+}\r
import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException;
import org.onap.aai.serialization.queryformats.utils.UrlBuilder;
-public final class PathedURL implements FormatMapper {
+public final class PathedURL extends MultiFormatMapper {
private final UrlBuilder urlBuilder;
private final JsonParser parser;
}
@Override
- public JsonObject formatObject(Object input) throws AAIFormatVertexException {
- Vertex v = (Vertex)input;
+ protected JsonObject getJsonFromVertex(Vertex v) throws AAIFormatVertexException {
+
try {
final Introspector searchResult = this.loader.introspectorFromName("result-data");
import com.google.gson.JsonParser;
-public class RawFormat implements FormatMapper {
+public class RawFormat extends MultiFormatMapper {
protected JsonParser parser = new JsonParser();
protected final DBSerializer serializer;
protected final Loader loader;
this.nodesOnly = builder.isNodesOnly();
}
- @Override
- public JsonObject formatObject(Object input) throws AAIFormatVertexException {
- Vertex v = (Vertex)input;
- JsonObject json = new JsonObject();
- json.addProperty("id", v.id().toString());
- json.addProperty("node-type", v.<String>value(AAIProperties.NODE_TYPE));
- json.addProperty("url", this.urlBuilder.pathed(v));
- json.add("properties", this.createPropertiesObject(v));
- if (!nodesOnly) {
- json.add("related-to", this.createRelationshipObject(v));
- }
- return json;
- }
-
@Override
public int parallelThreshold() {
return 100;
}
}
}
+
+ @Override
+ protected JsonObject getJsonFromVertex(Vertex v) throws AAIFormatVertexException {
+
+ JsonObject json = new JsonObject();
+ json.addProperty("id", v.id().toString());
+ json.addProperty("node-type", v.<String>value(AAIProperties.NODE_TYPE));
+ json.addProperty("url", this.urlBuilder.pathed(v));
+ json.add("properties", this.createPropertiesObject(v));
+ if (!nodesOnly) {
+ json.add("related-to", this.createRelationshipObject(v));
+ }
+ return json;
+ }
}
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
-public class Resource implements FormatMapper {
+public class Resource extends MultiFormatMapper {
private final Loader loader;
private final DBSerializer serializer;
}
@Override
- public JsonObject formatObject(Object input) throws AAIFormatVertexException {
- Vertex v = (Vertex)input;
+ protected JsonObject getJsonFromVertex(Vertex v) throws AAIFormatVertexException {
+
JsonObject json = new JsonObject();
if (this.includeUrl) {
-/*-
+/**
* ============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,
* 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.exceptions;
public class AAIFormatQueryResultFormatNotSupported extends Exception {
--- /dev/null
+/**
+ * ============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());
+ }
+ }
+}
--- /dev/null
+/**
+ * ============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());
+ }
+ }
+}
-/*-
+/**
* ============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,
* 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;
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
*
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
+
package org.onap.aai.serialization.queryformats;
import com.google.gson.JsonObject;
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 static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.*;
-public class SimpleFormatTest {
+public class SimpleFormatTest extends AAISetup {
@Mock
private UrlBuilder urlBuilder;
Code Review / aai / aai-common.git / commitdiff