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 <Fiete.Ostkamp@telekom.de>

1 files changed, 7 insertions, 4 deletions

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 c685071..4912a00 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<DBRequest> requests = new ArrayList<>();
-            requests.add(request);
-            if (resultIndex != null && !"-1".equals(resultIndex) && resultSize != null && !"-1".equals(resultSize)) {
+            List<DBRequest> 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<String, String> removeNonFilterableParams(MultivaluedMap<String, String> params) {
 
         String[] toRemove =
@@ -554,7 +557,7 @@ public class LegacyMoxyConsumer extends RESTAPI {
                             .build();
             List<DBRequest> 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));
             }