Skip to content

Commit 2876cb2

Browse files
harshithad0703harshithad0703
authored
Merge pull request #117 from contentstack/next
GCP support implementation
2 parents 81b163b + 9fb59e2 commit 2876cb2

File tree

9 files changed

+62
-14
lines changed

9 files changed

+62
-14
lines changed

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
# CHANGELOG
2+
3+
## v1.14.0
4+
5+
### Date: 13-May-2024
6+
7+
-GCP support implementation
8+
29
## v1.13.1
310

411
### Date: 16-Apr-2024

‎pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.contentstack.sdk</groupId>
77
<artifactId>java</artifactId>
8-
<version>1.13.1</version>
8+
<version>1.14.0</version>
99
<packaging>jar</packaging>
1010
<name>contentstack-java</name>
1111
<description>Java SDK for Contentstack Content Delivery API</description>
@@ -21,10 +21,10 @@
2121
<maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
2222
<dotenv-source.version>3.0.0</dotenv-source.version>
2323
<rxjava-source.version>3.1.8</rxjava-source.version>
24-
<retrofit-source.version>2.10.0</retrofit-source.version>
24+
<retrofit-source.version>2.11.0</retrofit-source.version>
2525
<loggin.version>5.0.0-alpha.11</loggin.version>
2626
<jococo-plugin.version>0.8.5</jococo-plugin.version>
27-
<lombok-source.version>1.18.30</lombok-source.version>
27+
<lombok-source.version>1.18.32</lombok-source.version>
2828
<junit-jupiter.version>5.10.1</junit-jupiter.version>
2929
<junit-jupiter-engine.version>5.8.0-M1</junit-jupiter-engine.version>
3030
<gson.version>2.8.8</gson.version>
@@ -36,7 +36,7 @@
3636
<json-version>20240303</json-version>
3737
<jacoco-maven-plugin-version>0.8.7</jacoco-maven-plugin-version>
3838
<maven-release-plugin-version>2.5.3</maven-release-plugin-version>
39-
<contentstack-utils-version>1.2.6</contentstack-utils-version>
39+
<contentstack-utils-version>1.2.7</contentstack-utils-version>
4040
</properties>
4141

4242
<parent>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public Config setManagementToken(@NotNull String managementToken) {
196196
* The enum Contentstack region. for now contentstack supports [US, EU, AZURE_NA]
197197
*/
198198
public enum ContentstackRegion {
199-
US, EU, AZURE_NA, AZURE_EU
199+
US, EU, AZURE_NA, AZURE_EU, GCP_NA
200200
}
201201

202202
}

‎src/main/java/com/contentstack/sdk/Stack.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@ protected void setConfig(Config config) {
6363
urlDomain = "cdn.contentstack.com";
6464
}
6565
config.host = "azure-eu" + "-" + urlDomain;
66+
} else if (region.equalsIgnoreCase("gcp_na")) {
67+
if (urlDomain.equalsIgnoreCase("cdn.contentstack.io")) {
68+
urlDomain = "cdn.contentstack.com";
69+
}
70+
config.host = "gcp-na" + "-" + urlDomain;
6671
}
6772
}
6873

