Merge branch 'development' into feat/DX-7325-variant-branch-support

Author: reeshika-h

.github/workflows/issues-jira.yml

@@ -1,5 +1,20 @@
 # CHANGELOG
 
+## v2.7.2
+
+### Jul 06, 2026
+- Snyk fixes
+
+## v2.7.1
+
+### Jun 29, 2026
+- Snyk fixes
+
+## v2.7.0
+
+### Jun 15, 2026
+- Enhancement: Endpoint integration
+
 ## v2.6.0
 
 ### Feb 23, 2026

CHANGELOG.md

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.contentstack.sdk</groupId>
     <artifactId>java</artifactId>
-    <version>2.6.0</version>
+    <version>2.7.2</version>
     <packaging>jar</packaging>
     <name>contentstack-java</name>
     <description>Java SDK for Contentstack Content Delivery API</description>
@@ -24,7 +24,7 @@
         <retrofit-source.version>3.0.0</retrofit-source.version>
         <loggin.version>5.3.2</loggin.version>
         <jococo-plugin.version>0.8.5</jococo-plugin.version>
-        <lombok-source.version>1.18.42</lombok-source.version>
+        <lombok-source.version>1.18.44</lombok-source.version>
         <junit-jupiter.version>5.11.4</junit-jupiter.version>
         <junit-jupiter-engine.version>5.8.0-M1</junit-jupiter-engine.version>
         <gson.version>2.8.8</gson.version>
@@ -33,10 +33,10 @@
         <maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
-        <json-version>20251224</json-version>
+        <json-version>20260522</json-version>
         <jacoco-maven-plugin-version>0.8.11</jacoco-maven-plugin-version>
         <maven-release-plugin-version>2.5.3</maven-release-plugin-version>
-        <contentstack-utils-version>1.3.0</contentstack-utils-version>
+        <contentstack-utils-version>1.5.1</contentstack-utils-version>
     </properties>
 
     <!-- Parent POM removed to avoid 403 from Maven Central in CI (Snyk, etc.). -->
@@ -178,11 +178,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.21.2</version>
-        </dependency>
         <dependency>
             <groupId>com.slack.api</groupId>
             <artifactId>bolt</artifactId>
@@ -229,17 +224,17 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-core</artifactId>
-                <version>6.2.18</version>
+                <version>6.2.19</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-beans</artifactId>
-                <version>6.2.18</version>
+                <version>6.2.19</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-web</artifactId>
-                <version>6.2.18</version>
+                <version>6.2.19</version>
             </dependency>
             <!-- Fix CVE-2020-15250: junit pulled by json-simple -->
             <dependency>
@@ -462,6 +457,34 @@
                 <artifactId>maven-jxr-plugin</artifactId>
                 <version>2.3</version>
             </plugin>
+
+            <!--
+                Refresh the bundled regions.json from the Contentstack artifact registry.
+                Run whenever Contentstack adds new regions or service keys, then commit
+                the updated src/main/resources/assets/regions.json.
+
+                Usage:
+                    mvn exec:exec@refresh-regions
+            -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>refresh-regions</id>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>bash</executable>
+                            <arguments>
+                                <argument>${project.basedir}/scripts/download-regions.sh</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

pom.xml

@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+# Download the latest regions.json from the Contentstack artifacts registry and
+# write it to src/main/resources/assets/regions.json so it gets bundled into
+# the SDK jar on the next build.
+#
+# Usage:
+#   ./scripts/download-regions.sh
+#   mvn exec:exec@refresh-regions
+#
+# Run this whenever Contentstack announces new regions or service keys, then
+# commit the updated file:
+#   git add src/main/resources/assets/regions.json
+#   git commit -m "chore: refresh regions.json"
+
+set -euo pipefail
+
+REGIONS_URL="https://artifacts.contentstack.com/regions.json"
+DEST="$(dirname "$0")/../src/main/resources/assets/regions.json"
+DEST="$(cd "$(dirname "$DEST")" && pwd)/$(basename "$DEST")"
+
+echo "Downloading regions.json from ${REGIONS_URL} ..."
+
+if command -v curl &>/dev/null; then
+    curl --silent --show-error --fail --location \
+         --retry 3 --retry-delay 2 \
+         -o "${DEST}" "${REGIONS_URL}"
+elif command -v wget &>/dev/null; then
+    wget --quiet --tries=3 --waitretry=2 -O "${DEST}" "${REGIONS_URL}"
+else
+    echo "Error: neither curl nor wget found. Install one and retry." >&2
+    exit 1
+fi
+
+# Validate the downloaded file contains a "regions" array
+if ! python3 -c "import sys, json; d=json.load(open('${DEST}')); assert 'regions' in d and len(d['regions']) > 0" 2>/dev/null &&
+   ! python  -c "import sys, json; d=json.load(open('${DEST}')); assert 'regions' in d and len(d['regions']) > 0" 2>/dev/null; then
+    # Fallback validation without Python — just check the key exists
+    if ! grep -q '"regions"' "${DEST}"; then
+        echo "Error: downloaded file does not look like a valid regions.json" >&2
+        rm -f "${DEST}"
+        exit 1
+    fi
+fi
+
+REGION_COUNT=$(grep -o '"id"' "${DEST}" | wc -l | tr -d ' ')
+echo "contentstack-java: regions.json updated (${REGION_COUNT} regions) → ${DEST}"

scripts/download-regions.sh

@@ -1,13 +1,12 @@
 package com.contentstack.sdk;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.fasterxml.jackson.databind.type.MapType;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.SocketTimeoutException;
 import java.net.URLEncoder;
