🪴 Label class added

Author: ishaileshmishra

cms.iml

@@ -18,14 +18,12 @@
     <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.9" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
     <orderEntry type="library" name="Maven: com.squareup.retrofit2:converter-gson:2.9.0" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:4.9.3" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.10" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:logging-interceptor:4.7.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jetbrains:annotations:23.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.24" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: io.github.cdimascio:java-dotenv:5.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.8.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />

pom.xml

@@ -85,7 +85,7 @@
         <converter-gson-version>2.9.0</converter-gson-version>
         <loggin.version>4.9.3</loggin.version>
         <jococo-plugin.version>0.8.5</jococo-plugin.version>
-        <lombok-source.version>1.18.22</lombok-source.version>
+        <lombok-source.version>1.18.24</lombok-source.version>
         <junit-jupiter.version>5.8.2</junit-jupiter.version>
         <junit-jupiter-engine.version>5.8.0-M1</junit-jupiter-engine.version>
         <junit-vintage-engine.version>5.8.2</junit-vintage-engine.version>
@@ -97,7 +97,9 @@
         <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
     </properties>
 
+
     <dependencies>
+
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
@@ -126,7 +128,19 @@
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
             <version>${loggin.version}</version>
-            <scope>compile</scope>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>23.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <!--com.squareup.okhttp3:logging-interceptor:4.7.2-->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>logging-interceptor</artifactId>
+            <version>4.7.2</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -152,13 +166,13 @@
             <version>${junit-vintage-engine.version}</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>com.googlecode.json-simple</groupId>
             <artifactId>json-simple</artifactId>
             <version>1.1.1</version>
             <scope>compile</scope>
         </dependency>
+
     </dependencies>
 
     <build>

src/main/java/com/contentstack/cms/Contentstack.java

@@ -503,18 +503,15 @@ private void validateClient(Contentstack contentstack) {
 
         private OkHttpClient httpClient(Contentstack contentstack, Boolean retryOnFailure) {
             this.authInterceptor = contentstack.interceptor = new AuthInterceptor();
-            HttpLoggingInterceptor level = new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY);
+            HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
+            logging.setLevel(HttpLoggingInterceptor.Level.BASIC);
             return new OkHttpClient.Builder()
                     .addInterceptor(this.authInterceptor)
-                    .addInterceptor(level)
+                    .addInterceptor(logging)
                     .proxy(this.proxy)
                     .retryOnConnectionFailure(retryOnFailure)
                     .build();
         }
 
-//        private HttpLoggingInterceptor setLoggerLevel(HttpLoggingInterceptor.Level level) {
-//            return new HttpLoggingInterceptor().setLevel(level);
-//        }
-
     }
 }

src/main/java/com/contentstack/cms/core/CMSRuntimeException.java

