Merge pull request #24 from contentstack/next

feat:CS:36088 Reference JSON RTE, Asset as embedded object

Author: ishaileshmishra

.talismanrc

@@ -2,5 +2,7 @@ threshold: medium
 
 fileignoreconfig:
 
-- filename: .dccache
-  checksum: 140eb49c2bad3edadf62c926625f3bb304e904c38f2a9a5a57e9f6dc7163f61e
+- filename: src/test/resources/issue/jsonfile.json
+  checksum: d67cd6db0795f8c5a5f5edf34a457720191e8894889e9f9bb4b8106c23b40799
+
+

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.contentstack.sdk</groupId>
     <artifactId>utils</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
     <packaging>jar</packaging>
     <name>Contentstack-utils</name>
     <description>Java Utils SDK for Contentstack Content Delivery API, Contentstack is a headless CMS
@@ -22,15 +22,16 @@
         <maven-source-plugin.version>2.2.1</maven-source-plugin.version>
         <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
         <junit.version>4.13.2</junit.version>
-        <jsoup.version>1.15.4</jsoup.version>
+        <jsoup.version>1.16.1</jsoup.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>
         <nexus-staging-maven-plugin.version>1.6.7</nexus-staging-maven-plugin.version>
         <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
         <validation-version>2.0.1.Final</validation-version>
         <json-version>20230227</json-version>
-        <spring-web-version>6.0.4</spring-web-version>
+        <spring-web-version>6.0.7</spring-web-version>
+        <org.apache.commons-text>1.10.0</org.apache.commons-text>
     </properties>
 
     <developers>
@@ -78,6 +79,13 @@
     </organization>
 
     <dependencies>
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-text -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>${org.apache.commons-text}</version>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

src/main/java/com/contentstack/utils/AutomateCommon.java

@@ -21,6 +21,7 @@
 
 public class AutomateCommon {
 
+
     private static final String ASSET = "asset";
 
     private AutomateCommon() {
@@ -175,6 +176,10 @@ private static String extractKeys(@NotNull JSONObject jsonNode, Option renderObj
                 if (filteredContent.isPresent()) {
                     JSONObject contentToPass = filteredContent.get();
                     return getStringOption(renderObject, metadata, contentToPass);
+                } else {
+                    if (attrType.equalsIgnoreCase(ASSET)) {
+                        return renderObject.renderNode("img", jsonNode, nodeJsonArray -> doRawProcessing(nodeJsonArray, renderObject, embedItem));
+                    }
                 }
 
             } else {

src/main/java/com/contentstack/utils/render/DefaultOption.java

@@ -4,6 +4,7 @@
 import com.contentstack.utils.interfaces.NodeCallback;
 import com.contentstack.utils.interfaces.Option;
 import com.contentstack.utils.node.MarkType;
+import org.apache.commons.text.StringEscapeUtils;
 import org.json.JSONObject;
 
 
@@ -58,18 +59,27 @@ public String renderMark(MarkType markType, String text) {
         }
     }
 
+    private String escapeInjectHtml(JSONObject nodeObj, String nodeType) {
+        String injectedHtml = getNodeStr(nodeObj, nodeType);
+        return StringEscapeUtils.escapeHtml4(injectedHtml);
+    }
+
     @Override
     public String renderNode(String nodeType, JSONObject nodeObject, NodeCallback callback) {
         String children = callback.renderChildren(nodeObject.optJSONArray("children"));
         switch (nodeType) {
             case "p":
                 return "<p>" + children + "</p>";
             case "a":
-                return "<a href=\"" + getNodeStr(nodeObject, "href") + "\">" + children + "</a>";
+                return "<a href=\"" + escapeInjectHtml(nodeObject, "href") + "\">" + children + "</a>";
             case "img":
-                return "<img src=\"" + getNodeStr(nodeObject, "src") + "\" />" + children;
+                String assetLink = getNodeStr(nodeObject, "asset-link");
+                if (!assetLink.isEmpty()) {
+                    return "<img src=\"" + escapeInjectHtml(nodeObject, "asset-link") + "\" />" + children;
+                }
+                return "<img src=\"" + escapeInjectHtml(nodeObject, "src") + "\" />" + children;
             case "embed":
-                return "<iframe src=\"" + getNodeStr(nodeObject, "src") + "\"" + children + "</iframe>";
+                return "<iframe src=\"" + escapeInjectHtml(nodeObject, "src") + "\"" + children + "</iframe>";
             case "h1":
                 return "<h1>" + children + "</h1>";
             case "h2":
@@ -124,6 +134,7 @@ private String getNodeStr(JSONObject nodeObject, String key) {
         return herf;
     }
 
+
     /**
      * Returns Title From The Embedded Object of type entry
      *

src/test/java/com/contentstack/utils/AssetLinkTest.java

@@ -0,0 +1,31 @@
+package com.contentstack.utils;
+
+import com.contentstack.utils.render.DefaultOption;
+import org.json.JSONObject;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.io.IOException;
+
+public class AssetLinkTest {
+
+
+    private static JSONObject assetLink = null;
+
+
+    @BeforeClass
+    public static void startUtilTests() throws IOException {
+        final String ASSERT_LINK = "src/test/resources/issue/jsonfile.json";
+        assetLink = new ReadResource().readJson(ASSERT_LINK);
+    }
+
+    @Test
+    public void testRenderFunction() {
+        String[] keys = new String[1];
+        keys[0] = "assetlink";
+        Utils.jsonToHTML(assetLink, keys, new DefaultOption());
+        System.out.println(assetLink);
+        Assert.assertEquals("<img src=\"https://image.url/11.jpg\" />", assetLink.opt("assetlink").toString());
+    }
+}