Merge pull request #39 from contentstack/next

Next : Bug Fix ~ Fix for Extra New Line issue
contentstack · Oct 6, 2023 · e22d7c9 · e22d7c9
2 parents ca29f0a + 05f43d1
commit e22d7c9
Show file tree

Hide file tree

Showing 12 changed files with 7,079 additions and 34 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -2,7 +2,13 @@
 
 A brief description of what changes project contains
 
-## Aug 8, 2023
+## Oct 5, 2023
+
+#### v1.2.5
+
+- The issue of adding an extra <br/> tag in breaks has been fixed
+
+## Sep 26, 2023
 
 #### v1.2.4
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.contentstack.sdk</groupId>
     <artifactId>utils</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
     <packaging>jar</packaging>
     <name>Contentstack-utils</name>
     <description>Java Utils SDK for Contentstack Content Delivery API, Contentstack is a headless CMS</description>

diff --git a/src/main/java/com/contentstack/utils/node/NodeToHTML.java b/src/main/java/com/contentstack/utils/node/NodeToHTML.java
@@ -29,8 +29,7 @@ private NodeToHTML() {
      */
     public static String textNodeToHTML(JSONObject nodeText, Option renderOption) {
         String text = nodeText.optString("text");
-
-        // compare with the nodeText options
+        text = text.replace("\n", "");
         if (nodeText.has("superscript")) {
             text = renderOption.renderMark(MarkType.SUPERSCRIPT, text);
         }

diff --git a/src/main/java/com/contentstack/utils/render/DefaultOption.java b/src/main/java/com/contentstack/utils/render/DefaultOption.java
@@ -54,8 +54,6 @@ public String renderOptions(JSONObject embeddedObject, Metadata metadata) {
      */
     @Override
     public String renderMark(MarkType markType, String text) {
-        // Replace "\n" with "<br/>" tags
-        text = renderHtmlWithLineBreaks(text);
         switch (markType) {
             case SUPERSCRIPT:
                 return "<sup>" + text + "</sup>";
@@ -72,7 +70,7 @@ public String renderMark(MarkType markType, String text) {
             case BOLD:
                 return "<strong>" + text + "</strong>";
             case BREAK:
-                return "<br />" + text;
+                return "<br />" + text; // v1.2.5
             default:
                 return text;
         }
@@ -101,11 +99,8 @@ private String escapeInjectHtml(JSONObject nodeObj, String nodeType) {
      */
     @Override
     public String renderNode(String nodeType, JSONObject nodeObject, NodeCallback callback) {
-
         String strAttrs = strAttrs(nodeObject);
-
         String children = callback.renderChildren(nodeObject.optJSONArray("children"));
-
         switch (nodeType) {
             case "p":
                 return "<p" + strAttrs + ">" + children + "</p>";
@@ -165,28 +160,6 @@ public String renderNode(String nodeType, JSONObject nodeObject, NodeCallback ca
     }
 
 
-    /**
-     * Returns the string replacing </n> is with the <br/> tags
-     *
-     * @param content the content
-     * @return string with br tags
-     * @apiNote the support for the br tags are included
-     * @since v1.3.0
-     */
-    private String renderHtmlWithLineBreaks(String content) {
-        // Replace "\n" with "<br/>" tags
-        String htmlContent = content.replaceAll("\\n", "<br />");
-
-        // Now, you can render the HTML content
-        // (You can use your rendering method here, e.g., send it to a WebView or display it in a GUI component)
-
-        // For demonstration purposes, let's just print it
-        System.out.println(htmlContent);
-
-        return htmlContent;
-    }
-
-
     /**
      * The function takes a JSONObject as input and returns a string containing the attributes and
      * their values, excluding certain keys.

diff --git a/src/test/java/com/contentstack/utils/TestRte.java b/src/test/java/com/contentstack/utils/TestRte.java
@@ -8,6 +8,8 @@
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
+import java.io.IOException;
+
 import static com.contentstack.utils.RTEResult.*;
 import static com.contentstack.utils.RTEString.*;
 
@@ -94,4 +96,12 @@ public void testAvailableEntryItemTypes() {
         String result = Utils.jsonToHTML(rteObject, new DefaultOption(), null);
         Assert.assertEquals(kParagraphHtml, result);
     }
+
+    @Test
+    public void testHERFID() throws IOException {
+        final String rte = "src/test/resources/reports/jsonviewer.json";
+        JSONObject theRTE = new ReadResource().readJson(rte);
+        String result = Utils.jsonToHTML(theRTE, new DefaultOption(), null);
+        System.out.println(result);
+    }
 }
diff --git a/src/test/java/com/contentstack/utils/UtilTests.java b/src/test/java/com/contentstack/utils/UtilTests.java
@@ -158,8 +158,6 @@ public void testRenderFunction() {
 
     @Test
     public void testCustomJSONRTE() {
-
-
         JSONObject rteObject = new JSONObject();
         String[] keyPath = {
                 "rich_text_editor", "global_rich_multiple.group.rich_text_editor"