update to using the primitive integer type in resolveLimitWithExtra

Adjust collecting in fhir util to use helper functions to aid readability of code

Author: marshallweekley-eng

apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/input/ClaimSearchCriteria.java

@@ -51,8 +51,8 @@ public Integer resolveLimit() {
    * @param extra extra to add for pagination checking than the requested limit
    * @return limit
    */
-  public Integer resolveLimitWithExtra(Integer extra) {
-    return limit.orElse(5000) + (extra == null ? 0 : extra);
+  public Integer resolveLimitWithExtra(int extra) {
+    return limit.orElse(5000) + extra;
   }
 
   /**

apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/util/FhirUtil.java

@@ -183,10 +183,11 @@ record Page(List<Bundle.BundleEntryComponent> items, boolean hasMore) {}
                     // limits the stream to only return the requested limit
                     (list, count) ->
                         new Page(
-                            limit.isPresent() && count > limit.get().longValue()
-                                ? list.subList(0, limit.get())
-                                : list,
-                            limit.isPresent() && count > limit.get().longValue())));
+                            trimEntriesToLimit(list, count, limit),
+                            determineHasMore(count, limit)
+                        )
+                )
+            );
 
     var bundle = new Bundle().setEntry(page.items());
 
@@ -197,6 +198,17 @@ record Page(List<Bundle.BundleEntryComponent> items, boolean hasMore) {}
     return bundle;
   }
 
+  private static List<Bundle.BundleEntryComponent> trimEntriesToLimit(List<Bundle.BundleEntryComponent> entries,long count,Optional<Integer> limit){
+    if(limit.isPresent() && count > limit.get().longValue()) {
+      return entries.subList(0, limit.get());
+    }
+    return entries;
+  }
+
+  private static boolean determineHasMore(long count,Optional<Integer> limit){
+    return limit.isPresent() && count > limit.get().longValue();
+  }
+
   /**
    * Returns a default bundle.
    *