@@ -1,7 +1,6 @@
 package com.contentstack.cms.core;
 
 public class CMSRuntimeException extends Exception {
-
     public CMSRuntimeException(String message) {
         super(message);
     }

src/main/java/com/contentstack/cms/organization/Organization.java

@@ -27,7 +27,7 @@ public class Organization {
      * @param client
      *         the client
      */
-    public Organization(@NotNull Retrofit client) {
+    public Organization(Retrofit client) {
         this.orgService = client.create(OrganizationService.class);
     }
 

src/main/java/com/contentstack/cms/stack/GlobalField.java

@@ -38,13 +38,11 @@ protected GlobalField(Retrofit retrofit, HashMap<String, Object> stackHeaders) {
     /**
      * <b>Get All Global Fields</b>
      * <p>
-     * The Get <b>All global fields</b> call returns comprehensive information of
-     * all the global fields available in a
+     * The Get <b>All global fields</b> call returns comprehensive information of all the global fields available in a
      * particular stack in your account
      * <p>
      * <b>Note:</b> You need to use either the stack's Management Token or the user
-     * Authtoken (any one is mandatory),
-     * along with the stack API key, to make a valid Content Management API request.
+     * Authtoken (any one is mandatory), along with the stack API key, to make a valid Content Management API request.
      * Read more about authentication.
      *
      * @return retrofit2.Call
@@ -56,20 +54,17 @@ public Call<ResponseBody> fetch() {
     /**
      * <b>Get Single Global Field:</b>
      * <p>
-     * The Get a <b>Single global field</b> request allows you to fetch
-     * comprehensive details of a specific global
+     * The Get a <b>Single global field</b> request allows you to fetch comprehensive details of a specific global
      * field.
      * <p>
-     * When executing the API call, in the <b>URI Parameters</b> section, provide
-     * the unique ID of your global field.
+     * When executing the API call, in the <b>URI Parameters</b> section, provide the unique ID of your global field.
      * <p>
      * <b>Note:</b> You need to use either the stack's Management Token or the user
-     * Authtoken (any one is mandatory),
-     * along with the stack API key, to make a valid Content Management API request.
+     * Authtoken (any one is mandatory), along with the stack API key, to make a valid Content Management API request.
      * Read more about authentication.
      *
      * @param globalFiledUid
-     *                       the global filed uid
+     *         the global filed uid
      * @return retrofit2.Call
      */
     public Call<ResponseBody> single(@NotNull String globalFiledUid) {
@@ -79,21 +74,18 @@ public Call<ResponseBody> single(@NotNull String globalFiledUid) {
     /**
      * <b>Create Global Field</b>
      * <p>
-     * The <b>Create a global field</b> request allows you to create a new global
-     * field in a particular stack of your
-     * Contentstack account. You can use this global field in any content type
-     * within your stack.
+     * The <b>Create a global field</b> request allows you to create a new global field in a particular stack of your
+     * Contentstack account. You can use this global field in any content type within your stack.
      * <p>
      * <b>Note:</b> Only the stack owner, administrator and developer can create
      * global fields
      * <p>
      * <b>Note:</b> You need to use either the stack's Management Token or the user
-     * Authtoken (any one is mandatory),
-     * along with the stack API key, to make a valid Content Management API request.
+     * Authtoken (any one is mandatory), along with the stack API key, to make a valid Content Management API request.
      * Read more about authentication.
      *
      * @param requestBody
-     *                    the request body
+     *         the request body
      * @return retrofit2.Call
      */
     public Call<ResponseBody> create(@NotNull JSONObject requestBody) {
@@ -103,21 +95,18 @@ public Call<ResponseBody> create(@NotNull JSONObject requestBody) {
     /**
      * <b>Update a global field </b>
      * <p>
-     * The <b>Update a global field</b> request allows you to update the schema of
-     * an existing global field.
+     * The <b>Update a global field</b> request allows you to update the schema of an existing global field.
      * <p>
-     * When executing the API call, in the <b>URI Parameters</b> section, provide
-     * the unique ID of your global field.
+     * When executing the API call, in the <b>URI Parameters</b> section, provide the unique ID of your global field.
      *
      * <b>Note:</b> You need to use either the stack's Management Token or the user
-     * Authtoken (any one is mandatory),
-     * along with the stack API key, to make a valid Content Management API request.
+     * Authtoken (any one is mandatory), along with the stack API key, to make a valid Content Management API request.
      * Read more about authentication.
      *
      * @param globalFiledUid
-     *                       the global filed uid
+     *         the global filed uid
      * @param requestBody
-     *                       the request body
+     *         the request body
      * @return retrofit2.Call
      */
     public Call<ResponseBody> update(@NotNull String globalFiledUid, @NotNull JSONObject requestBody) {
@@ -130,13 +119,12 @@ public Call<ResponseBody> update(@NotNull String globalFiledUid, @NotNull JSONOb
      * The Delete global field request allows you to delete a specific global field.
      * <p>
      * <b>Warning:</b> If your Global field has been referred within a particular
-     * content type, then you will need to
-     * pass an additional query parameter force:true to delete the Global field.
+     * content type, then you will need to pass an additional query parameter force:true to delete the Global field.
      * <p>
      * <b>here</b>: force:true is already applied in this request call
      *
      * @param globalFiledUid
-     *                       the global filed uid
+     *         the global filed uid
      * @return retrofit2.Call
      */
     public Call<ResponseBody> delete(@NotNull String globalFiledUid) {
@@ -145,18 +133,15 @@ public Call<ResponseBody> delete(@NotNull String globalFiledUid) {
 
     /**
      * <b>Import a global field</b>
-     * The <br>
-     * Import global field <br>
-     * call imports global fields into <b>Stack</b>
+     * The <br> Import global field <br> call imports global fields into <b>Stack</b>
      * <br>
      * <b>[Note]</b>
      * <p>
-     * You need to use either the stack's Management Token or the user Authtoken
-     * (any one is mandatory), along with the
+     * You need to use either the stack's Management Token or the user Authtoken (any one is mandatory), along with the
      * stack API key, to make a valid Content Management API request.
      *
      * @param jsonGlobalField
-     *                        The Json object to pass as body
+     *         The Json object to pass as body
      * @return retrofit2.Call
      */
     public Call<ResponseBody> imports(@NotNull Map<String, Object> jsonGlobalField) {
@@ -170,11 +155,10 @@ public Call<ResponseBody> imports(@NotNull Map<String, Object> jsonGlobalField)
     /**
      * <b>Export global field</b>
      * <p>
-     * This request is used to export a specific global field and it's schema, The
-     * data is exported in JSON format
+     * This request is used to export a specific global field and it's schema, The data is exported in JSON format
      *
      * @param globalFiledUid
-     *                       the global filed uid
+     *         the global filed uid
      * @return the retrofit2.Call
      */
     public Call<ResponseBody> export(@NotNull String globalFiledUid) {