Merge pull request #151 from contentstack/staging

Staging
contentstack · Dec 5, 2024 · 973ea73 · 973ea73
2 parents b17997d + 00ad218
commit 973ea73
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## v2.0.2
+
+### Date: 5-December-2024
+
+-Github Issue fixed
+-EntriesModel parsing fix
+
 ## v2.0.1
 
 ### Date: 21-October-2024

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.contentstack.sdk</groupId>
     <artifactId>java</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2</version>
     <packaging>jar</packaging>
     <name>contentstack-java</name>
     <description>Java SDK for Contentstack Content Delivery API</description>
@@ -20,11 +20,11 @@
         <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
         <maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
         <dotenv-source.version>3.0.0</dotenv-source.version>
-        <rxjava-source.version>3.1.8</rxjava-source.version>
+        <rxjava-source.version>3.1.9</rxjava-source.version>
         <retrofit-source.version>2.11.0</retrofit-source.version>
         <loggin.version>5.0.0-alpha.11</loggin.version>
         <jococo-plugin.version>0.8.5</jococo-plugin.version>
-        <lombok-source.version>1.18.32</lombok-source.version>
+        <lombok-source.version>1.18.34</lombok-source.version>
         <junit-jupiter.version>5.10.1</junit-jupiter.version>
         <junit-jupiter-engine.version>5.8.0-M1</junit-jupiter-engine.version>
         <gson.version>2.8.8</gson.version>
@@ -187,7 +187,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.15.2</version>
+            <version>2.18.0</version>
         </dependency>
     </dependencies>
 

diff --git a/src/main/java/com/contentstack/sdk/EntriesModel.java b/src/main/java/com/contentstack/sdk/EntriesModel.java
@@ -1,9 +1,9 @@
 package com.contentstack.sdk;
 
-import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -18,13 +18,14 @@ protected EntriesModel(JSONObject responseJSON) {
             this.jsonObject = responseJSON;
             objectList = new ArrayList<>();
             Object entryList = jsonObject.opt("entries");
-            if (entryList instanceof JSONArray) {
-                JSONArray entries = (JSONArray) entryList;
-                if (entries.length() > 0) {
+            if (entryList instanceof ArrayList) {
+                ArrayList<LinkedHashMap> entries = (ArrayList) entryList;
+                if (!entries.isEmpty()) {
                     entries.forEach(model -> {
-                        if (model instanceof JSONObject) {
-                            JSONObject newModel = (JSONObject) model;
-                            EntryModel entry = new EntryModel(newModel);
+                        if (model instanceof LinkedHashMap) {
+                            // Convert LinkedHashMap to JSONObject
+                            JSONObject jsonModel = new JSONObject((LinkedHashMap<?, ?>) model);
+                            EntryModel entry = new EntryModel(jsonModel);
                             objectList.add(entry);
                         }
                     });