Merge pull request #241 from contentstack/staging

DX | 03-11-2025 | Release

Author: harshithad0703

CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## v2.3.1
+
+### Date: 03-Nov-2025
+
+- Github issue fix
+- Improved error messages
+
 ## v2.3.0
 
 ### Date: 29-Sep-2025

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.contentstack.sdk</groupId>
     <artifactId>java</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1</version>
     <packaging>jar</packaging>
     <name>contentstack-java</name>
     <description>Java SDK for Contentstack Content Delivery API</description>

src/main/java/com/contentstack/sdk/AssetLibrary.java

@@ -179,7 +179,11 @@ public AssetLibrary addParam(@NotNull String paramKey, @NotNull Object paramValu
         if (isValidKey(paramKey) && isValidValue(paramValue)) {
             urlQueries.put(paramKey, paramValue);
         } else {
-            logger.warning("Invalid key or value");
+            if (!isValidKey(paramKey)) {
+                logger.warning(ErrorMessages.INVALID_PARAMETER_KEY);
+            } else {
+                logger.warning(ErrorMessages.INVALID_PARAMETER_VALUE);
+            }
         }
         return this;
     }
@@ -310,9 +314,10 @@ public void getResultObject(List<Object> objects, JSONObject jsonObject, boolean
 
         List<Asset> assets = new ArrayList<>();
 
-        // if (objects == null || objects.isEmpty()) {
-        //     System.out.println("Objects list is null or empty");
-        // }
+        if (objects == null || objects.isEmpty()) {
+            logger.warning(ErrorMessages.MISSING_ASSETS_LIST);
+            return;
+        }
 
         if (objects != null && !objects.isEmpty()) {
             for (Object object : objects) {
@@ -328,9 +333,9 @@ public void getResultObject(List<Object> objects, JSONObject jsonObject, boolean
                 assets.add(asset);
             }
         } 
-        // else {
-        // System.out.println("Object is not an instance of AssetModel");
-        // }
+        else {
+            logger.warning(ErrorMessages.INVALID_OBJECT_TYPE_ASSET_MODEL);
+        }
 
         if (callback != null) {
             callback.onRequestFinish(ResponseType.NETWORK, assets);
@@ -351,7 +356,11 @@ public AssetLibrary where(String key, String value) {
             queryParams.put(key,value);
             urlQueries.put("query", queryParams);
         } else {
-            throw new IllegalArgumentException("Invalid key or value");
+            if (!isValidKey(key)) {
+                throw new IllegalArgumentException(ErrorMessages.INVALID_PARAMETER_KEY);
+            } else {
+                throw new IllegalArgumentException(ErrorMessages.INVALID_PARAMETER_VALUE);
+            }
         }
         return this;
     }

src/main/java/com/contentstack/sdk/AssetsModel.java

@@ -31,7 +31,7 @@ public AssetsModel(JSONObject response) {
             List<?> assetsList = (List<?>) rawAssets;
             listResponse = new JSONArray(assetsList); // Convert to JSONArray
         } else if (rawAssets != null) {
-            throw new IllegalArgumentException("Invalid type for 'assets' key: " + rawAssets.getClass().getName());
+            throw new IllegalArgumentException(ErrorMessages.INVALID_ASSETS_TYPE);
         }
         if (listResponse != null) {
             listResponse.forEach(model -> {

src/main/java/com/contentstack/sdk/CSBackgroundTask.java

@@ -93,7 +93,7 @@ protected void checkHeader(@NotNull Map<String, Object> headers) {
         final Logger logger = Logger.getLogger("CSBackgroundTask");
         if (headers.size() == 0) {
             try {
-                throw new IllegalAccessException("CSBackgroundTask Header Exception");
+                throw new IllegalAccessException(ErrorMessages.MISSING_REQUEST_HEADERS);
             } catch (IllegalAccessException e) {
                 logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
             }

src/main/java/com/contentstack/sdk/CSHttpConnection.java

@@ -158,7 +158,7 @@ private String getParams(HashMap<String, Object> params) {
                     urlParams += urlParams.equals("?") ? key + "=" + value : "&" + key + "=" + value;
                 }
             } catch (Exception e1) {
-                logger.log(Level.SEVERE, e1.getLocalizedMessage(), e1);
+                logger.log(Level.SEVERE, ErrorMessages.URL_PARAMETER_ENCODING_FAILED, e1);
             }
         }
         return urlParams;
@@ -187,7 +187,7 @@ public void send() {
         try {
             getService(url);
         } catch (IOException | JSONException e) {
-            logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
+            logger.log(Level.SEVERE, ErrorMessages.URL_PARAMETER_ENCODING_FAILED, e);
         }
     }
 
@@ -238,7 +238,7 @@ private void getService(String requestUrl) throws IOException {
                     connectionRequest.onRequestFinished(CSHttpConnection.this);
                 } catch (JSONException e) {
                     // Handle non-JSON response
-                    setError("Invalid JSON response");
+                    setError(ErrorMessages.INVALID_JSON_RESPONSE);
                 }
             } else {
                 assert response.errorBody() != null;

src/main/java/com/contentstack/sdk/ContentType.java

@@ -40,7 +40,7 @@ public class ContentType {
     public JSONObject contentTypeData;
 
     protected ContentType() throws IllegalAccessException {
-        throw new IllegalAccessException("Can Not Access Private Modifier");
+        throw new IllegalAccessException(ErrorMessages.DIRECT_INSTANTIATION_CONTENT_TYPE);
     }
 
     protected ContentType(String contentTypeUid) {
@@ -158,7 +158,7 @@ public void fetch(@NotNull JSONObject params, final ContentTypesCallback callbac
         }
         params.put("environment", headers.get("environment"));
         if (contentTypeUid == null || contentTypeUid.isEmpty()) {
-            throw new IllegalAccessException("contentTypeUid is required");
+            throw new IllegalAccessException(ErrorMessages.CONTENT_TYPE_UID_REQUIRED);
         }
         fetchContentTypes(urlString, params, headers, callback);
     }

src/main/java/com/contentstack/sdk/ContentTypesModel.java

@@ -29,7 +29,7 @@ public void setJSON(JSONObject responseJSON) {
                 try {
                     this.response = new JSONObject((LinkedHashMap<?, ?>) responseJSON.get(ctKey));
                 } catch (Exception e) {
-                    System.err.println("Error processing 'content_type': " + e.getMessage());
+                    System.err.println(ErrorMessages.INVALID_CONTENT_TYPE_DATA + " Technical details: " + e.getMessage());
                 }
             }
             String ctListKey = "content_types";
@@ -44,14 +44,14 @@ public void setJSON(JSONObject responseJSON) {
                             JSONObject jsonModel = new JSONObject((LinkedHashMap<?, ?>) model);
                             objectList.add(jsonModel);
                         } else {
-                            System.err.println("Invalid type in 'content_types' list. Expected LinkedHashMap.");
+                            System.err.println(ErrorMessages.INVALID_CONTENT_TYPES_LIST);
                         }
                     });
                 }
                 this.response = new JSONArray(objectList);
                 this.responseJSONArray = new JSONArray(objectList);
             } catch (Exception e) {
-            System.err.println("Error processing 'content_types': " + e.getMessage());
+            System.err.println(ErrorMessages.INVALID_CONTENT_TYPE_DATA + " Technical details: " + e.getMessage());
         }
       }
     }

