Merge pull request #85 from contentstack/next

contentstack · Jul 22, 2024 · 89193b7 · 89193b7
2 parents b20eb3e + 991442e
commit 89193b7
Show file tree

Hide file tree

Showing 57 changed files with 329 additions and 282 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v1.4.3
+
+### July 08, 2024
+
+- SRE issues fixed
+
 ## v1.4.2
 
 ### May 27, 2024

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>cms</artifactId>
     <packaging>jar</packaging>
     <name>contentstack-management-java</name>
-    <version>1.4.2</version>
+    <version>1.4.3</version>
     <description>Contentstack Java Management SDK for Content Management API, Contentstack is a headless CMS with an
         API-first approach
     </description>
@@ -54,7 +54,7 @@
             <organizationUrl>https://www.contentstack.com/</organizationUrl>
         </developer>
         <developer>
-            <name>***REMOVED***</name>
+            <name>ishaileshmishra</name>
             <email>[email protected]</email>
             <organization>contentstack</organization>
             <organizationUrl>https://www.contentstack.com/</organizationUrl>
@@ -199,29 +199,6 @@
             <artifactId>jsoup</artifactId>
             <version>1.17.2</version>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>1.7.36</version>
-        </dependency>
-          <dependency>
-            <groupId>com.slack.api</groupId>
-            <artifactId>slack-api-client</artifactId>
-            <version>1.38.0</version> 
-        </dependency>
-        <dependency>
-            <groupId>com.slack.api</groupId>
-            <artifactId>slack-app-backend</artifactId>
-            <version>1.38.0</version>
-        </dependency> 
-        <dependency>
-			<groupId>org.testng</groupId>
-			<artifactId>testng</artifactId>
-			<version>7.8.0</version>
-			<scope>test</scope>
-		</dependency>
-
-
     </dependencies>
 
 
@@ -234,12 +211,9 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.0.0-M5</version>
                 <configuration>
