Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .talismanrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@ threshold: medium

fileignoreconfig:

- filename: .dccache
checksum: 140eb49c2bad3edadf62c926625f3bb304e904c38f2a9a5a57e9f6dc7163f61e
- filename: src/test/resources/issue/jsonfile.json
checksum: d67cd6db0795f8c5a5f5edf34a457720191e8894889e9f9bb4b8106c23b40799


2 changes: 1 addition & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @contentstack/security-admin @contentstack/sdk-admin
* @contentstack/security-admin
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -22,15 +22,15 @@
<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>
</properties>

<developers>
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/contentstack/utils/AutomateCommon.java
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ public String renderNode(String nodeType, JSONObject nodeObject, NodeCallback ca
case "a":
return "<a href=\"" + getNodeStr(nodeObject, "href") + "\">" + children + "</a>";
case "img":
String assetLink = getNodeStr(nodeObject, "asset-link");
if (!assetLink.isEmpty()) {
return "<img src=\"" + assetLink + "\" />" + children;
}
return "<img src=\"" + getNodeStr(nodeObject, "src") + "\" />" + children;
case "embed":
return "<iframe src=\"" + getNodeStr(nodeObject, "src") + "\"" + children + "</iframe>";
Expand Down Expand Up @@ -124,6 +128,7 @@ private String getNodeStr(JSONObject nodeObject, String key) {
return herf;
}


/**
* Returns Title From The Embedded Object of type entry
*
Expand Down
31 changes: 31 additions & 0 deletions src/test/java/com/contentstack/utils/AssetLinkTest.java
Original file line number Diff line number Diff line change
@@ -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());
}
}
Loading