v1.10.2

Author: ishaileshmishra

AUTHORS.md

@@ -1,4 +1,5 @@
 # Authors
+
 - [ishaileshmishra](shailesh.mishra@contentstack.com)
 - [shaileshmishra](mshaileshr@contentstack.com)
 - [admin](dev@contentstack.com)

CHANGELOG.md

@@ -1,5 +1,23 @@
 # CHANGELOG
 
+## Version 1.10.2
+
+### Date: 27-Oct-2022
+
+- LivePreview internal function implementation updated
+- Jsoup dependency updated
+- Json version updated
+
+---
+
+## Version 1.10.1
+
+### Date: 18-June-2022
+
+- Compile Issue With Gradle
+
+---
+
 ## Version 1.10.0
 
 ### Date: 16-May-2022

pom.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.contentstack.sdk</groupId>

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

@@ -36,7 +36,8 @@ protected CSBackgroundTask(Query queryInstance, Stack stackInstance, String cont
         csConnectionRequest.setQueryInstance(queryInstance);
         csConnectionRequest.setURLQueries(urlQueries);
         this.service = stackInstance.service;
-        csConnectionRequest.setParams(completeUrl, headers, controller, requestInfo, callback, this.service, stackInstance.config);
+        csConnectionRequest.setParams(completeUrl, headers, controller, requestInfo, callback, this.service,
+                stackInstance.config);
 
     }
 

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

@@ -4,7 +4,6 @@
 
 import java.util.concurrent.TimeUnit;
 