-                     <!-- <includes>
+                     <includes>
                          <include>**/*TestSuite.java</include>
-                     </includes> -->
-                     <suiteXmlFiles>
-						<suiteXmlFile>${basedir}/testng.xml</suiteXmlFile>
-					</suiteXmlFiles>
+                     </includes>
                      <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
                     <testFailureIgnore>true</testFailureIgnore>
                 </configuration>
@@ -279,7 +253,7 @@
             </plugin>
 
             <!--  -overview
-            "***REMOVED***tentstack/java/contentstack-management-java/src/main/overview.html"
+            "/Users/shaileshmishra/Documents/Workspace/contentstack/java/contentstack-management-java/src/main/overview.html"
             -bottom  "<b>Copyright © 2012-2022 Contentstack </b><sup>TM</sup>"-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/src/main/java/com/contentstack/cms/Contentstack.java b/src/main/java/com/contentstack/cms/Contentstack.java
@@ -79,7 +79,7 @@ public class Contentstack {
      * <br>
      *
      * @return User
-     * @author ***REMOVED***
+     * @author ishaileshmishra
      * @see <a href=
      * "https://www.contentstack.com/docs/developers/apis/content-management-api/#users">User
      * </a>
@@ -129,7 +129,7 @@ public User user() {
      * @param password the password of the user
      * @return LoginDetails
      * @throws IOException the IOException
-     * @author ***REMOVED***
+     * @author ishaileshmishra
      * @see <a href=
      * "https://www.contentstack.com/docs/developers/apis/content-management-api/#users">User
      * </a>
@@ -182,7 +182,7 @@ public Response<LoginDetails> login(String emailId, String password) throws IOEx
      * @return LoginDetails
      * @throws IOException the io exception
      * @throws IOException the IOException
-     * @author ***REMOVED***
+     * @author ishaileshmishra
      * @see <a
      * href=
      * "https://www.contentstack.com/docs/developers/apis/content-management-api/#log-in-to-your-account">Login

diff --git a/src/main/java/com/contentstack/cms/core/AuthInterceptor.java b/src/main/java/com/contentstack/cms/core/AuthInterceptor.java
@@ -19,7 +19,7 @@
  * API implementation, you'll want to pass the auth token as the value for the
  * Authorization header.
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @since v0.1.0
  */
 public class AuthInterceptor implements Interceptor {

diff --git a/src/main/java/com/contentstack/cms/core/BadArgumentException.java b/src/main/java/com/contentstack/cms/core/BadArgumentException.java
@@ -5,7 +5,7 @@
  * an illegal or unsuitable argument
  * passed to a method.
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @version v0.1.0
  * @since 2022-10-20
  */

diff --git a/src/main/java/com/contentstack/cms/core/CMALogger.java b/src/main/java/com/contentstack/cms/core/CMALogger.java
@@ -7,7 +7,7 @@
 /**
  * The Contentstack Logger
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @version v0.1.0
  * @since 2022-10-20
  */

diff --git a/src/main/java/com/contentstack/cms/core/CMARuntimeException.java b/src/main/java/com/contentstack/cms/core/CMARuntimeException.java
@@ -3,7 +3,7 @@
 /**
  * CMARuntimeException that extends Exception class
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @version v0.1.0
  * @since 2022-10-20
  */

diff --git a/src/main/java/com/contentstack/cms/core/ResponseResult.java b/src/main/java/com/contentstack/cms/core/ResponseResult.java
@@ -11,7 +11,7 @@
 /**
  * The Contentstack ResponseResult class that accepts different types of Models
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @version v0.1.0
  * @since 2022-10-20
  */

diff --git a/src/main/java/com/contentstack/cms/core/RetryCallback.java b/src/main/java/com/contentstack/cms/core/RetryCallback.java
@@ -9,7 +9,7 @@
 /**
  * The Contentstack RetryCallback
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @version v0.1.0
  * @since 2022-10-20
  */

diff --git a/src/main/java/com/contentstack/cms/core/Util.java b/src/main/java/com/contentstack/cms/core/Util.java
@@ -9,7 +9,7 @@
 /**
  * The utility class that contains utility common functions
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @version v0.1.0
  * @since 2022-10-20
  */

diff --git a/src/main/java/com/contentstack/cms/organization/Organization.java b/src/main/java/com/contentstack/cms/organization/Organization.java
@@ -16,7 +16,7 @@
  * users. Organization allows easy management of projects as well as users
  * within the Organization.
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @version v0.1.0
  * @since 2022-10-20
  */

diff --git a/src/main/java/com/contentstack/cms/stack/Alias.java b/src/main/java/com/contentstack/cms/stack/Alias.java
@@ -16,7 +16,7 @@
  * ID in your frontend code to pull content
  * from the target branch associated with an alias.
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @version v0.1.0
  * @see <a href= "https://www.contentstack.com/docs/developers/apis/content-management-api/#aliases">About Aliases </a>
  * @since 2022 -10-20
@@ -138,7 +138,7 @@ protected void clearParams() {
      * aliases available in a particular stack in your account.
      *
      * @return Call
-     * @author ***REMOVED***
+     * @author ishaileshmishra
      * @see <a href=
      * "https://www.contentstack.com/docs/developers/apis/content-management-api/#get-all-aliases">Get
      * all
@@ -153,7 +153,7 @@ public Call<ResponseBody> find() {
      * The Get a single alias request returns information of a specific alias.
      *
      * @return Call
-     * @author ***REMOVED***
+     * @author ishaileshmishra
      * @see <a href=
      * "https://www.contentstack.com/docs/developers/apis/content-management-api/#get-a-single-branch">
      * Get a single branch</a>

diff --git a/src/main/java/com/contentstack/cms/stack/Asset.java b/src/main/java/com/contentstack/cms/stack/Asset.java
@@ -22,7 +22,7 @@
  * so on) uploaded in your Contentstack
  * repository for future use.
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @since 2022-10-20
  */
 public class Asset implements BaseImplementation<Asset> {
@@ -187,7 +187,7 @@ public Folder folder(@NotNull String folderUid) {
      * Example:file_size
      *
      * @return Call
-     * @author ***REMOVED***
+     * @author ishaileshmishra
      * @see <a href=
      * "https://www.contentstack.com/docs/developers/apis/content-management-api/#get-all-assets">Get
      * all
@@ -210,7 +210,7 @@ public Call<ResponseBody> find() {
      * published in each of the environment.
      *
      * @return Call
-     * @author ***REMOVED***
+     * @author ishaileshmishra
      * @see <a href=
      * "https://www.contentstack.com/docs/developers/apis/content-management-api/#get-a-single-asset">Get
      * a single asset</a>
@@ -228,7 +228,7 @@ public Call<ResponseBody> fetch() {
      *
      * @param folderUid The folderUid of specific folder
      * @return Call
-     * @author ***REMOVED***
+     * @author ishaileshmishra
      * @see <a href=
      * "https://www.contentstack.com/docs/developers/apis/content-management-api/#get-assets-of-a-specific-folder">Get
      * Assets of a Specific Folder</a>
@@ -249,7 +249,7 @@ public Call<ResponseBody> byFolderUid(@NotNull String folderUid) {
      * @param folderUid        folder uid
      * @param isIncludeFolders provide true/false
      * @return Call
-     * @author ***REMOVED***
+     * @author ishaileshmishra
      * @see <a href=
      * "https://www.contentstack.com/docs/developers/apis/content-management-api/#get-assets-and-subfolders-of-a-parent-folder">Get
      * Assets and Subfolders of a Parent Folder</a>
@@ -296,7 +296,7 @@ public Call<ResponseBody> subfolder(
      *                    in the response.</li>
      *                    </ul>
      * @return Call
-     * @author ***REMOVED***
+     * @author ishaileshmishra
      * @see <a href=
      * "https://www.contentstack.com/docs/developers/apis/content-management-api/#upload-asset">
      * Upload
@@ -410,7 +410,7 @@ private MultipartBody.Part uploadFile(@NotNull String filePath) {
      *
      * @param body the JSONObject request body
      * @return Call
-     * @author ***REMOVED***
+     * @author ishaileshmishra
      * @see <a href=
      * "https://www.contentstack.com/docs/developers/apis/content-management-api/#generate-permanent-asset-url">
      * Generate Permanent Asset URL </a>
@@ -439,7 +439,7 @@ public Call<ResponseBody> generatePermanentUrl(JSONObject body) {
      *
      * @param slugUrl The unique identifier of the asset.
      * @return Call
-     * @author ***REMOVED***
+     * @author ishaileshmishra
      * @see <a href=
      * "https://www.contentstack.com/docs/developers/apis/content-management-api/#generate-permanent-asset-url">
      * Generate Permanent Asset Url</a>

diff --git a/src/main/java/com/contentstack/cms/stack/AuditLog.java b/src/main/java/com/contentstack/cms/stack/AuditLog.java
@@ -27,7 +27,7 @@
  * "https://www.contentstack.com/docs/developers/apis/content-management-api/#audit-log">Audit
  * Log</a>
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @version v0.1.0
  * @since 2022-10-22
  */

diff --git a/src/main/java/com/contentstack/cms/stack/Branch.java b/src/main/java/com/contentstack/cms/stack/Branch.java
@@ -18,7 +18,7 @@
  * parallel in a more collaborative, organized,
  * and structured manner without impacting each other.
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @version v1.0.0
  * @see <a href=
  * "https://www.contentstack.com/docs/developers/apis/content-management-api/#branches">About

diff --git a/src/main/java/com/contentstack/cms/stack/BulkOperation.java b/src/main/java/com/contentstack/cms/stack/BulkOperation.java
@@ -21,7 +21,7 @@
  * bulk operations on search results
  * <br>
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @version v1.0.0
  * @see <a href=
  * "https://www.contentstack.com/docs/developers/apis/content-management-api/#bulk-publish-operation">

diff --git a/src/main/java/com/contentstack/cms/stack/ContentType.java b/src/main/java/com/contentstack/cms/stack/ContentType.java
@@ -26,7 +26,7 @@
  * key in the response. This key specifies the unique ID of the branch where the
  * concerned Contentstack module resides.
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @version v0.1.0
  * @see <a href=
  * "https://www.contentstack.com/docs/developers/apis/content-management-api/#content-types">Content

diff --git a/src/main/java/com/contentstack/cms/stack/DeliveryToken.java b/src/main/java/com/contentstack/cms/stack/DeliveryToken.java
@@ -20,7 +20,7 @@
  * requests over your stack content, you can use Management Tokens
  * <br>
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @version v0.1.0
  * @since 2022-10-22
  */

diff --git a/src/main/java/com/contentstack/cms/stack/Entry.java b/src/main/java/com/contentstack/cms/stack/Entry.java
@@ -22,7 +22,7 @@
  * key in the response. This key specifies the unique ID of the branch where the
  * concerned Contentstack module resides.
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @version v0.1.0
  * @since 2022-10-22
  */

diff --git a/src/main/java/com/contentstack/cms/stack/Environment.java b/src/main/java/com/contentstack/cms/stack/Environment.java
@@ -16,7 +16,7 @@
  * content delivery destination where the
  * entries need to be published.
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @version v0.1.0
  * @since 2022-10-22
  */

diff --git a/src/main/java/com/contentstack/cms/stack/Extensions.java b/src/main/java/com/contentstack/cms/stack/Extensions.java
@@ -25,7 +25,7 @@
  * key in the response. This key specifies the unique ID of the branch where the
  * concerned Contentstack module resides.
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @version v0.1.0
  * @since 2022-10-22
  */

diff --git a/src/main/java/com/contentstack/cms/stack/GlobalField.java b/src/main/java/com/contentstack/cms/stack/GlobalField.java
@@ -24,7 +24,7 @@
  * key in the response. This key specifies the unique ID of the branch where the
  * concerned Contentstack module resides.
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @version v0.1.0
  * @since 2022-10-22
  */

diff --git a/src/main/java/com/contentstack/cms/stack/Label.java b/src/main/java/com/contentstack/cms/stack/Label.java
@@ -22,7 +22,7 @@
  * key in the response. This key specifies the unique ID of the branch where the
  * concerned Contentstack module resides.
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @version v0.1.0
  * @since 2022-10-22
  */

diff --git a/src/main/java/com/contentstack/cms/stack/Locale.java b/src/main/java/com/contentstack/cms/stack/Locale.java
@@ -17,7 +17,7 @@
  * to a wide variety of audience by serving
  * content in their local language(s).
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @version v0.1.0
  * @see <a href=
  * "https://www.contentstack.com/docs/developers/apis/content-management-api/#languages">

diff --git a/src/main/java/com/contentstack/cms/stack/ManagementToken.java b/src/main/java/com/contentstack/cms/stack/ManagementToken.java
@@ -14,7 +14,7 @@
  * content, you can use Management Tokens
  * <br>
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @version v0.1.0
  * @since 2022-10-22
  */

diff --git a/src/main/java/com/contentstack/cms/stack/Merge.java b/src/main/java/com/contentstack/cms/stack/Merge.java
@@ -38,7 +38,7 @@
  * </li>
  * </ul>
  *
- * @author ***REMOVED***
+ * @author ishaileshmishra
  * @version v1.0.0
  * @see <a href=
  * "https://www.contentstack.com/docs/developers/apis/content-management-api/#merge-branches">Merge