add suggested changes to PR

Author: asadali214

src/main/java/io/apimatic/core/HttpRequest.java

@@ -381,6 +381,7 @@ private void updateBodyParams(UnaryOperator<Object> setter, String point) {
                 }
 
                 body = CoreHelper.updateValueByPointer(body, point, setter);
+                return;
             }
 
             if (bodyParameters != null) {
@@ -634,19 +635,6 @@ private static String getSerializedHeaderValue(Object obj) {
             return CoreHelper.trySerialize(obj);
         }
 
-        /**
-         * @return A query URL combining the path, query and template parameters.
-         */
-        public String getQueryUrl() {
-            StringBuilder builder = new StringBuilder(path);
-
-            CoreHelper.appendUrlWithQueryParameters(builder, queryParams,
-                    arraySerializationFormat);
-            CoreHelper.appendUrlWithTemplateParameters(builder, templateParams);
-
-            return builder.toString();
-        }
-
         /**
          * @return A copy of this request builder instance.
          */

src/main/java/io/apimatic/core/types/pagination/CursorPagination.java

@@ -25,9 +25,9 @@ public Builder apply(PaginatedData<?, ?, ?, ?> paginatedData) {
         Response response = paginatedData.getResponse();
         Builder reqBuilder = paginatedData.getRequestBuilder();
         AtomicBoolean isUpdated = new AtomicBoolean(false);
+        currentRequestCursor = null;
 
         reqBuilder.updateParameterByJsonPointer(input, old -> {
-
             if (response == null) {
                 currentRequestCursor = (String) old;
                 isUpdated.set(true);
@@ -55,6 +55,5 @@ public Builder apply(PaginatedData<?, ?, ?, ?> paginatedData) {
     @Override
     public void addMetaData(PageWrapper<?, ?> page) {
         page.setCursorInput(currentRequestCursor);
-        currentRequestCursor = null;
     }
 }

src/main/java/io/apimatic/core/types/pagination/LinkPagination.java

@@ -18,9 +18,9 @@ public LinkPagination(final String next) {
     @Override
     public Builder apply(PaginatedData<?, ?, ?, ?> paginatedData) {
         Response response = paginatedData.getResponse();
+        currentRequestLink = null;
 
         if (response == null) {
-            currentRequestLink = paginatedData.getRequestBuilder().getQueryUrl();
             return paginatedData.getRequestBuilder();
         }
 
@@ -38,6 +38,5 @@ public Builder apply(PaginatedData<?, ?, ?, ?> paginatedData) {
     @Override
     public void addMetaData(PageWrapper<?, ?> page) {
         page.setNextLinkInput(currentRequestLink);
-        currentRequestLink = null;
     }
 }

src/main/java/io/apimatic/core/types/pagination/OffsetPagination.java

@@ -7,7 +7,7 @@
 
 public class OffsetPagination implements PaginationStrategy {
     private final String input;
-    private int currentRequestOffset = -1;
+    private int currentRequestOffset;
 
     /**
      * @param input JsonPointer of a field in request, representing offset.
@@ -21,9 +21,10 @@ public Builder apply(PaginatedData<?, ?, ?, ?> paginatedData) {
         Response response = paginatedData.getResponse();
         Builder reqBuilder = paginatedData.getRequestBuilder();
         AtomicBoolean isUpdated = new AtomicBoolean(false);
+        currentRequestOffset = 0;
 
         reqBuilder.updateParameterByJsonPointer(input, old -> {
-            int oldValue = Integer.parseInt("" + old);
+            int oldValue = old == null ? 0 : Integer.parseInt("" + old);
 
             if (response == null) {
                 currentRequestOffset = oldValue;
@@ -47,6 +48,5 @@ public Builder apply(PaginatedData<?, ?, ?, ?> paginatedData) {
     @Override
     public void addMetaData(PageWrapper<?, ?> page) {
         page.setOffsetInput(currentRequestOffset);
-        currentRequestOffset = -1;
     }
 }

src/main/java/io/apimatic/core/types/pagination/PagePagination.java

@@ -7,7 +7,7 @@
 
 public class PagePagination implements PaginationStrategy {
     private final String input;
-    private int currentRequestPageNumber = -1;
+    private int currentRequestPageNumber;
 
     /**
      * @param input JsonPointer of a field in request, representing page.
@@ -21,9 +21,10 @@ public Builder apply(PaginatedData<?, ?, ?, ?> paginatedData) {
         Response response = paginatedData.getResponse();
         Builder reqBuilder = paginatedData.getRequestBuilder();
         AtomicBoolean isUpdated = new AtomicBoolean(false);
+        currentRequestPageNumber = 0;
 
         reqBuilder.updateParameterByJsonPointer(input, old -> {
-            int oldValue = Integer.parseInt("" + old);
+            int oldValue = old == null ? 1 : Integer.parseInt("" + old);
 
             if (response == null) {
                 currentRequestPageNumber = oldValue;
@@ -47,6 +48,5 @@ public Builder apply(PaginatedData<?, ?, ?, ?> paginatedData) {
     @Override
     public void addMetaData(PageWrapper<?, ?> page) {
         page.setPageInput(currentRequestPageNumber);
-        currentRequestPageNumber = -1;
     }
 }

src/main/java/io/apimatic/core/types/pagination/PageWrapper.java

@@ -17,42 +17,67 @@ public final class PageWrapper<I, P> implements ApiResponseType<P> {
      * @param items Extracted items from the page.
      * @return An new instance of PageWrapper.
      */
-    public static <I, P> PageWrapper<I, P> create(Response response, P page, List<I> items) {
-        return new PageWrapper<I, P>(response.getStatusCode(), response.getHeaders(), page, items);
+    public static <I, P> PageWrapper<I, P> create(Response response, P page,
+            List<I> items, PaginationStrategy strategy) {
+        return new PageWrapper<I, P>(response.getStatusCode(), response.getHeaders(), page,
+                items, strategy);
     }
 
     private final int statusCode;
     private final HttpHeaders headers;
-    private P page;
-    private List<I> items;
+    private final P page;
+    private final List<I> items;
+    private final PaginationStrategy strategy;
 
-    private String nextLinkInput = null;
-    private int offsetInput = -1;
-    private int pageInput = -1;
-    private String cursorInput = null;
+    private String nextLinkInput;
+    private int offsetInput;
+    private int pageInput;
+    private String cursorInput;
 
     private PageWrapper(int statusCode, final HttpHeaders headers, final P page,
-            final List<I> items) {
+            final List<I> items, final PaginationStrategy strategy) {
         this.statusCode = statusCode;
         this.headers = headers;
         this.page = page;
         this.items = items;
+        this.strategy = strategy;
+        strategy.addMetaData(this);
     }
 
-    public void setNextLinkInput(String nextLinkInput) {
-        this.nextLinkInput = nextLinkInput;
+    /**
+     * @return True if cursor paginated page is wrapped
+     */
+    public boolean isCursorPagination() {
+        return strategy instanceof CursorPagination;
     }
 
-    public void setOffsetInput(int offsetInput) {
-        this.offsetInput = offsetInput;
+    /**
+     * @return True if link paginated page is wrapped
+     */
+    public boolean isLinkPagination() {
+        return strategy instanceof LinkPagination;
     }
 
-    public void setPageInput(int pageInput) {
-        this.pageInput = pageInput;
+    /**
+     * @return True if offset paginated page is wrapped
+     */
+    public boolean isOffsetPagination() {
+        return strategy instanceof OffsetPagination;
     }
 
-    public void setCursorInput(String cursorInput) {
-        this.cursorInput = cursorInput;
+    /**
+     * @return True if number paginated page is wrapped
+      */
+    public boolean isNumberPagination() {
+        return strategy instanceof PagePagination;
+    }
+
+    /**
+     * Sets the next link input
+     * @param strategy value of next link input
+     */
+    public void setNextLinkInput(String nextLinkInput) {
+        this.nextLinkInput = nextLinkInput;
     }
 
     /**
@@ -63,6 +88,30 @@ public String getNextLinkInput() {
         return nextLinkInput;
     }
 
+    /**
+     * Sets the cursor input
+     * @param strategy value of cursor input
+     */
+    public void setCursorInput(String cursorInput) {
+        this.cursorInput = cursorInput;
+    }
+
+    /**
+     * Gets the cursor input used for cursor-based pagination.
+     * @return The cursor token
+     */
+    public String getCursorInput() {
+        return cursorInput;
+    }
+
+    /**
+     * Sets the offset input
+     * @param strategy value of offset input
+     */
+    public void setOffsetInput(int offsetInput) {
+        this.offsetInput = offsetInput;
+    }
+
     /**
      * Gets the offset input used for offset-based pagination.
      * @return The offset value
@@ -72,19 +121,19 @@ public int getOffsetInput() {
     }
 
     /**
-     * Gets the page number input used for page-based pagination.
-     * @return The page number
+     * Sets the page input
+     * @param strategy value of page input
      */
-    public int getPageInput() {
-        return pageInput;
+    public void setPageInput(int pageInput) {
+        this.pageInput = pageInput;
     }
 
     /**
-     * Gets the cursor input used for cursor-based pagination.
-     * @return The cursor token
+     * Gets the page number input used for page-based pagination.
+     * @return The page number
      */
-    public String getCursorInput() {
-        return cursorInput;
+    public int getPageInput() {
+        return pageInput;
     }
 
     /**

src/main/java/io/apimatic/core/types/pagination/PaginatedData.java

@@ -240,8 +240,7 @@ private boolean updateWith(ApiCall<R, E> apiCall, R pageUnWrapped,
 
         this.apiCall = apiCall;
         PageWrapper<I, R> pageWrapper = PageWrapper.create(apiCall.getResponse(), pageUnWrapped,
-                itemsUnWrapped);
-        strategy.addMetaData(pageWrapper);
+                itemsUnWrapped, strategy);
         this.page = CheckedSupplier.create(pageCreator.apply(pageWrapper));
         itemsUnWrapped.forEach(i -> items.add(CheckedSupplier.create(i)));
 

src/main/java/io/apimatic/core/utilities/CoreHelper.java

@@ -1708,10 +1708,10 @@ public static <T> T updateValueByPointer(T value, String pointer,
             }
 
             JsonPointer jsonPointer = Json.createPointer(pointer);
+
             if (!jsonPointer.containsValue(structure)) {
-                return value;
+                structure = jsonPointer.add(structure, JsonValue.NULL);
             }
-
             JsonValue oldJsonValue = jsonPointer.getValue(structure);
             Object oldValue = toObject(oldJsonValue);
             Object newValueRaw = updater.apply(oldValue);
@@ -1755,7 +1755,7 @@ private static Object toObject(JsonValue value) {
             case FALSE:
                 return false;
             default:
-                return value.toString();
+                return null;
         }
     }