Merge pull request #141 from contentstack/development

Development
contentstack · Oct 14, 2024 · 2a275a0 · 2a275a0
2 parents b999ed1 + bbdb62b
commit 2a275a0
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## v2.0.1
+
+### Date: 21-October-2024
+
+-Github Issues fixed
+-Issue with field ordering in SDK response
+
 ## v2.0.0
 
 ### Date: 27-August-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.0</version>
+    <version>2.0.1</version>
     <packaging>jar</packaging>
     <name>contentstack-java</name>
     <description>Java SDK for Contentstack Content Delivery API</description>
@@ -17,7 +17,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <surefire-report-plugin.version>2.22.0</surefire-report-plugin.version>
-        <maven-source-plugin.version>2.2.1</maven-source-plugin.version>
+        <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>
@@ -183,6 +183,12 @@
             <version>${json-simple-version}</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.15.2</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/src/main/java/com/contentstack/sdk/CSHttpConnection.java b/src/main/java/com/contentstack/sdk/CSHttpConnection.java
@@ -2,15 +2,18 @@
 
 import okhttp3.Request;
 import okhttp3.ResponseBody;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+
 import retrofit2.Call;
 import retrofit2.Response;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.net.SocketTimeoutException;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -19,6 +22,10 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.IntStream;
+import com.fasterxml.jackson.databind.ObjectMapper; // Jackson for JSON parsing
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.type.MapType;
 
 import static com.contentstack.sdk.Constants.*;
 
@@ -185,6 +192,14 @@ public void send() {
         }
     }
 
+    private JSONObject createOrderedJSONObject(Map<String, Object> map) {
+        JSONObject json = new JSONObject();
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            json.put(entry.getKey(), entry.getValue());
+        }
+        return json;
+    }
+
     private void getService(String requestUrl) throws IOException {
 
         this.headers.put(X_USER_AGENT_KEY, "contentstack-delivery-java/" + SDK_VERSION);
@@ -202,22 +217,41 @@ private void getService(String requestUrl) throws IOException {
             requestUrl = request.url().toString();
         }
 
-        Response<ResponseBody> response = this.service.getRequest(requestUrl, this.headers).execute();
-        if (response.isSuccessful()) {
-            assert response.body() != null;
-            if (request != null) {
-                response = pluginResponseImp(request, response);
-            }
-            responseJSON = new JSONObject(response.body().string());
-            if (this.config.livePreviewEntry != null && !this.config.livePreviewEntry.isEmpty()) {
-                handleJSONArray();
+        try {
+            Response<ResponseBody> response = this.service.getRequest(requestUrl, this.headers).execute();
+            if (response.isSuccessful()) {
+                assert response.body() != null;
+                if (request != null) {
+                    response = pluginResponseImp(request, response);
+                }
+                try {
+                    // Use Jackson to parse the JSON while preserving order
+                    ObjectMapper mapper = JsonMapper.builder().build();
+                    MapType type = mapper.getTypeFactory().constructMapType(LinkedHashMap.class, String.class,
+                            Object.class);
+                    Map<String, Object> responseMap = mapper.readValue(response.body().string(), type);
+
+                    // Use the custom method to create an ordered JSONObject
+                    responseJSON = createOrderedJSONObject(responseMap);
+                    if (this.config.livePreviewEntry != null && !this.config.livePreviewEntry.isEmpty()) {
+                        handleJSONArray();
+                    }
+                    connectionRequest.onRequestFinished(CSHttpConnection.this);
+                } catch (JSONException e) {
+                    // Handle non-JSON response
+                    setError("Invalid JSON response");
+                }
+            } else {
+                assert response.errorBody() != null;
+                setError(response.errorBody().string());
             }
-            connectionRequest.onRequestFinished(CSHttpConnection.this);
-        } else {
-            assert response.errorBody() != null;
-            setError(response.errorBody().string());
+        } catch (SocketTimeoutException e) {
+            // Handle timeout
+            setError("Request timed out: " + e.getMessage());
+        } catch (IOException e) {
+            // Handle other IO exceptions
+            setError("IO error occurred: " + e.getMessage());
         }
-
     }
 
     private Request pluginRequestImp(String requestUrl) {
@@ -261,7 +295,13 @@ void handleJSONObject(JSONArray arrayEntry, JSONObject jsonObj, int idx) {
     }
 
     void setError(String errResp) {
-        responseJSON = new JSONObject(errResp); // Parse error string to JSONObject
+        try {
+            responseJSON = new JSONObject(errResp);
+        } catch (JSONException e) {
+            // If errResp is not valid JSON, create a new JSONObject with the error message
+            responseJSON = new JSONObject();
+            responseJSON.put(ERROR_MESSAGE, errResp);
+        }
         responseJSON.put(ERROR_MESSAGE, responseJSON.optString(ERROR_MESSAGE));
         responseJSON.put(ERROR_CODE, responseJSON.optString(ERROR_CODE));
         responseJSON.put(ERRORS, responseJSON.optString(ERRORS));