Merge pull request #117 from contentstack/next

GCP support implementation
contentstack · May 13, 2024 · 58a050e · 58a050e
2 parents d610830 + f60a67e
commit 58a050e
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
 # CHANGELOG
+
+## v1.14.0
+
+### Date: 13-May-2024
+
+-GCP support implementation
+
 ## v1.13.1
 
 ### Date: 16-Apr-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>1.13.1</version>
+    <version>1.14.0</version>
     <packaging>jar</packaging>
     <name>contentstack-java</name>
     <description>Java SDK for Contentstack Content Delivery API</description>
@@ -21,10 +21,10 @@
         <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>
-        <retrofit-source.version>2.10.0</retrofit-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.30</lombok-source.version>
+        <lombok-source.version>1.18.32</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>
@@ -36,7 +36,7 @@
         <json-version>20240303</json-version>
         <jacoco-maven-plugin-version>0.8.7</jacoco-maven-plugin-version>
         <maven-release-plugin-version>2.5.3</maven-release-plugin-version>
-        <contentstack-utils-version>1.2.6</contentstack-utils-version>
+        <contentstack-utils-version>1.2.7</contentstack-utils-version>
     </properties>
 
     <parent>

diff --git a/src/main/java/com/contentstack/sdk/Config.java b/src/main/java/com/contentstack/sdk/Config.java
@@ -196,7 +196,7 @@ public Config setManagementToken(@NotNull String managementToken) {
      * The enum Contentstack region. for now contentstack supports [US, EU, AZURE_NA]
      */
     public enum ContentstackRegion {
-        US, EU, AZURE_NA, AZURE_EU
+        US, EU, AZURE_NA, AZURE_EU, GCP_NA
     }
 
 }
diff --git a/src/main/java/com/contentstack/sdk/Stack.java b/src/main/java/com/contentstack/sdk/Stack.java
@@ -63,6 +63,11 @@ protected void setConfig(Config config) {
                     urlDomain = "cdn.contentstack.com";
                 }
                 config.host = "azure-eu" + "-" + urlDomain;
+            } else if (region.equalsIgnoreCase("gcp_na")) {
+                if (urlDomain.equalsIgnoreCase("cdn.contentstack.io")) {
+                    urlDomain = "cdn.contentstack.com";
+                }
+                config.host = "gcp-na" + "-" + urlDomain;
             }
         }
 

diff --git a/src/test/java/com/contentstack/sdk/TestAsset.java b/src/test/java/com/contentstack/sdk/TestAsset.java
@@ -39,13 +39,13 @@ public void onCompletion(ResponseType responseType, List<Asset> assets, Error er
                 assetUid = model.getAssetUid();
                 Assertions.assertTrue(model.getAssetUid().startsWith("blt"));
                 Assertions.assertEquals("image/jpeg", model.getFileType());
-                Assertions.assertEquals("482141", model.getFileSize());
+                Assertions.assertEquals("1775299", model.getFileSize());
                 Assertions.assertEquals("phoenix2.jpg", model.getFileName());
                 Assertions.assertTrue(model.getUrl().endsWith("phoenix2.jpg"));
                 Assertions.assertTrue(model.toJSON().has("created_at"));
                 Assertions.assertTrue(model.getCreatedBy().startsWith("blt"));
                 Assertions.assertEquals("gregory", model.getUpdateAt().getCalendarType());
-                Assertions.assertTrue(model.getUpdatedBy().startsWith("sys"));
+                Assertions.assertTrue(model.getUpdatedBy().startsWith("blt"));
                 Assertions.assertEquals("", model.getDeletedBy());
             }
         });
