Merge pull request #13 from contentstack/next

DX | 11-06-2024 | Release

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2012 - 2023 Contentstack
+Copyright (c) 2012 - 2024 Contentstack
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -86,7 +86,7 @@ AppRequest appRequest = marketplace.request();
 
 The MIT License (MIT)
 
-Copyright © 2012-2023 [Contentstack](https://www.contentstack.com/). All Rights Reserved
+Copyright © 2012-2024 [Contentstack](https://www.contentstack.com/). All Rights Reserved
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

changelog.md

@@ -0,0 +1,13 @@
+# Changelog
+
+A brief description of what changes project contains
+
+#### v1.1.0
+
+- added GCP_NA region support
+
+## Introducing Release Of Java Marketplace SDK
+
+#### v1.0.0
+
+- Initial release for Marketplace SDK

pom.xml

@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.contentstack.sdk</groupId>
     <artifactId>marketplace</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <description>Contentstack Java Management SDK for Content Management API</description>
     <url>https://github.com/contentstack/contentstack-management-java/</url>
 
     <properties>
-        <sdk.version>1.0.0</sdk.version>
+        <sdk.version>1.1.0</sdk.version>
         <maven.compiler.target>9</maven.compiler.target>
         <maven.compiler.source>9</maven.compiler.source>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -19,11 +19,11 @@
         <maven-javadoc-plugin.version>3.0.0</maven-javadoc-plugin.version>
         <dotenv-source.version>5.2.2</dotenv-source.version>
         <rxjava-source.version>3.1.6</rxjava-source.version>
-        <retrofit-source.version>2.9.0</retrofit-source.version>
-        <converter-gson-version>2.9.0</converter-gson-version>
+        <retrofit-source.version>2.10.0</retrofit-source.version>
+        <converter-gson-version>2.10.0</converter-gson-version>
         <logging.version>4.10.0</logging.version>
         <jococo-plugin.version>0.8.7</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.0</junit-jupiter.version>
         <junit-jupiter-engine.version>5.8.0-M1</junit-jupiter-engine.version>
         <junit-vintage-engine.version>5.10.0</junit-vintage-engine.version>
@@ -117,7 +117,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>24.0.1</version>
+            <version>24.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -161,7 +161,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.0.0-M5</version>
                 <configuration>
-                    <skipTests>true</skipTests>
+                    <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
                     <testFailureIgnore>true</testFailureIgnore>
                 </configuration>
             </plugin>

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

@@ -25,4 +25,8 @@ public enum Region {
      * Azure na region.
      */
     AZURE_NA,
+    /**
+     * Gcp na region.
+     */
+    GCP_NA,
 }

src/test/java/com/contentstack/sdk/TestClient.java

@@ -47,6 +47,14 @@ public static Marketplace getMarketplaceAzureEu() {
                 .build();
     }
 
+    public static Marketplace getMarketplaceGcpNa() {
+        return new Marketplace
+                .Builder(TestClient.ORGANIZATION_UID)
+                .host(HOST)
+                .region(Region.GCP_NA)
+                .build();
+    }
+
 
     public static Marketplace getMarketplaceWithLogin() {
         return new Marketplace

src/test/java/com/contentstack/sdk/marketplace/installations/location/LocationTests.java

@@ -60,7 +60,7 @@ void testParamsAndHeaders() {
         Assertions.assertEquals(5, request.headers().size());
         Assertions.assertEquals("api.contentstack.io", request.url().host());
         Assertions.assertNull(request.body());
-        Assertions.assertEquals("https://api.contentstack.io/installations/orgId999999999/locations/configuration?param1=value1", request.url().toString());
+        Assertions.assertEquals("https://api.contentstack.io/installations/"+ ORG_UID +"/locations/configuration?param1=value1", request.url().toString());
     }
 
 

src/test/java/com/contentstack/sdk/marketplace/installations/webhook/WebhookTests.java

@@ -111,7 +111,7 @@ void testParamsAndHeaders() {
         Assertions.assertEquals(5, request.headers().size());
         Assertions.assertEquals("api.contentstack.io", request.url().host());
         Assertions.assertNull(request.body());
-        Assertions.assertEquals("https://api.contentstack.io/installations/installation_id/webhooks/orgId999999999/executions?limit=10&skip=5&sort=asc&order=order", request.url().toString());
+        Assertions.assertEquals("https://api.contentstack.io/installations/installation_id/webhooks/" + WEBHOOK_ID + "/executions?limit=10&skip=5&sort=asc&order=order", request.url().toString());
     }