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));
             }