@@ -61,13 +61,13 @@ void testNewAssetZOnlyForOrderByUid() {
             public void onCompletion(ResponseType responseType, Error error) {
                 Assertions.assertTrue(asset.getAssetUid().startsWith("blt"));
                 Assertions.assertEquals("image/jpeg", asset.getFileType());
-                Assertions.assertEquals("482141", asset.getFileSize());
+                Assertions.assertEquals("1775299", asset.getFileSize());
                 Assertions.assertEquals("phoenix2.jpg", asset.getFileName());
                 Assertions.assertTrue(asset.getUrl().endsWith("phoenix2.jpg"));
                 Assertions.assertTrue(asset.toJSON().has("created_at"));
                 Assertions.assertTrue(asset.getCreatedBy().startsWith("blt"));
                 Assertions.assertEquals("gregory", asset.getUpdateAt().getCalendarType());
-                Assertions.assertTrue(asset.getUpdatedBy().startsWith("sys"));
+                Assertions.assertTrue(asset.getUpdatedBy().startsWith("blt"));
                 Assertions.assertNull(asset.getDeleteAt());
                 Assertions.assertEquals("gregory", asset.getCreateAt().getCalendarType());
                 Assertions.assertEquals("", asset.getDeletedBy());

diff --git a/src/test/java/com/contentstack/sdk/TestAssetLibrary.java b/src/test/java/com/contentstack/sdk/TestAssetLibrary.java
@@ -24,13 +24,13 @@ public void onCompletion(ResponseType responseType, List<Asset> assets, Error er
                 Asset model = assets.get(0);
                 Assertions.assertTrue(model.getAssetUid().startsWith("blt"));
                 assertEquals("image/jpeg", model.getFileType());
-                assertEquals("482141", model.getFileSize());
+                assertEquals("1775299", model.getFileSize());
                 assertEquals("phoenix2.jpg", model.getFileName());
                 Assertions.assertTrue(model.getUrl().endsWith("phoenix2.jpg"));
                 Assertions.assertTrue(model.toJSON().has("created_at"));
                 Assertions.assertTrue(model.getCreatedBy().startsWith("blt"));
                 assertEquals("gregory", model.getUpdateAt().getCalendarType());
-                Assertions.assertTrue(model.getUpdatedBy().startsWith("sys"));
+                Assertions.assertTrue(model.getUpdatedBy().startsWith("blt"));
                 assertEquals("", model.getDeletedBy());
                 logger.info("passed...");
             }

diff --git a/src/test/java/com/contentstack/sdk/TestEntry.java b/src/test/java/com/contentstack/sdk/TestEntry.java
@@ -178,7 +178,7 @@ void entryGetBoolean() {
     @Test
     @Order(19)
     void entryGetJSONArray() {
-        Object image = entry.getJSONArray("image");
+        Object image = entry.getJSONObject("image");
         Assertions.assertNotNull(image);
         logger.info("passed...");
     }

diff --git a/src/test/java/com/contentstack/sdk/TestGcpRegion.java b/src/test/java/com/contentstack/sdk/TestGcpRegion.java
@@ -0,0 +1,36 @@
+package com.contentstack.sdk;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class TestGcpRegion {
+    @Test
+    void testGcpRegionBehaviourGcpNA() {
+        Config config = new Config();
+        Config.ContentstackRegion region = Config.ContentstackRegion.GCP_NA;
+        config.setRegion(region);
+        Assertions.assertFalse(config.region.name().isEmpty());
+        Assertions.assertEquals("GCP_NA", config.region.name());
+    }
+
+    @Test
+    void testGcpNaRegionBehaviourGcpStack() throws IllegalAccessException {
+        Config config = new Config();
+        Config.ContentstackRegion region = Config.ContentstackRegion.GCP_NA;
+        config.setRegion(region);
+        Stack stack = Contentstack.stack("fakeApiKey", "fakeDeliveryToken", "fakeEnvironment", config);
+        Assertions.assertFalse(config.region.name().isEmpty());
+        Assertions.assertEquals("GCP_NA", stack.config.region.name());
+    }
+
+    @Test
+    void testGcpNARegionBehaviourGcpStackHost() throws IllegalAccessException {
+        Config config = new Config();
+        Config.ContentstackRegion region = Config.ContentstackRegion.GCP_NA;
+        config.setRegion(region);
+        Stack stack = Contentstack.stack("fakeApiKey", "fakeDeliveryToken", "fakeEnvironment", config);
+        Assertions.assertFalse(config.region.name().isEmpty());
+        Assertions.assertEquals("gcp-na-cdn.contentstack.com", stack.config.host);
+
+    }
+}
diff --git a/src/test/java/com/contentstack/sdk/TestQueryCase.java b/src/test/java/com/contentstack/sdk/TestQueryCase.java
@@ -557,7 +557,7 @@ protected void doSomeBackgroundTask(Group group) {
         Object titleObj = group.get("title");
         String titleStr = group.getString("title");
         Boolean titleBool = group.getBoolean("in_stock");
-        JSONArray titleJSONArray = group.getJSONArray("image");
+        JSONObject titleImageJSONArray = group.getJSONObject("image");
         JSONObject titleJSONObject = group.getJSONObject("publish_details");
         Object versionNum = group.getNumber("_version");
         Object versionInt = group.getInt("_version");
@@ -568,7 +568,7 @@ protected void doSomeBackgroundTask(Group group) {
         Assertions.assertNotNull(titleObj);
         Assertions.assertNotNull(titleStr);
         Assertions.assertNotNull(titleBool);
-        Assertions.assertNotNull(titleJSONArray);
+        Assertions.assertNotNull(titleImageJSONArray);
         Assertions.assertNotNull(titleJSONObject);
         Assertions.assertNotNull(versionNum);
         Assertions.assertNotNull(versionInt);