updated dependencies

Author: ishaileshmishra

pom.xml

@@ -1,10 +1,11 @@
 <?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>
     <artifactId>java</artifactId>
-    <version>1.10.0-SNAPSHOT</version>
+    <version>1.10.2-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>contentstack-java</name>
     <description>Java SDK for Contentstack Content Delivery API</description>
@@ -20,28 +21,28 @@
         <surefire-report-plugin.version>2.22.0</surefire-report-plugin.version>
         <maven-source-plugin.version>2.2.1</maven-source-plugin.version>
         <maven-javadoc-plugin.version>3.3.2</maven-javadoc-plugin.version>
-        <dotenv-source.version>2.2.3</dotenv-source.version>
-        <rxjava-source.version>3.1.4</rxjava-source.version>
+        <dotenv-source.version>2.2.4</dotenv-source.version>
+        <rxjava-source.version>3.1.5</rxjava-source.version>
         <retrofit-source.version>2.9.0</retrofit-source.version>
         <converter-gson-source.version>2.9.0</converter-gson-source.version>
-        <loggin.version>4.9.3</loggin.version>
+        <loggin.version>4.10.0</loggin.version>
         <jococo-plugin.version>0.8.5</jococo-plugin.version>
         <lombok-source.version>1.18.24</lombok-source.version>
-        <junit-jupiter.version>5.8.2</junit-jupiter.version>
+        <junit-jupiter.version>5.9.0</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>
+        <junit-vintage-engine.version>5.9.0</junit-vintage-engine.version>
         <gson.version>2.8.8</gson.version>
         <json-simple-version>1.1.1</json-simple-version>
         <maven-site-plugin.version>3.3</maven-site-plugin.version>
         <maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <nexus-staging-maven-plugin.version>1.6.7</nexus-staging-maven-plugin.version>
         <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
-        <json-version>20220320</json-version>
+        <json-version>20220924</json-version>
         <jacoco-maven-plugin-version>0.8.7</jacoco-maven-plugin-version>
         <maven-release-plugin-version>2.5.3</maven-release-plugin-version>
         <nexus-staging-maven-plugin-version>1.6.7</nexus-staging-maven-plugin-version>
-        <contentstack-utils-version>1.1.1</contentstack-utils-version>
+        <contentstack-utils-version>1.2.0</contentstack-utils-version>
     </properties>
 
     <parent>
@@ -342,6 +343,7 @@
                         <exclude>src/main/java/com/contentstack/sdk/FetchResultCallback.class</exclude>
                         <exclude>src/main/java/com/contentstack/sdk/EntryResultCallBack.class</exclude>
                         <exclude>src/main/java/com/contentstack/sdk/FetchResultCallback.class</exclude>
+                        <exclude>src/main/java/com/contentstack/sdk/TestLivePreview.class</exclude>
                     </excludes>
                 </configuration>
             </plugin>

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

@@ -36,7 +36,7 @@ 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);
+        csConnectionRequest.setParams(completeUrl, headers, controller, requestInfo, callback, this.service, stackInstance.config);
 
     }
 

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

@@ -20,6 +20,7 @@ class CSConnectionRequest implements IRequestModelHTTP {
     private INotifyClass notifyClass;
     private AssetLibrary assetLibrary;
     private APIService service;
+    private Config config;
     private Entry entryInstance;
     private Asset assetInstance;
     private Stack stackInstance;
@@ -74,6 +75,9 @@ public void setParams(Object... objects) {
             resultCallBack = (ResultCallBack) objects[4];
         }
         this.service = (APIService) objects[5];
+        if (objects.length > 6) {
+            this.config = (Config) objects[6];
+        }
         sendRequest();
     }
 
@@ -84,6 +88,7 @@ public void sendRequest() {
         connection.setHeaders(header);
         connection.setInfo(requestInfo);
         connection.setAPIService(this.service);
+        connection.setConfig(this.config);
         connection.setCallBackObject(resultCallBack);
         if (urlQueries != null && urlQueries.size() > 0) {
             connection.setFormParams(urlQueries);

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

@@ -16,6 +16,7 @@
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.IntStream;
 
 import static com.contentstack.sdk.Constants.*;
 
@@ -28,6 +29,7 @@ public class CSHttpConnection implements IURLRequestHTTP {
     private LinkedHashMap<String, Object> headers;
     private String info;
     private APIService service;
+    private Config config;
     private ResultCallBack callBackObject;
     private JSONObject responseJSON;
     private HashMap<String, Object> formParams;
@@ -187,8 +189,12 @@ 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(resp);
+            // 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) {
+                livePreviewAgent();
+            }
             connectionRequest.onRequestFinished(CSHttpConnection.this);
         } else {
             assert response.errorBody() != null;
@@ -197,6 +203,30 @@ private void getService(String requestUrl) throws IOException {
 
     }
 
+    private void livePreviewAgent() {
+        if (!responseJSON.isEmpty() && responseJSON.has("entries")) {
+            mapLPreviewToQuery(responseJSON.optJSONArray("entries"));
+        }
+        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------");
+        }
+    }
+
+    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);
         responseJSON = new JSONObject(errResp); // Parse error string to JSONObject
@@ -210,4 +240,8 @@ void setError(String errResp) {
     public void setAPIService(APIService service) {
         this.service = service;
     }
+
+    public void setConfig(Config config) {
+        this.config = config;
+    }
 }

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

@@ -2,6 +2,7 @@
 
 import okhttp3.ConnectionPool;
 import org.jetbrains.annotations.NotNull;
+import org.json.JSONObject;
 
 import java.net.Proxy;
 import java.util.concurrent.TimeUnit;
@@ -14,12 +15,14 @@ public class Config {
 
     protected String livePreviewHash = null;
     protected String livePreviewContentType = null;
+    protected String livePreviewEntryUid = null;
     protected String host = "cdn.contentstack.io";
     protected String version = "v3";
     protected String scheme = "https://";
     protected String endpoint;
     protected boolean enableLivePreview = false;
     protected String livePreviewHost;
+    protected JSONObject livePreviewEntry = null;
     protected ContentstackRegion region = ContentstackRegion.US;
     protected String managementToken;
     protected String branch;
@@ -43,9 +46,8 @@ public void setBranch(String branch) {
      *         <br><br><b>Example:</b><br><br>
      *         <code>
      *         java.net.Proxy proxy = new Proxy(Proxy.Type.HTTP,  new InetSocketAddress("proxyHost", "proxyPort"));
-     *         java.net.Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("sl.theproxyvpn.io", 80));
-     *         Config config = new Config();
-     *         config.setProxy(proxy);
+     *         java.net.Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("sl.theproxyvpn.io", 80)); Config
+     *         config = new Config(); config.setProxy(proxy);
      *         </code>
      */
     public void setProxy(Proxy proxy) {
@@ -164,6 +166,11 @@ public Config setLivePreviewHost(@NotNull String livePreviewHost) {
         return this;
     }
 
+    protected Config setLivePreviewEntry(@NotNull JSONObject livePreviewEntry) {
+        this.livePreviewEntry = livePreviewEntry;
+        return this;
+    }
+
     /**
      * Sets management token.
      *

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

@@ -15,6 +15,9 @@ public class Constants {
     protected static final String SDK_VERSION = "1.10.0";
     protected static final String ENVIRONMENT = "environment";
     protected static final String CONTENT_TYPE_UID = "content_type_uid";
+    protected static final String ENTRY_UID = "entry_uid";
+    protected static final String LIVE_PREVIEW = "live_preview";
+
     protected static final String SYNCHRONISATION = "stacks/sync";
     // Errors
     protected static final String ERROR_CODE = "error_code";