<parent>
<groupId>org.onap.aai.traversal</groupId>
<artifactId>traversal</artifactId>
- <version>1.14.2-SNAPSHOT</version>
+ <version>1.14.3-SNAPSHOT</version>
</parent>
<groupId>org.onap.aai.traversal</groupId>
<artifactId>aai-traversal</artifactId>
<!-- versions -->
<spring.boot.version>2.4.13</spring.boot.version>
- <spring.version>5.3.13</spring.version>
+ <janusgraph.version>0.5.0</janusgraph.version>
+ <gremlin.version>3.4.13</gremlin.version>
+
<spring-cloud.version>2020.0.2</spring-cloud.version>
- <spring.test.version>${spring.version}</spring.test.version>
- <spring.jms.version>${spring.version}</spring.jms.version>
+
<javax.servlet.version>4.0.1</javax.servlet.version>
<antlr.version>4.9.3</antlr.version>
<keycloak.version>11.0.2</keycloak.version>
- <micrometer-spring-legacy.version>1.3.19</micrometer-spring-legacy.version>
- <micrometer-core.version>1.6.6</micrometer-core.version>
- <micrometer-jersey2>1.6.6</micrometer-jersey2>
+
+ <micrometer.version>1.6.6</micrometer.version>
<mockito.core.version>3.4.0</mockito.core.version>
- <powermock.version>2.0.9</powermock.version>
<testcontainers.version>1.6.1</testcontainers.version>
<netty.handler.version>4.1.63.Final</netty.handler.version>
<netty.version>4.1.63.Final</netty.version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-hateoas</artifactId>
</dependency>
- <dependency>
- <groupId>io.micrometer</groupId>
- <artifactId>micrometer-spring-legacy</artifactId>
- <version>${micrometer-spring-legacy.version}</version>
- </dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
- <version>${micrometer-core.version}</version>
+ <version>${micrometer.version}</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
- <!-- <version>${micrometer-registry-prometheus.version}</version> -->
+ <version>${micrometer.version}</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-jersey2</artifactId>
- <version>${micrometer-jersey2}</version>
+ <version>${micrometer.version}</version>
</dependency>
<dependency>
<groupId>javax.jms</groupId>
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.janusgraph</groupId>
+ <artifactId>janusgraph-inmemory</artifactId>
+ <version>${janusgraph.version}</version>
+ </dependency>
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-ffi</artifactId>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
</dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>${powermock.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito2</artifactId>
- <version>${powermock.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-javaagent</artifactId>
- <version>${powermock.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4-rule-agent</artifactId>
- <version>${powermock.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.beust</groupId>
- <artifactId>jcommander</artifactId>
- </dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-webflux</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jetty</artifactId>
SchemaVersions schemaVersions = SpringContextAware.getBean(SchemaVersions.class);
traversalUriHttpEntry.setHttpEntryProperties(schemaVersions.getDefaultVersion());
- traversalUriHttpEntry.setPaginationParameters("-1", "-1");
TransactionalGraphEngine dbEngine = traversalUriHttpEntry.getDbEngine();
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.RequestBody;
-import com.beust.jcommander.internal.Lists;
-import com.beust.jcommander.internal.Maps;
-
@Path("/cq2gremlintest")
public class CQ2GremlinTest extends RESTAPI {
String realTime = headers.getRequestHeaders().getFirst("Real-Time");
SchemaVersions schemaVersions = SpringContextAware.getBean(SchemaVersions.class);
traversalUriHttpEntry.setHttpEntryProperties(schemaVersions.getDefaultVersion());
- traversalUriHttpEntry.setPaginationParameters("-1", "-1");
return processC2UnitTest(content);
}
}
private List<Vertex> createGraph(CustomQueryTestDTO content, Graph graph) {
- Map<String, Vertex> verticesMap = Maps.newLinkedHashMap();
+ Map<String, Vertex> verticesMap = new LinkedHashMap<>();
// Creating all the Vertices
content.getVerticesDtos().forEach(vertex -> {
StringBuilder vertexIdentifier = new StringBuilder();
- List<String> keyValues = Lists.newArrayList();
+ List<String> keyValues = new ArrayList<>();
keyValues.add(T.id.toString());
keyValues.add(String.format("%02d", verticesMap.size() * 10));
AtomicInteger index = new AtomicInteger(0);
});
- List<Vertex> expectedVertices = Lists.newArrayList();
+ List<Vertex> expectedVertices = new ArrayList<>();
content.getExpectedResultsDtos().getIds()
.forEach(vertexId -> expectedVertices.add(verticesMap.get(vertexId)));
return expectedVertices;
import java.io.FileNotFoundException;
import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import javax.ws.rs.core.MultivaluedMap;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.onap.aai.edges.EdgeIngestor;
+import org.javatuples.Pair;
import org.onap.aai.exceptions.AAIException;
-import org.onap.aai.introspection.LoaderFactory;
import org.onap.aai.introspection.ModelType;
+import org.onap.aai.query.builder.Pageable;
import org.onap.aai.rest.db.HttpEntry;
import org.onap.aai.rest.dsl.DslQueryProcessor;
import org.onap.aai.rest.dsl.V1DslQueryProcessor;
import org.onap.aai.rest.search.GenericQueryProcessor;
import org.onap.aai.rest.search.GremlinServerSingleton;
import org.onap.aai.rest.search.QueryProcessorType;
+import org.onap.aai.rest.util.PaginationUtil;
import org.onap.aai.serialization.db.DBSerializer;
import org.onap.aai.serialization.engines.TransactionalGraphEngine;
import org.onap.aai.serialization.queryformats.Format;
@RequestParam(defaultValue = "graphson") String format,
@RequestParam(defaultValue = "no_op") String subgraph,
@RequestParam(defaultValue = "all") String validate,
- @RequestParam(defaultValue = "-1") String resultIndex,
- @RequestParam(defaultValue = "-1") String resultSize,
+ @RequestParam(defaultValue = "-1") int resultIndex,
+ @RequestParam(defaultValue = "-1") int resultSize,
@RequestHeader HttpHeaders headers,
HttpServletRequest request) throws FileNotFoundException, AAIException {
Set<String> roles = this.getRoles(request.getUserPrincipal());
return processExecuteQuery(dslQuery, request, versionParam, format, subgraph,
- validate, headers, resultIndex, resultSize, roles);
+ validate, headers, new Pageable(resultIndex, resultSize), roles);
}
public ResponseEntity<String> processExecuteQuery(String dslQuery, HttpServletRequest request, String versionParam,
String queryFormat, String subgraph, String validate, HttpHeaders headers,
- String resultIndex, String resultSize, Set<String> roles) throws FileNotFoundException, AAIException {
+ Pageable pageable, Set<String> roles) throws FileNotFoundException, AAIException {
final SchemaVersion version = new SchemaVersion(versionParam);
final String sourceOfTruth = headers.getFirst("X-FromAppId");
}
}
- String result = executeQuery(dslQuery, request, queryFormat, subgraph, validate, queryParams, resultIndex, resultSize,
+ Pair<List<Object>,Map<String,List<String>>> executionResult = executeQuery(dslQuery, request, queryFormat, subgraph, validate, queryParams, pageable,
roles, version, sourceOfTruth, dslOverride);
+ List<Object> vertices = executionResult.getValue0();
+
+ String result = serializeResponse(request, queryFormat, headers, version, sourceOfTruth, queryParams, executionResult.getValue1(), vertices);
+
+ if (PaginationUtil.hasValidPaginationParams(pageable)) {
+ int totalCount = vertices.size();
+ long totalPages = PaginationUtil.getTotalPages(pageable, totalCount);
+ return ResponseEntity.ok()
+ .header("total-results", String.valueOf(totalCount))
+ .header("total-pages", String.valueOf(totalPages))
+ .body(result);
+ } else {
+ return ResponseEntity.ok(result);
+ }
+ }
+
+ private String serializeResponse(HttpServletRequest request, String queryFormat, HttpHeaders headers,
+ final SchemaVersion version, final String sourceOfTruth, MultivaluedMap<String, String> queryParameters, final Map<String, List<String>> propertiesMap,
+ List<Object> vertices) throws AAIException {
+ DBSerializer serializer =
+ new DBSerializer(version, httpEntry.getDbEngine(), ModelType.MOXY, sourceOfTruth);
+ String serverBase = request.getRequestURL().toString().replaceAll("/(v[0-9]+|latest)/.*", "/");
+ FormatFactory ff = new FormatFactory(httpEntry.getLoader(), serializer,
+ schemaVersions, this.basePath, serverBase);
+
+ MultivaluedMap<String, String> mvm = new MultivaluedHashMap<>();
+ mvm.putAll(queryParameters);
+ Format format = Format.getFormat(queryFormat);
+ if (isHistory(format)) {
+ mvm.putSingle("startTs", Long.toString(getStartTime(format, mvm)));
+ mvm.putSingle("endTs", Long.toString(getEndTime(mvm)));
+ }
+ Formatter formatter = ff.get(format, mvm);
+
+ String result = "";
+ if (propertiesMap != null && !propertiesMap.isEmpty()) {
+ result = formatter.output(vertices, propertiesMap).toString();
+ } else {
+ result = formatter.output(vertices).toString();
+ }
+
MediaType acceptType = headers.getAccept().stream()
.filter(Objects::nonNull)
.filter(header -> !header.equals(MediaType.ALL))
if (MediaType.APPLICATION_XML.isCompatibleWith(acceptType)) {
result = xmlFormatTransformer.transform(result);
}
-
- if (httpEntry.isPaginated()) {
- return ResponseEntity.ok()
- .header("total-results", String.valueOf(httpEntry.getTotalVertices()))
- .header("total-pages", String.valueOf(httpEntry.getTotalPaginationBuckets()))
- .body(result);
- } else {
- return ResponseEntity.ok(result);
- }
+ return result;
}
- private String executeQuery(String content, HttpServletRequest req, String queryFormat, String subgraph,
- String validate, MultivaluedMap<String, String> queryParameters, String resultIndex, String resultSize, Set<String> roles,
+ private Pair<List<Object>,Map<String,List<String>>> executeQuery(String content, HttpServletRequest req, String queryFormat, String subgraph,
+ String validate, MultivaluedMap<String, String> queryParameters, Pageable pageable, Set<String> roles,
final SchemaVersion version, final String sourceOfTruth, final String dslOverride)
throws AAIException, FileNotFoundException {
final String serverBase =
req.getRequestURL().toString().replaceAll("/(v[0-9]+|latest)/.*", "/");
httpEntry.setHttpEntryProperties(version, serverBase);
- httpEntry.setPaginationParameters(resultIndex, resultSize);
JsonObject input = JsonParser.parseString(content).getAsJsonObject();
JsonElement dslElement = input.get("dsl");
final TransactionalGraphEngine dbEngine = httpEntry.getDbEngine();
GraphTraversalSource traversalSource =
getTraversalSource(dbEngine, format, queryParameters, roles);
-
+
GenericQueryProcessor processor =
new GenericQueryProcessor.Builder(dbEngine, gremlinServerSingleton)
.queryFrom(dsl, "dsl").queryProcessor(dslQueryProcessor).version(dslApiVersion)
if (isAggregate(format)) {
// Dedup if duplicate objects are returned in each array in the aggregate format
// scenario.
- List<Object> vertTempDedupedObjectList = dedupObjectInAggregateFormatResult(vertTemp);
- vertices = httpEntry
- .getPaginatedVertexListForAggregateFormat(vertTempDedupedObjectList);
+ List<Object> vertTempDedupedObjectList = dedupObjectInAggregateFormatResultStreams(vertTemp);
+ vertices = PaginationUtil.hasValidPaginationParams(pageable)
+ ? vertices = PaginationUtil.getPaginatedVertexListForAggregateFormat(vertTempDedupedObjectList, pageable)
+ : vertTempDedupedObjectList;
} else {
- vertices = httpEntry.getPaginatedVertexList(vertTemp);
+ int startIndex = pageable.getPage() * pageable.getPageSize();
+ vertices = PaginationUtil.hasValidPaginationParams(pageable)
+ ? vertTemp.subList(startIndex, startIndex + pageable.getPageSize())
+ : vertTemp;
}
- DBSerializer serializer =
- new DBSerializer(version, dbEngine, ModelType.MOXY, sourceOfTruth);
- FormatFactory ff = new FormatFactory(httpEntry.getLoader(), serializer,
- schemaVersions, this.basePath, serverBase);
-
- MultivaluedMap<String, String> mvm = new MultivaluedHashMap<>();
- mvm.putAll(queryParameters);
- if (isHistory(format)) {
- mvm.putSingle("startTs", Long.toString(getStartTime(format, mvm)));
- mvm.putSingle("endTs", Long.toString(getEndTime(mvm)));
- }
- Formatter formatter = ff.get(format, mvm);
-
- final Map<String, List<String>> propertiesMap = processor.getPropertiesMap();
- String result = "";
- if (propertiesMap != null && !propertiesMap.isEmpty()) {
- result = formatter.output(vertices, propertiesMap).toString();
- } else {
- result = formatter.output(vertices).toString();
- }
- return result;
+ return Pair.with(vertices, processor.getPropertiesMap());
}
private List<Object> dedupObjectInAggregateFormatResultStreams(List<Object> vertTemp) {
.map(o -> ((ArrayList<?>) o).stream().distinct().collect(Collectors.toList()))
.collect(Collectors.toList());
}
- private List<Object> dedupObjectInAggregateFormatResult(List<Object> vertTemp) {
- List<Object> vertTempDedupedObjectList = new ArrayList<Object>();
- Iterator<Object> itr = vertTemp.listIterator();
- while (itr.hasNext()) {
- Object o = itr.next();
- if (o instanceof ArrayList) {
- vertTempDedupedObjectList
- .add(((ArrayList) o).stream().distinct().collect(Collectors.toList()));
- }
- }
- return vertTempDedupedObjectList;
- }
private MultivaluedMap<String, String> toMultivaluedMap(Map<String, String[]> map) {
MultivaluedMap<String, String> multivaluedMap = new MultivaluedHashMap<>();
import org.onap.aai.introspection.ModelType;
import org.onap.aai.logging.ErrorLogHelper;
import org.onap.aai.parsers.query.QueryParser;
+import org.onap.aai.query.builder.Pageable;
import org.onap.aai.rest.db.HttpEntry;
import org.onap.aai.rest.search.CustomQueryConfig;
import org.onap.aai.rest.search.GenericQueryProcessor;
import org.onap.aai.rest.search.GremlinServerSingleton;
import org.onap.aai.rest.search.QueryProcessorType;
+import org.onap.aai.rest.util.PaginationUtil;
import org.onap.aai.restcore.HttpMethod;
import org.onap.aai.restcore.util.URITools;
import org.onap.aai.serialization.db.DBSerializer;
import io.micrometer.core.annotation.Timed;
-@Path("{version: v[1-9][0-9]*|latest}/query")
@Timed
+@Path("{version: v[1-9][0-9]*|latest}/query")
public class QueryConsumer extends TraversalConsumer {
private QueryProcessorType processorType = QueryProcessorType.LOCAL_GROOVY;
@PUT
@Consumes({MediaType.APPLICATION_JSON})
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- public Response executeQuery(String content, @PathParam("version") String versionParam,
+ public Response executeQuery(
+ String content,
+ @PathParam("version") String versionParam,
@DefaultValue("graphson") @QueryParam("format") String queryFormat,
@DefaultValue("no_op") @QueryParam("subgraph") String subgraph,
- @Context HttpHeaders headers, @Context HttpServletRequest req, @Context UriInfo info,
- @DefaultValue("-1") @QueryParam("resultIndex") String resultIndex,
- @DefaultValue("-1") @QueryParam("resultSize") String resultSize) {
+ @DefaultValue("-1") @QueryParam("resultIndex") int resultIndex,
+ @DefaultValue("-1") @QueryParam("resultSize") int resultSize,
+ @Context HttpHeaders headers,
+ @Context HttpServletRequest req,
+ @Context UriInfo info) {
Set<String> roles = this.getRoles(req.getUserPrincipal());
return runner(TraversalConstants.AAI_TRAVERSAL_TIMEOUT_ENABLED,
@Override
public Response process() {
return processExecuteQuery(content, req, versionParam, queryFormat, subgraph,
- headers, info, resultIndex, resultSize, roles);
+ headers, info, new Pageable(resultIndex, resultSize), roles);
}
});
}
public Response processExecuteQuery(String content, HttpServletRequest req, String versionParam,
- String queryFormat, String subgraph, HttpHeaders headers, UriInfo info, String resultIndex,
- String resultSize, Set<String> roles) {
+ String queryFormat, String subgraph, HttpHeaders headers, UriInfo info, Pageable pageable, Set<String> roles) {
String sourceOfTruth = headers.getRequestHeaders().getFirst("X-FromAppId");
String queryProcessor = headers.getRequestHeaders().getFirst("QueryProcessor");
* Changes for Pagination
*/
- traversalUriHttpEntry.setPaginationParameters(resultIndex, resultSize);
dbEngine = traversalUriHttpEntry.getDbEngine();
if (startElement != null) {
.traversalSource(isHistory(format), traversalSource).create();
}
List<Object> vertTemp = processor.execute(subGraphStyle);
- List<Object> vertices = traversalUriHttpEntry.getPaginatedVertexList(vertTemp);
+ int fromIndex = pageable.getPage() * pageable.getPageSize();
+ List<Object> vertices = PaginationUtil.hasValidPaginationParams(pageable)
+ ? vertTemp.subList(fromIndex, fromIndex + pageable.getPageSize())
+ : vertTemp;
DBSerializer serializer =
new DBSerializer(version, dbEngine, ModelType.MOXY, sourceOfTruth);
result = xmlFormatTransformer.transform(result);
}
- if (traversalUriHttpEntry.isPaginated()) {
+ if (PaginationUtil.hasValidPaginationParams(pageable)) {
+ int totalCount = vertTemp.size();
+ long totalPages = PaginationUtil.getTotalPages(pageable, totalCount);
response = Response.status(Status.OK).type(acceptType)
- .header("total-results", traversalUriHttpEntry.getTotalVertices())
- .header("total-pages", traversalUriHttpEntry.getTotalPaginationBuckets())
+ .header("total-results", totalCount)
+ .header("total-pages", totalPages)
.entity(result).build();
} else {
response = Response.status(Status.OK).type(acceptType).entity(result).build();
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
-import org.springframework.context.annotation.ScopedProxyMode;
import org.springframework.stereotype.Component;
/**
* 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.
* ============LICENSE_END=========================================================
*/
-import com.beust.jcommander.internal.Maps;
import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
private List<LinkedHashMap<String, String>> edgesDtos;
@JsonProperty("optional-properties")
- private Map<String, String> queryOptionalProperties = Maps.newHashMap();
+ private Map<String, String> queryOptionalProperties = new HashMap<>();
@JsonProperty("required-properties")
- private Map<String, String> queryRequiredProperties = Maps.newHashMap();
+ private Map<String, String> queryRequiredProperties = new HashMap<>();
@JsonProperty("expected-result")
private ExpectedResultsDto expectedResultsDtos;
--- /dev/null
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2024 Deutsche Telekom. 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=========================================================
+ */
+package org.onap.aai.rest.util;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.onap.aai.exceptions.AAIException;
+import org.onap.aai.query.builder.Pageable;
+
+public class PaginationUtil {
+
+ public static List<Object> getPaginatedVertexListForAggregateFormat(List<Object> aggregateVertexList, Pageable pageable) throws AAIException {
+ if (aggregateVertexList != null && !aggregateVertexList.isEmpty() && aggregateVertexList.size() == 1) {
+ List<Object> vertexList = (List<Object>) aggregateVertexList.get(0);
+ int fromIndex = pageable.getPage() * pageable.getPageSize();
+ List<Object> page = vertexList.subList(fromIndex, fromIndex + pageable.getPageSize());
+ return Collections.singletonList(page);
+ }
+ // If the list size is greater than 1 or if pagination is not needed, return the original list.
+ return aggregateVertexList;
+ }
+
+ public static boolean hasValidPaginationParams(Pageable pageable) {
+ return pageable.getPage() >= 0 && pageable.getPageSize() > 0;
+ }
+
+ public static long getTotalPages(Pageable pageable, long totalCount) {
+ int pageSize = pageable.getPageSize();
+ long totalPages = totalCount / pageSize;
+ // conditionally add a page for the remainder
+ if (totalCount % pageSize > 0) {
+ totalPages++;
+ }
+ return totalPages;
+ }
+}
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Matcher;
String message = String.format("Unable to find the %s in src/test/resources", fileName);
assertNotNull(message, inputStream);
- String resource = IOUtils.toString(inputStream);
+ String resource = IOUtils.toString(inputStream, Charset.defaultCharset());
inputStream.close();
return resource;
String message = String.format("Unable to find the %s in src/test/resources", fileName);
assertNotNull(message, inputStream);
- String resource = IOUtils.toString(inputStream);
+ String resource = IOUtils.toString(inputStream, Charset.defaultCharset());
inputStream.close();
return resource;
if (cache.containsKey(fileName)) {
resource = cache.get(fileName);
} else {
- resource = IOUtils.toString(inputStream);
+ resource = IOUtils.toString(inputStream, Charset.defaultCharset());
cache.put(fileName, resource);
}
.format("Unable to find the %s in src/test/resources/payloads/named-queries", fileName);
assertNotNull(message, inputStream);
- String resource = IOUtils.toString(inputStream);
+ String resource = IOUtils.toString(inputStream, Charset.defaultCharset());
inputStream.close();
return resource;
--- /dev/null
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2024 Deutsche Telekom. 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=========================================================
+ */
+
+package org.onap.aai;
+
+import java.time.Duration;
+import java.util.Collections;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.reactive.server.WebTestClient;
+
+@TestConfiguration
+public class WebClientConfiguration {
+
+ @Lazy
+ @Bean
+ WebTestClient webTestClient(@LocalServerPort int port) {
+ return WebTestClient.bindToServer()
+ .baseUrl("http://localhost:" + port)
+ .responseTimeout(Duration.ofSeconds(300))
+ .defaultHeaders(headers -> {
+ headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
+ headers.set("Real-Time", "true");
+ headers.set("X-FromAppId", "JUNIT");
+ headers.set("X-TransactionId", "JUNIT");
+ headers.setBasicAuth("AAI", "AAI");
+ })
+ .build();
+ }
+}
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.junit.Assert;
import org.junit.Test;
import org.onap.aai.PayloadUtil;
+import org.onap.aai.WebClientConfiguration;
import org.onap.aai.dbmap.AAIGraph;
import org.onap.aai.entities.AAIErrorResponse;
import org.onap.aai.entities.ServiceException;
import org.onap.aai.util.TraversalConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Import;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
+import org.springframework.test.web.reactive.server.WebTestClient;
-import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
+@Import(WebClientConfiguration.class)
public class DslConsumerTest extends AbstractSpringRestTest {
private static final Logger LOGGER = LoggerFactory.getLogger(DslConsumerTest.class);
- private static final ObjectMapper objectMapper = new ObjectMapper();
+ @Autowired WebTestClient webClient;
@Override
public void createTestGraph() {
assertThat(responseEntity.getBody(), is(containsString("<results><result>")));
}
+ @Test
+ public void thatResultsCanBePaginated() throws Exception {
+ String path = "/aai/v14/dsl";
+ Map<String, String> dslQueryMap = Collections.singletonMap("dsl-query", "pserver*('hostname','test-pserver-dsl')");
+
+ String payload = PayloadUtil.getTemplatePayload("dsl-query.json", dslQueryMap);
+
+ webClient.put()
+ .uri(uriBuilder -> uriBuilder
+ .path(path)
+ .queryParam("format", "console")
+ .build())
+ .contentType(MediaType.APPLICATION_JSON)
+ .bodyValue(payload)
+ .exchange()
+ .expectStatus().isOk();
+
+ String responseEntity = webClient.put()
+ .uri(uriBuilder -> uriBuilder
+ .path(path)
+ .queryParam("format", "console")
+ .queryParam("resultIndex", 0)
+ .queryParam("resultSize", 1)
+ .build())
+ .contentType(MediaType.APPLICATION_JSON)
+ .accept(MediaType.APPLICATION_XML)
+ .bodyValue(payload)
+ .exchange()
+ .expectStatus().isOk()
+ .expectHeader().valueEquals("total-results", 1)
+ .expectHeader().valueEquals("total-pages", 1)
+ .returnResult(String.class)
+ .getResponseBody()
+ .blockFirst();
+
+ assertThat(responseEntity,
+ is(not(containsString("<result><result>"))));
+ assertThat(responseEntity, is(containsString("<results><result>")));
+ }
+
@Test
public void thatWildcardContentTypeCanBeUsed() throws Exception {
.thenReturn(new StringBuffer("https://localhost:8446" + query));
Response response = queryConsumer.executeQuery(payload, version.toString(),
- "resource_and_url", "" + "no_op", httpHeaders, mockRequest, uriInfo, "-1", "-1");
+ "resource_and_url", "" + "no_op", -1, -1, httpHeaders, mockRequest, uriInfo);
String entity = response.getEntity().toString();
assertEquals("Expected the response to be 200 but got this returned: "
.thenReturn(new StringBuffer("https://localhost:8446" + query));
Response response = queryConsumer.executeQuery(payload, version.toString(),
- "resource_and_url", "" + "no_op", httpHeaders, mockRequest, uriInfo, "-1", "-1");
+ "resource_and_url", "" + "no_op", -1, -1, httpHeaders, mockRequest, uriInfo);
String entity = response.getEntity().toString();
.thenReturn(new StringBuffer("https://localhost:8446" + query));
Response response = queryConsumer.executeQuery(payload, version.toString(),
- "resource_and_url", "" + "no_op", httpHeaders, mockRequest, uriInfo, "-1", "-1");
+ "resource_and_url", "" + "no_op", -1, -1, httpHeaders, mockRequest, uriInfo);
String entity = response.getEntity().toString();
import org.onap.aai.PayloadUtil;
import org.onap.aai.TraversalApp;
import org.onap.aai.TraversalTestConfiguration;
+import org.onap.aai.WebClientConfiguration;
import org.onap.aai.config.PropertyPasswordConfiguration;
import org.onap.aai.dbmap.AAIGraph;
import org.onap.aai.exceptions.AAIException;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.reactive.server.WebTestClient;
import org.springframework.web.client.RestTemplate;
@RunWith(SpringRunner.class)
classes = TraversalApp.class)
@TestPropertySource(locations = "classpath:application-test.properties")
@ContextConfiguration(initializers = PropertyPasswordConfiguration.class)
-@Import(TraversalTestConfiguration.class)
+@Import({TraversalTestConfiguration.class, WebClientConfiguration.class})
public class QueryConsumerTest {
private static final Logger LOGGER = LoggerFactory.getLogger(QueryConsumerTest.class);
private String pserverUri;
+ @Autowired WebTestClient webTestClient;
+
@Autowired
RestTemplate restTemplate;
Response response = httpTestUtil.doPut(complexUri, complexPayload);
}
- // @Test
+ @Test
public void testRequiredAGood() throws Exception {
String endpoint = "/aai/v14/query?format=pathed";
Map<String, String> cloudRegionMap = new HashMap<>();
String payload = PayloadUtil.getTemplatePayload("custom-query.json", customQueryMap);
httpEntity = new HttpEntity(payload, headers);
- ResponseEntity responseEntity =
+ ResponseEntity<String> responseEntity =
restTemplate.exchange(baseUrl + endpoint, HttpMethod.PUT, httpEntity, String.class);
LOGGER.info("Response of custom query : {}", responseEntity.getBody().toString());
assertThat(responseEntity.getStatusCode(), is(HttpStatus.OK));
// containsString(customerUri2));
}
+ @Test
+ public void thatPaginatedResponseCanBeRetrieved() throws Exception {
+ Map<String, String> cloudRegionMap = new HashMap<>();
+ cloudRegionMap.put("cloud-owner", "test-owner-id1111");
+ cloudRegionMap.put("cloud-region-id", "test-region-id1111");
+ cloudRegionMap.put("tenant-id", "test-tenant-id1111");
+ cloudRegionMap.put("tenant-name", "test-tenant-name-id1111");
+ cloudRegionMap.put("vserver-id", "some-vserver-id-id1111");
+ cloudRegionMap.put("vserver-name", "test-vserver-name-id1111");
+ cloudRegionMap.put("pserver-uri", pserverUri);
+ cloudRegionUri =
+ "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/test-owner-id1111/test-region-id1111";
+ addCloudRegion(cloudRegionMap, cloudRegionUri);
+
+ Map<String, String> complexMap = new HashMap<>();
+ complexMap.put("physical-location-id", "location-1111");
+ complexMap.put("cloud-region-uri", cloudRegionUri);
+ String complexUri = "/aai/v14/cloud-infrastructure/complexes/complex/location-1111";
+ addComplex(complexMap, complexUri);
+
+ Map<String, String> customQueryMap = new HashMap<>();
+ customQueryMap.put("start", "cloud-infrastructure/cloud-regions");
+ customQueryMap.put("query", "cloud-region-sites?owner=test-owner-id1111");
+
+ String payload = PayloadUtil.getTemplatePayload("custom-query.json", customQueryMap);
+ String path = "/aai/v14/query";
+
+ String response = webTestClient.put()
+ .uri(uriBuilder -> uriBuilder
+ .path(path)
+ .queryParam("format", "pathed")
+ .queryParam("resultIndex", 0)
+ .queryParam("resultSize", 1)
+ .build())
+ .contentType(MediaType.APPLICATION_JSON)
+ .bodyValue(payload)
+ .exchange()
+ .expectStatus().isOk()
+ .expectHeader().valueEquals("total-results", 2)
+ .expectHeader().valueEquals("total-pages", 2)
+ .returnResult(String.class)
+ .getResponseBody()
+ .blockFirst();
+
+ String expectedResponse = "{\"results\":[{\"resource-type\":\"cloud-region\",\"resource-link\":\"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/test-owner-id1111/test-region-id1111\"}]}";
+ assertEquals(expectedResponse, response);
+
+ }
+
@Test
public void testRequiredBad() throws Exception {
String endpoint = "/aai/v14/query?format=pathed";
<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-parent</artifactId>
- <version>1.14.2-SNAPSHOT</version>
+ <version>1.14.3-SNAPSHOT</version>
</parent>
<groupId>org.onap.aai.traversal</groupId>
<artifactId>traversal</artifactId>
- <version>1.14.2-SNAPSHOT</version>
+ <version>1.14.3-SNAPSHOT</version>
<name>aai-traversal</name>
<packaging>pom</packaging>
<modules>
Nexus Proxy Properties and Snapshot Locations
Ideally this can be overwritten at runtime per internal environment specific values at runtime
-->
- <aai.common.version>1.14.2</aai.common.version>
+ <aai.common.version>1.14.3-SNAPSHOT</aai.common.version>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<site.path>/content/sites/site/org/onap/aai/traversal/${project.artifactId}/${project.version}</site.path>
<release.path>/content/repositories/releases/</release.path>
major_version=1
minor_version=14
-patch_version=2
+patch_version=3
base_version=${major_version}.${minor_version}.${patch_version}
Code Review / aai / traversal.git / commitdiff