+import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -201,6 +200,41 @@ private JSONObject createOrderedJSONObject(Map<String, Object> map) {
         return json;
     }
 
+    /**
+     * Recursively converts a parsed {@link JSONObject} into plain Java collections that
+     * mirror what the response models expect: JSON objects become {@link LinkedHashMap}
+     * (preserving key order) and JSON arrays become {@link ArrayList}.
+     */
+    private static Map<String, Object> jsonToOrderedMap(JSONObject object) {
+        LinkedHashMap<String, Object> map = new LinkedHashMap<>();
+        for (String key : object.keySet()) {
+            map.put(key, convertJsonValue(object.get(key)));
+        }
+        return map;
+    }
+
+    private static Object convertJsonValue(Object value) {
+        if (value == null || value == JSONObject.NULL) {
+            return null;
+        }
+        if (value instanceof JSONObject) {
+            return jsonToOrderedMap((JSONObject) value);
+        }
+        if (value instanceof JSONArray) {
+            JSONArray array = (JSONArray) value;
+            ArrayList<Object> list = new ArrayList<>(array.length());
+            for (int i = 0; i < array.length(); i++) {
+                list.add(convertJsonValue(array.get(i)));
+            }
+            return list;
+        }
+        // Normalize floating-point numbers to Double to match the previous parser's output.
+        if (value instanceof BigDecimal) {
+            return ((BigDecimal) value).doubleValue();
+        }
+        return value;
+    }
+
     private void getService(String requestUrl) throws IOException {
 
         this.headers.put(X_USER_AGENT_KEY, "contentstack-delivery-java/" + SDK_VERSION);
@@ -226,12 +260,11 @@ private void getService(String requestUrl) throws IOException {
                     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);
-                    
+                    // Parse the JSON into ordered maps/lists using org.json. Nested objects
+                    // become LinkedHashMap and arrays become ArrayList, matching the shape
+                    // the response models expect.
+                    Map<String, Object> responseMap = jsonToOrderedMap(new JSONObject(response.body().string()));
+
                     // Use the custom method to create an ordered JSONObject
                     responseJSON = createOrderedJSONObject(responseMap);
                     if (this.config.livePreviewEntry != null && !this.config.livePreviewEntry.isEmpty()) {

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

@@ -18,6 +18,7 @@ public class Config {
     protected String livePreviewContentType = null;
     protected String livePreviewEntryUid = null;
     protected String host = "cdn.contentstack.io";
+    protected boolean hostOverridden = false;
     protected String version = "v3";
     protected String scheme = "https://";
     protected String endpoint;
@@ -167,6 +168,7 @@ public String getHost() {
     public void setHost(String hostName) {
         if (hostName != null && !hostName.isEmpty()) {
             host = hostName;
+            hostOverridden = true;
         }
     }
 

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

@@ -1,5 +1,6 @@
 package com.contentstack.sdk;
 
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -98,6 +99,60 @@ private static void validateCredentials(String stackApiKey, String deliveryToken
         }
     }
 
+    /**
+     * Returns the Contentstack API URL for the given region and service.
+     *
+     * <p>Delegates to {@link Endpoint#getContentstackEndpoint(String, String)} — provided as a
+     * convenience so callers can reach endpoint resolution through the same top-level class they
+     * use to create stacks.
+     *
+     * @param region  region ID or alias (e.g. {@code "na"}, {@code "eu"}, {@code "azure-na"})
+     * @param service service key (e.g. {@code "contentDelivery"}, {@code "contentManagement"})
+     * @return full URL including {@code https://} scheme
+     * @throws IllegalArgumentException if the region or service is not recognised
+     */
+    public static String getContentstackEndpoint(String region, String service) {
+        return Endpoint.getContentstackEndpoint(region, service);
+    }
+
+    /**
+     * Returns the Contentstack API URL for the given region and service, optionally stripping
+     * the {@code https://} scheme.
+     *
+     * @param region      region ID or alias
+     * @param service     service key
+     * @param omitHttps   when {@code true}, returns the bare host without {@code https://}
+     * @return URL or bare host
+     * @throws IllegalArgumentException if the region or service is not recognised
+     */
+    public static String getContentstackEndpoint(String region, String service, boolean omitHttps) {
+        return Endpoint.getContentstackEndpoint(region, service, omitHttps);
+    }
+
+    /**
+     * Returns all service endpoints for the given region as an ordered map of service key to URL.
+     *
+     * @param region region ID or alias
+     * @return map of service key → full URL
+     * @throws IllegalArgumentException if the region is not recognised
+     */
+    public static Map<String, String> getContentstackEndpoints(String region) {
+        return Endpoint.getAllEndpoints(region);
+    }
+
+    /**
+     * Returns all service endpoints for the given region, optionally stripping the
+     * {@code https://} scheme from every URL.
+     *
+     * @param region    region ID or alias
+     * @param omitHttps when {@code true}, returns bare hosts without {@code https://}
+     * @return map of service key → URL or bare host
+     * @throws IllegalArgumentException if the region is not recognised
+     */
+    public static Map<String, String> getContentstackEndpoints(String region, boolean omitHttps) {
+        return Endpoint.getAllEndpoints(region, omitHttps);
+    }
+
     private static Stack initializeStack(String stackApiKey, String deliveryToken, String environment, Config config) {
         Stack stack = new Stack(stackApiKey.trim());
         stack.setHeader("api_key", stackApiKey);