‎src/test/java/com/contentstack/sdk/TestAsset.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ public void onCompletion(ResponseType responseType, List<Asset> assets, Error er
3939
assetUid = model.getAssetUid();
4040
Assertions.assertTrue(model.getAssetUid().startsWith("blt"));
4141
Assertions.assertEquals("image/jpeg", model.getFileType());
42-
Assertions.assertEquals("482141", model.getFileSize());
42+
Assertions.assertEquals("1775299", model.getFileSize());
4343
Assertions.assertEquals("phoenix2.jpg", model.getFileName());
4444
Assertions.assertTrue(model.getUrl().endsWith("phoenix2.jpg"));
4545
Assertions.assertTrue(model.toJSON().has("created_at"));
4646
Assertions.assertTrue(model.getCreatedBy().startsWith("blt"));
4747
Assertions.assertEquals("gregory", model.getUpdateAt().getCalendarType());
48-
Assertions.assertTrue(model.getUpdatedBy().startsWith("sys"));
48+
Assertions.assertTrue(model.getUpdatedBy().startsWith("blt"));
4949
Assertions.assertEquals("", model.getDeletedBy());
5050
}
5151
});
@@ -61,13 +61,13 @@ void testNewAssetZOnlyForOrderByUid() {
6161
public void onCompletion(ResponseType responseType, Error error) {
6262
Assertions.assertTrue(asset.getAssetUid().startsWith("blt"));
6363
Assertions.assertEquals("image/jpeg", asset.getFileType());
64-
Assertions.assertEquals("482141", asset.getFileSize());
64+
Assertions.assertEquals("1775299", asset.getFileSize());
6565
Assertions.assertEquals("phoenix2.jpg", asset.getFileName());
6666
Assertions.assertTrue(asset.getUrl().endsWith("phoenix2.jpg"));
6767
Assertions.assertTrue(asset.toJSON().has("created_at"));
6868
Assertions.assertTrue(asset.getCreatedBy().startsWith("blt"));
6969
Assertions.assertEquals("gregory", asset.getUpdateAt().getCalendarType());
70-
Assertions.assertTrue(asset.getUpdatedBy().startsWith("sys"));
70+
Assertions.assertTrue(asset.getUpdatedBy().startsWith("blt"));
7171
Assertions.assertNull(asset.getDeleteAt());
7272
Assertions.assertEquals("gregory", asset.getCreateAt().getCalendarType());
7373
Assertions.assertEquals("", asset.getDeletedBy());

‎src/test/java/com/contentstack/sdk/TestAssetLibrary.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ public void onCompletion(ResponseType responseType, List<Asset> assets, Error er
2424
Asset model = assets.get(0);
2525
Assertions.assertTrue(model.getAssetUid().startsWith("blt"));
2626
assertEquals("image/jpeg", model.getFileType());
27-
assertEquals("482141", model.getFileSize());
27+
assertEquals("1775299", model.getFileSize());
2828
assertEquals("phoenix2.jpg", model.getFileName());
2929
Assertions.assertTrue(model.getUrl().endsWith("phoenix2.jpg"));
3030
Assertions.assertTrue(model.toJSON().has("created_at"));
3131
Assertions.assertTrue(model.getCreatedBy().startsWith("blt"));
3232
assertEquals("gregory", model.getUpdateAt().getCalendarType());
33-
Assertions.assertTrue(model.getUpdatedBy().startsWith("sys"));
33+
Assertions.assertTrue(model.getUpdatedBy().startsWith("blt"));
3434
assertEquals("", model.getDeletedBy());
3535
logger.info("passed...");
3636
}

‎src/test/java/com/contentstack/sdk/TestEntry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ void entryGetBoolean() {
178178
@Test
179179
@Order(19)
180180
void entryGetJSONArray() {
181-
Object image = entry.getJSONArray("image");
181+
Object image = entry.getJSONObject("image");
182182
Assertions.assertNotNull(image);
183183
logger.info("passed...");
184184
}

‎src/test/java/com/contentstack/sdk/TestGcpRegion.java

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package com.contentstack.sdk;
2+
3+
import org.junit.jupiter.api.Assertions;
4+
import org.junit.jupiter.api.Test;
5+
6+
public class TestGcpRegion {
7+
@Test
8+
void testGcpRegionBehaviourGcpNA() {
9+
Config config = new Config();
10+
Config.ContentstackRegion region = Config.ContentstackRegion.GCP_NA;
11+
config.setRegion(region);
12+
Assertions.assertFalse(config.region.name().isEmpty());
13+
Assertions.assertEquals("GCP_NA", config.region.name());
14+
}
15+
16+
@Test
17+
void testGcpNaRegionBehaviourGcpStack() throws IllegalAccessException {
18+
Config config = new Config();
19+
Config.ContentstackRegion region = Config.ContentstackRegion.GCP_NA;
20+
config.setRegion(region);
21+
Stack stack = Contentstack.stack("fakeApiKey", "fakeDeliveryToken", "fakeEnvironment", config);
22+
Assertions.assertFalse(config.region.name().isEmpty());
23+
Assertions.assertEquals("GCP_NA", stack.config.region.name());
24+
}
25+
26+
@Test
27+
void testGcpNARegionBehaviourGcpStackHost() throws IllegalAccessException {
28+
Config config = new Config();
29+
Config.ContentstackRegion region = Config.ContentstackRegion.GCP_NA;
30+
config.setRegion(region);
31+
Stack stack = Contentstack.stack("fakeApiKey", "fakeDeliveryToken", "fakeEnvironment", config);
32+
Assertions.assertFalse(config.region.name().isEmpty());
33+
Assertions.assertEquals("gcp-na-cdn.contentstack.com", stack.config.host);
34+
35+
}
36+
}

‎src/test/java/com/contentstack/sdk/TestQueryCase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ protected void doSomeBackgroundTask(Group group) {
557557
Object titleObj = group.get("title");
558558
String titleStr = group.getString("title");
559559
Boolean titleBool = group.getBoolean("in_stock");
560-
JSONArray titleJSONArray = group.getJSONArray("image");
560+
JSONObject titleImageJSONArray = group.getJSONObject("image");
561561
JSONObject titleJSONObject = group.getJSONObject("publish_details");
562562
Object versionNum = group.getNumber("_version");
563563
Object versionInt = group.getInt("_version");
@@ -568,7 +568,7 @@ protected void doSomeBackgroundTask(Group group) {
568568
Assertions.assertNotNull(titleObj);
569569
Assertions.assertNotNull(titleStr);
570570
Assertions.assertNotNull(titleBool);
571-
Assertions.assertNotNull(titleJSONArray);
571+
Assertions.assertNotNull(titleImageJSONArray);
572572
Assertions.assertNotNull(titleJSONObject);
573573
Assertions.assertNotNull(versionNum);
574574
Assertions.assertNotNull(versionInt);

0 commit comments

Comments
 (0)