src/main/java/com/contentstack/sdk/Contentstack.java

@@ -19,7 +19,7 @@ public class Contentstack {
 
     // Modifier Protected
     protected Contentstack() throws IllegalAccessException {
-        throw new IllegalAccessException("Can Not Access Private Modifier");
+        throw new IllegalAccessException(ErrorMessages.DIRECT_INSTANTIATION_CONTENTSTACK);
     }
 
     /**
@@ -88,13 +88,13 @@ private static void validateCredentials(String stackApiKey, String deliveryToken
         Objects.requireNonNull(environment, "Environment can not be null");
 
         if (stackApiKey.isEmpty()) {
-            throw new IllegalAccessException("API Key can not be empty");
+            throw new IllegalAccessException(ErrorMessages.MISSING_API_KEY);
         }
         if (deliveryToken.isEmpty()) {
-            throw new IllegalAccessException("Delivery Token can not be empty");
+            throw new IllegalAccessException(ErrorMessages.MISSING_DELIVERY_TOKEN);
         }
         if (environment.isEmpty()) {
-            throw new IllegalAccessException("Environment can not be empty");
+            throw new IllegalAccessException(ErrorMessages.MISSING_ENVIRONMENT);
         }
     }
 

src/main/java/com/contentstack/sdk/EntriesModel.java

@@ -33,7 +33,7 @@ protected EntriesModel(JSONObject responseJSON) {
             }
         } catch (Exception e) {
             Logger logger = Logger.getLogger(EntriesModel.class.getSimpleName());
-            logger.log(Level.SEVERE, e.getLocalizedMessage(), e);
+            logger.log(Level.SEVERE, ErrorMessages.ENTRIES_PROCESSING_FAILED, e);
         }
 
     }