Add Lombok annotations and enhance data handling in models

Author: reeshika-h

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

@@ -3,6 +3,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONObject;
 import retrofit2.Retrofit;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Calendar;
 import java.util.HashMap;
@@ -29,6 +31,8 @@
  * @version 1.0.0
  * @since 01-11-2017
  */
+@Getter
+@Setter
 public class Asset {
 
     protected static final Logger logger = Logger.getLogger(Asset.class.getSimpleName());

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

@@ -3,11 +3,17 @@
 import java.util.LinkedHashMap;
 import org.json.JSONArray;
 import org.json.JSONObject;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.NoArgsConstructor;
 
 
 /**
  * The type Asset model.
  */
+@Getter
+@Setter
+@NoArgsConstructor
 class AssetModel {
 
     String uploadedUid;

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

@@ -5,10 +5,16 @@
 
 import org.json.JSONArray;
 import org.json.JSONObject;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.NoArgsConstructor;
 
 /**
  * The type Assets model.
  */
+@Getter
+@Setter
+@NoArgsConstructor
 class AssetsModel {
 
     List<Object> objects = new ArrayList<>();

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

@@ -2,7 +2,9 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONObject;
-
+import org.json.JSONArray;
+import lombok.Getter;
+import lombok.Setter;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -20,13 +22,23 @@
  * @version 1.0.0
  * @since 01-11-2017
  */
+
+@Getter
+@Setter
 public class ContentType {
 
     protected static final Logger logger = Logger.getLogger(ContentType.class.getSimpleName());
     protected String contentTypeUid;
     protected Stack stackInstance = null;
     protected LinkedHashMap<String, Object> headers = null;
 
+    // NEW: Content type data fields for POJO access (public for Lombok-generated getters)
+    public String title;
+    public String description;
+    public String uid;
+    public JSONArray schema;
+    public JSONObject contentTypeData;
+
     protected ContentType() throws IllegalAccessException {
         throw new IllegalAccessException("Can Not Access Private Modifier");
     }
@@ -156,7 +168,17 @@ private void fetchContentTypes(String urlString, JSONObject params, HashMap<Stri
         if (callback != null) {
             HashMap<String, Object> urlParams = getUrlParams(params);
             new CSBackgroundTask(this, stackInstance, Constants.FETCHCONTENTTYPES, urlString, headers, urlParams,
-                    Constants.REQUEST_CONTROLLER.CONTENTTYPES.toString(), callback);
+                    // Constants.REQUEST_CONTROLLER.CONTENTTYPES.toString(), callback);
+                    Constants.REQUEST_CONTROLLER.CONTENTTYPES.toString(), new ContentTypesCallback() {
+                        @Override
+                        public void onCompletion(ContentTypesModel model, Error error) {
+                            if (error == null) {
+                                // NEW: Store content type data in this instance for POJO access
+                                model.setContentTypeData(ContentType.this);
+                            }
+                            callback.onCompletion(model, error);
+                        }
+                    });
         }
     }
 
@@ -173,4 +195,20 @@ private HashMap<String, Object> getUrlParams(JSONObject urlQueriesJSON) {
         return hashMap;
     }
 
+    /**
+     * Set content type data from JSON response.
+     * This method is called internally by ContentTypesModel.
+     * 
+     * @param ctData the content type data JSONObject
+     */
+    protected void setContentTypeData(JSONObject ctData) {
+        if (ctData != null) {
+            this.title = ctData.optString("title");
+            this.description = ctData.optString("description");
+            this.uid = ctData.optString("uid");
+            this.schema = ctData.optJSONArray("schema");
+            this.contentTypeData = ctData;
+        }
+    }
+
 }

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

@@ -5,12 +5,18 @@
 import java.util.List;
 import org.json.JSONArray;
 import org.json.JSONObject;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.NoArgsConstructor;
 
 
 
 /**
  * The ContentTypesModel that contains content type response
  */
+@Getter
+@Setter
+@NoArgsConstructor
 public class ContentTypesModel {
 
     private Object response;
@@ -58,4 +64,17 @@ public Object getResponse() {
     public JSONArray getResultArray() {
         return responseJSONArray;
     }
+
+    /**
+     * Set content type data in the ContentType instance for POJO access.
+     * This method is called internally after fetching content type data.
+     * 
+     * @param contentType the ContentType instance to set data in
+     */
+    public void setContentTypeData(ContentType contentType) {
+        if (response instanceof JSONObject) {
+            JSONObject ctData = (JSONObject) response;
+            contentType.setContentTypeData(ctData);
+        }
+    }
 }

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

@@ -4,8 +4,12 @@
 import java.util.Map;
 import org.json.JSONArray;
 import org.json.JSONObject;
+import lombok.Getter;
+import lombok.Setter;
 
 
+@Getter
+@Setter
 class EntryModel {
 
     private static final String PUBLISH_DETAIL_KEY = "publish_details";