-
 public class CSConnectionPool {
 
     ConnectionPool create() {

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

@@ -189,10 +189,9 @@ private void getService(String requestUrl) throws IOException {
         Response<ResponseBody> response = this.service.getRequest(requestUrl, this.headers).execute();
         if (response.isSuccessful()) {
             assert response.body() != null;
-            // String resp = response.body().string();
             responseJSON = new JSONObject(response.body().string());
             // LivePreviewAgent to validate If LivePreview Response is there for mapping
-            if (this.config.livePreviewEntry != null) {
+            if (this.config.livePreviewEntry != null && !this.config.livePreviewEntry.isEmpty()) {
                 livePreviewAgent();
             }
             connectionRequest.onRequestFinished(CSHttpConnection.this);
@@ -210,22 +209,48 @@ private void livePreviewAgent() {
         if (responseJSON.has("entry")) {
             mapLPreviewToEntry(responseJSON.optJSONObject("entry"), 0);
         }
-        //  TODO: responseJSON
     }
 
     private void mapLPreviewToEntry(JSONObject entry, int idx) {
-        System.out.println(entry);
-        if (entry.opt("uid").equals(this.config.livePreviewEntry.opt("uid"))){
-            System.out.println("Equal------");
+        if (entry.opt("uid").equals(this.config.livePreviewEntry.opt("uid"))) {
+            filterToUpdate(entry, idx);
         }
     }
 
-    private void mapLPreviewToQuery(JSONArray entries) {
-        IntStream.range(0, entries.length())
-                .forEach(idx -> mapLPreviewToEntry((JSONObject) entries.get(idx), idx)
-                );
+    // How to merge the JSONObject key value to another key?
+    // JSONObject a = new JSONObject("{\"data\": [ {\"empId\": 1,\"deptId\":
+    // 2},{\"empId\": 3,\"deptId\": 4}]}");
+    // JSONObject b = new JSONObject("{\"data\": [ {\"empId\": 7,\"deptId\":
+    // 8},{\"empId\": 9,\"deptId\": 10}]}");
+
+    // JSONArray jArr_A= a.getJSONArray("data");
+
+    // JSONArray jArr= new JSONArray();
+    // for(int i=0;i<jArr_A.length();i++){
+    // jArr.put(jArr_A.getJSONObject(i));
+    // }
+
+    // jArr_A= b.getJSONArray("data");
+
+    // for(int i=0;i<jArr_A.length();i++){
+    // jArr.put(jArr_A.getJSONObject(i));
+    // }
+
+    // JSONObject mainJson = new JSONObject();
+    // mainJson.put("data", jArr);
+
+    private void filterToUpdate(JSONObject entry, int idx) {
+        JSONObject rec = responseJSON.optJSONArray("entries").getJSONObject(idx);
+        if (rec.has("uid") && entry.opt("uid").equals(rec.opt("uid"))) {
+            responseJSON.optJSONArray("entries").getJSONObject(idx).put(String.valueOf(entry), idx);
+            // System.out.println();
+            // TODO: Check again before commit.
+        }
     }
 
+    private void mapLPreviewToQuery(JSONArray entries) {
+        IntStream.range(0, entries.length()).forEach(idx -> mapLPreviewToEntry((JSONObject) entries.get(idx), idx));
+    }
 
     void setError(String errResp) {
         logger.info(errResp);

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

@@ -37,7 +37,6 @@ public class Constants {
     protected static final String LIMIT = "limit";
     protected static final String OPTIONS = "$options";
 
-
     protected Constants() {
         logger.warning("Not Allowed");
     }
@@ -62,13 +61,15 @@ public enum REQUEST_CONTROLLER {
     public static final String CONTENT_TYPE_NAME = "Please set contentType name.";
     public static final String QUERY_EXCEPTION = "Please provide valid params.";
 
+
+
     /**
      * Parse date calendar.
      *
      * @param date
-     *         the date
+     *                 the date
      * @param timeZone
-     *         the time zone
+     *                 the time zone
      * @return the calendar
      */
     public static Calendar parseDate(String date, TimeZone timeZone) {
@@ -99,14 +100,14 @@ public static Calendar parseDate(String date, TimeZone timeZone) {
      * Parse date calendar.
      *
      * @param date
-     *         the date
+     *                   the date
      * @param dateFormat
-     *         the date format
+     *                   the date format
      * @param timeZone
-     *         the time zone
+     *                   the time zone
      * @return the calendar
      * @throws ParseException
-     *         the parse exception
+     *                        the parse exception
      */
     public static Calendar parseDate(String date, String dateFormat, TimeZone timeZone) throws ParseException {
         Calendar cal = Calendar.getInstance();

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

@@ -35,9 +35,9 @@ protected void setStackInstance(Stack stack) {
      * Sets header on {@link Stack}.
      *
      * @param headerKey
-     *         the header key
+     *                    the header key
      * @param headerValue
-     *         the header value
+     *                    the header value
      */
     public void setHeader(String headerKey, String headerValue) {
         if (!headerKey.isEmpty() && !headerValue.isEmpty()) {
@@ -49,7 +49,7 @@ public void setHeader(String headerKey, String headerValue) {
      * Remove header from {@link Stack}
      *
      * @param headerKey
-     *         the header key
+     *                  the header key
      */
     public void removeHeader(String headerKey) {
         if (!headerKey.isEmpty()) {
@@ -58,12 +58,13 @@ public void removeHeader(String headerKey) {
     }
 
     /**
-     * An entry is the actual piece of content created using one of the defined content types.
+     * An entry is the actual piece of content created using one of the defined
+     * content types.
      * <p>
      * The Get a single entry request fetches a particular entry of a content type.
      *
      * @param entryUid
-     *         the entry unique ID of the entry that you want to fetch.
+     *                 the entry unique ID of the entry that you want to fetch.
      * @return the {@link Entry} entry.
      */
     public Entry entry(String entryUid) {
@@ -81,8 +82,10 @@ protected Entry entry() {
     }
 
     /**
-     * Query. The Get all entries request fetches the list of all the entries of a particular content type. It returns
-     * the content of each entry in JSON format. You need to specify the environment and locale of which you want to get
+     * Query. The Get all entries request fetches the list of all the entries of a
+     * particular content type. It returns
+     * the content of each entry in JSON format. You need to specify the environment
+     * and locale of which you want to get
      * the entries.
      *
      * <p>
@@ -94,10 +97,14 @@ protected Entry entry() {
      * language itself, this parameter would not be applicable.
      *
      * <p>
-     * To include the publishing details in the response, make use of the include_publish_details=true parameter. This
-     * will return the publishing details of the entry in every environment along with the version number that is
-     * published in each of the environments. You can add other Queries to extend the functionality of this API call.
-     * Add a query parameter named query and provide your query (in JSON format) as the value.
+     * To include the publishing details in the response, make use of the
+     * include_publish_details=true parameter. This
+     * will return the publishing details of the entry in every environment along
+     * with the version number that is
+     * published in each of the environments. You can add other Queries to extend
+     * the functionality of this API call.
+     * Add a query parameter named query and provide your query (in JSON format) as
+     * the value.
      *
      * @return the {@link Query}
      */
@@ -112,9 +119,9 @@ public Query query() {
      * Fetch.
      *
      * @param params
-     *         the params
+     *                 the params
      * @param callback
-     *         the callback
+     *                 the callback
      */
     public void fetch(@NotNull JSONObject params, final ContentTypesCallback callback) {
         String urlString = "content_types/" + contentTypeUid;
@@ -136,7 +143,7 @@ public void fetch(@NotNull JSONObject params, final ContentTypesCallback callbac
     }
 
     private void fetchContentTypes(String urlString, JSONObject params, HashMap<String, Object> headers,
-                                   ContentTypesCallback callback) {
+            ContentTypesCallback callback) {
         if (callback != null) {
             HashMap<String, Object> urlParams = getUrlParams(params);
             new CSBackgroundTask(this, stackInstance, Constants.FETCHCONTENTTYPES, urlString, headers, urlParams,