fix: EntriesModel parsing fix

contentstack · Nov 28, 2024 · 148fd23 · 148fd23
1 parent 2a561bf
commit 148fd23
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
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>

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