From 2ee4fd4b1c4436f2f295bc6f2eb566cdf0200464 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Mon, 5 Feb 2024 17:29:33 +0100 Subject: Update aai-common to 1.13.3 in resources - update to 1.13.3 that contains fix for TraversalURIOptimizedQuery building - disable tracing in tests - disable log lines for schema generation in tests Issue-ID: AAI-3761 Change-Id: Ifbe1a4ca716e73c1722c1368dc55719b23fe101a Signed-off-by: Fiete Ostkamp --- .../src/main/java/org/onap/aai/rest/LegacyMoxyConsumer.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'aai-resources/src/main/java/org/onap') diff --git a/aai-resources/src/main/java/org/onap/aai/rest/LegacyMoxyConsumer.java b/aai-resources/src/main/java/org/onap/aai/rest/LegacyMoxyConsumer.java index c6850717..4912a00d 100644 --- a/aai-resources/src/main/java/org/onap/aai/rest/LegacyMoxyConsumer.java +++ b/aai-resources/src/main/java/org/onap/aai/rest/LegacyMoxyConsumer.java @@ -290,9 +290,8 @@ public class LegacyMoxyConsumer extends RESTAPI { Introspector obj = loader.introspectorFromName(objType); DBRequest request = new DBRequest.Builder(HttpMethod.GET, uriObject, uriQuery, obj, headers, info, transId).build(); - List requests = new ArrayList<>(); - requests.add(request); - if (resultIndex != null && !"-1".equals(resultIndex) && resultSize != null && !"-1".equals(resultSize)) { + List requests = Collections.singletonList(request); + if (hasValidPaginationParams(resultIndex, resultSize)) { traversalUriHttpEntry.setPaginationIndex(Integer.parseInt(resultIndex)); traversalUriHttpEntry.setPaginationBucket(Integer.parseInt(resultSize)); } @@ -320,6 +319,10 @@ public class LegacyMoxyConsumer extends RESTAPI { return response; } + private boolean hasValidPaginationParams(String resultIndex, String resultSize) { + return resultIndex != null && !"-1".equals(resultIndex) && resultSize != null && !"-1".equals(resultSize); + } + private MultivaluedMap removeNonFilterableParams(MultivaluedMap params) { String[] toRemove = @@ -554,7 +557,7 @@ public class LegacyMoxyConsumer extends RESTAPI { .build(); List requests = new ArrayList<>(); requests.add(request); - if (resultIndex != null && !"-1".equals(resultIndex) && resultSize != null && !"-1".equals(resultSize)) { + if (hasValidPaginationParams(resultIndex, resultSize)) { traversalUriHttpEntry.setPaginationIndex(Integer.parseInt(resultIndex)); traversalUriHttpEntry.setPaginationBucket(Integer.parseInt(resultSize)); } -- cgit 1.2.3-korg