Merge pull request #57 from contentstack/next

Fixed the Snyk issues and added plugin to generate test reports

Author: abhinav-from-contentstack

Changelog.md

@@ -2,6 +2,13 @@
 
 A brief description of what changes project contains
 
+## April 23, 2024
+
+#### v1.2.8
+
+- added surefire plugin to generate test reports
+- Fixed Snyk issues
+
 ## March 24, 2024
 
 #### v1.2.7

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2012 - 2023 Contentstack
+Copyright (c) 2012 - 2024 Contentstack
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.contentstack.sdk</groupId>
     <artifactId>utils</artifactId>
-    <version>1.2.7</version>
+    <version>1.2.8</version>
     <packaging>jar</packaging>
     <name>Contentstack-utils</name>
     <description>Java Utils SDK for Contentstack Content Delivery API, Contentstack is a headless CMS</description>
@@ -20,16 +20,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.16.1</jsoup.version>
+        <jsoup.version>1.17.2</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>20231013</json-version>
-        <spring-web-version>6.0.18</spring-web-version>
-        <org.apache.commons-text>1.10.0</org.apache.commons-text>
+        <json-version>20240303</json-version>
+        <spring-web-version>6.1.6</spring-web-version>
+        <org.apache.commons-text>1.11.0</org.apache.commons-text>
     </properties>
 
     <developers>
@@ -141,6 +141,15 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M5</version>
+                <configuration>
+                    <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
+                    <testFailureIgnore>true</testFailureIgnore>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>

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

@@ -111,7 +111,7 @@ public String renderNode(String nodeType, JSONObject nodeObject, NodeCallback ca
                 if (!assetLink.isEmpty()) {
                     JSONObject attrs = nodeObject.optJSONObject("attrs");
                     if (attrs.has("link")) {
-                        return "<a href=\"" + escapeInjectHtml(nodeObject, "link") + "\" />" + "<img" + strAttrs + " src=\"" + escapeInjectHtml(nodeObject, "asset-link") + "\" />" + children + "</a>";
+                        return "<a href=\"" + escapeInjectHtml(nodeObject, "link") + "\" >" + "<img" + strAttrs + " src=\"" + escapeInjectHtml(nodeObject, "asset-link") + "\" />" + children + "</a>";
                     }
                     return "<img" + strAttrs + " src=\"" + escapeInjectHtml(nodeObject, "asset-link") + "\" />" + children;
                 }

src/test/resources/issue/jsonfile.json

@@ -45,7 +45,7 @@
         "file_size": "11773",
         "_content_type_uid": "asset",
         "filename": "11.jpg",
-        "url": "***REMOVED***/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg",
+        "url": "https://images/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg",
         "_version": 2,
         "title": "11.jpg",
         "description": "dddd",
@@ -68,7 +68,7 @@
         "file_size": "11773",
         "_content_type_uid": "0_solve",
         "filename": "11.jpg",
-        "url": "***REMOVED***/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg",
+        "url": "https://images/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg",
         "_version": 2,
         "title": "11.jpg",
         "description": "dddd",
@@ -91,7 +91,7 @@
         "file_size": "11773",
         "_content_type_uid": "0_solve",
         "filename": "11.jpg",
-        "url": "***REMOVED***/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg",
+        "url": "https://images/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg",
         "_version": 2,
         "title": "11.jpg",
         "description": "dddd",
@@ -114,7 +114,7 @@
         "file_size": "11773",
         "_content_type_uid": "0_solve",
         "filename": "11.jpg",
-        "url": "***REMOVED***/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg",
+        "url": "https://images/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg",
         "_version": 2,
         "title": "11.jpg",
         "description": "dddd",
@@ -132,7 +132,7 @@
         "url": "/suraj-123-entry",
         "single_line": "Single line textbox",
         "multi_line": "Multi line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textbox",
-        "rich_text_editor": "<img data-image=\"lbeuy3biyi6r\" src=\"***REMOVED***/v3/assets/77263d300aee3e6b/9bfd9e8d4df0ad1e/5e156f7050c418529410fe9d/Ticket.pdf\" data-sys-asset-uid=\"9bfd9e8d4df0ad1e\" alt=\"Ticket.pdf\">",
+        "rich_text_editor": "<img data-image=\"lbeuy3biyi6r\" src=\"https://images/v3/assets/77263d300aee3e6b/9bfd9e8d4df0ad1e/5e156f7050c418529410fe9d/Ticket.pdf\" data-sys-asset-uid=\"9bfd9e8d4df0ad1e\" alt=\"Ticket.pdf\">",
         "markdown": "fsdfsdfsdfasf",
         "modular_blocks": [
           {
@@ -191,7 +191,7 @@
         "file_size": "59014",
         "_content_type_uid": "0_solve",
         "filename": "iphone-mockup.png",
-        "url": "***REMOVED***/v3/assets/iphone-mockup.png",
+        "url": "https://images/v3/assets/iphone-mockup.png",
         "ACL": {},
         "_version": 1,
         "title": "iphone-mockup.png",
@@ -214,7 +214,7 @@
         "file_size": "11773",
         "_content_type_uid": "0_solve",
         "filename": "11.jpg",
-        "url": "***REMOVED***/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg",
+        "url": "https://images/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg",
         "_version": 2,
         "title": "11.jpg",
         "description": "dddd",
@@ -232,7 +232,7 @@
         "url": "/suraj-123-entry",
         "single_line": "Single line textbox",
         "multi_line": "Multi line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textbox",
-        "rich_text_editor": "<img data-image=\"lbeuy3biyi6r\" src=\"***REMOVED***/v3/assets/77263d300aee3e6b/9bfd9e8d4df0ad1e/5e156f7050c418529410fe9d/Ticket.pdf\" data-sys-asset-uid=\"9bfd9e8d4df0ad1e\" alt=\"Ticket.pdf\">",
+        "rich_text_editor": "<img data-image=\"lbeuy3biyi6r\" src=\"https://images/v3/assets/77263d300aee3e6b/9bfd9e8d4df0ad1e/5e156f7050c418529410fe9d/Ticket.pdf\" data-sys-asset-uid=\"9bfd9e8d4df0ad1e\" alt=\"Ticket.pdf\">",
         "markdown": "fsdfsdfsdfasf",
         "modular_blocks": [
           {
@@ -441,7 +441,7 @@
         "url": "/suraj-123-entry",
         "single_line": "Single line textbox",
         "multi_line": "Multi line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textbox",
-        "rich_text_editor": "<img data-image=\"lbeuy3biyi6r\" src=\"***REMOVED***/v3/assets/77263d300aee3e6b/9bfd9e8d4df0ad1e/5e156f7050c418529410fe9d/Ticket.pdf\" data-sys-asset-uid=\"9bfd9e8d4df0ad1e\" alt=\"Ticket.pdf\">",
+        "rich_text_editor": "<img data-image=\"lbeuy3biyi6r\" src=\"https://images/v3/assets/77263d300aee3e6b/9bfd9e8d4df0ad1e/5e156f7050c418529410fe9d/Ticket.pdf\" data-sys-asset-uid=\"9bfd9e8d4df0ad1e\" alt=\"Ticket.pdf\">",
         "markdown": "fsdfsdfsdfasf",
         "modular_blocks": [
           {
@@ -545,7 +545,7 @@
           }
         ],
         "multi_line": "Multi line textboxMulti line textboxMulti line textboxMulti line textboxMulti line textbox",
-        "rich_text_editor": "<img data-image=\"lbeuy3biyi6r\" src=\"***REMOVED***/v3/assets/77263d300aee3e6b/9bfd9e8d4df0ad1e/5e156f7050c418529410fe9d/Ticket.pdf\" data-sys-asset-uid=\"9bfd9e8d4df0ad1e\" alt=\"Ticket.pdf\">",
+        "rich_text_editor": "<img data-image=\"lbeuy3biyi6r\" src=\"https://images/v3/assets/77263d300aee3e6b/9bfd9e8d4df0ad1e/5e156f7050c418529410fe9d/Ticket.pdf\" data-sys-asset-uid=\"9bfd9e8d4df0ad1e\" alt=\"Ticket.pdf\">",
         "single_line": "Single line textbox",
         "suraj_123": [
           {
@@ -718,7 +718,7 @@
     "modular_blocks": [
       {
         "rich_in_modular": {
-          "rich_text_editor": "<p>global&nbsp;</p><figure class=\"embedded-asset\" data-redactor-type=\"embed\" data-widget-code=\"\" data-sys-asset-filelink=\"***REMOVED***/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg\" data-sys-asset-uid=\"7324a68403ee7281\" data-sys-asset-filename=\"11.jpg\" data-sys-asset-contenttype=\"image/jpeg\" type=\"asset\" sys-style-type=\"display\"></figure>\n<p> modular 1</p>",
+          "rich_text_editor": "<p>global&nbsp;</p><figure class=\"embedded-asset\" data-redactor-type=\"embed\" data-widget-code=\"\" data-sys-asset-filelink=\"https://images/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg\" data-sys-asset-uid=\"7324a68403ee7281\" data-sys-asset-filename=\"11.jpg\" data-sys-asset-contenttype=\"image/jpeg\" type=\"asset\" sys-style-type=\"display\"></figure>\n<p> modular 1</p>",
           "rich_text_editor_multiple": [
             "<p>global modular 2<span class=\"redactor-component embedded-entry inline-entry\" data-redactor-type=\"embed\" data-widget-code=\"\" data-sys-entry-uid=\"2fcbb159a2a4c216\" data-sys-entry-locale=\"en-us\" data-sys-content-type-uid=\"0_bug_1\" data-sys-can-edit=\"true\" sys-style-type=\"inline\" type=\"entry\"></span></p>"
           ],
@@ -736,17 +736,17 @@
         "<p>Global multiple 2<span class=\"redactor-component embedded-entry inline-entry\" data-redactor-type=\"embed\" data-widget-code=\"\" data-sys-entry-uid=\"49af3673cdd268a5\" data-sys-entry-locale=\"en-us\" data-sys-content-type-uid=\"0_solve\" data-sys-can-edit=\"true\" sys-style-type=\"inline\" type=\"entry\"></span></p>"
       ],
       "group": {
-        "rich_text_editor": "<p>Global multiple group 1</p><figure class=\"embedded-asset\" data-redactor-type=\"embed\" data-widget-code=\"\" data-sys-asset-filelink=\"***REMOVED***/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg\" data-sys-asset-uid=\"7324a68403ee7281\" data-sys-asset-filename=\"11.jpg\" data-sys-asset-contenttype=\"image/jpeg\" type=\"asset\" sys-style-type=\"display\"></figure>",
+        "rich_text_editor": "<p>Global multiple group 1</p><figure class=\"embedded-asset\" data-redactor-type=\"embed\" data-widget-code=\"\" data-sys-asset-filelink=\"https://images/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg\" data-sys-asset-uid=\"7324a68403ee7281\" data-sys-asset-filename=\"11.jpg\" data-sys-asset-contenttype=\"image/jpeg\" type=\"asset\" sys-style-type=\"display\"></figure>",
         "rich_text_editor_multiple": [
-          "<p>Global multiple group 2</p><figure class=\"embedded-asset\" data-redactor-type=\"embed\" data-widget-code=\"\" data-sys-asset-filelink=\"***REMOVED***/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg\" data-sys-asset-uid=\"7324a68403ee7281\" data-sys-asset-filename=\"11.jpg\" data-sys-asset-contenttype=\"image/jpeg\" type=\"asset\" sys-style-type=\"display\"></figure>"
+          "<p>Global multiple group 2</p><figure class=\"embedded-asset\" data-redactor-type=\"embed\" data-widget-code=\"\" data-sys-asset-filelink=\"https://images/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg\" data-sys-asset-uid=\"7324a68403ee7281\" data-sys-asset-filename=\"11.jpg\" data-sys-asset-contenttype=\"image/jpeg\" type=\"asset\" sys-style-type=\"display\"></figure>"
         ]
       },
       "modular_blocks": [
         {
           "rich_in_modular": {
             "rich_text_editor": "<p><a data-sys-entry-uid=\"1c9e75e3608f8c6b\" data-sys-entry-locale=\"en-us\" data-sys-content-type-uid=\"0_solve\" sys-style-type=\"link\" data-sys-can-edit=\"true\" class=\"embedded-entry\" type=\"entry\" href=\"/untitled\" title=\"Entry 001 123\">Global multiple modular 1</a></p>",
             "rich_text_editor_multiple": [
-              "<p>Global multiple modular</p><figure class=\"embedded-asset\" data-redactor-type=\"embed\" data-widget-code=\"\" data-sys-asset-filelink=\"***REMOVED***/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg\" data-sys-asset-uid=\"7324a68403ee7281\" data-sys-asset-filename=\"11.jpg\" data-sys-asset-contenttype=\"image/jpeg\" type=\"asset\" sys-style-type=\"display\"></figure>\n<p> 2</p>"
+              "<p>Global multiple modular</p><figure class=\"embedded-asset\" data-redactor-type=\"embed\" data-widget-code=\"\" data-sys-asset-filelink=\"https://images/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg\" data-sys-asset-uid=\"7324a68403ee7281\" data-sys-asset-filename=\"11.jpg\" data-sys-asset-contenttype=\"image/jpeg\" type=\"asset\" sys-style-type=\"display\"></figure>\n<p> 2</p>"
             ],
             "_metadata": {
               "uid": "cs6d492f34be84aa04"
@@ -770,7 +770,7 @@
       "rich_text_inmodular": {
         "rich_text_editor": "<div class=\"redactor-component embedded-entry block-entry redactor-component-active\" data-redactor-type=\"embed\" data-widget-code=\"\" data-sys-entry-uid=\"f2fb45e5fc46f8d4\" data-sys-entry-locale=\"en-us\" data-sys-content-type-uid=\"00_suraj_final\" data-sys-can-edit=\"true\" sys-style-type=\"block\" type=\"entry\"></div>\n<p>Modul 1</p>",
         "rich_text_editor_multiple": [
-          "<p>module 2&nbsp;</p><figure class=\"embedded-asset\" data-redactor-type=\"embed\" data-widget-code=\"\" data-sys-asset-filelink=\"***REMOVED***/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg\" data-sys-asset-uid=\"7324a68403ee7281\" data-sys-asset-filename=\"11.jpg\" data-sys-asset-contenttype=\"image/jpeg\" type=\"asset\" sys-style-type=\"display\"></figure>"
+          "<p>module 2&nbsp;</p><figure class=\"embedded-asset\" data-redactor-type=\"embed\" data-widget-code=\"\" data-sys-asset-filelink=\"https://images/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg\" data-sys-asset-uid=\"7324a68403ee7281\" data-sys-asset-filename=\"11.jpg\" data-sys-asset-contenttype=\"image/jpeg\" type=\"asset\" sys-style-type=\"display\"></figure>"
         ],
         "_metadata": {
           "uid": "csb005424df53ebe6d"
@@ -814,9 +814,9 @@
       "_content_type_uid": "embed_entry"
     }
   ],
-  "rich_text_editor": "<div class=\"redactor-component embedded-entry block-entry\" data-redactor-type=\"embed\" data-widget-code=\"\" data-sys-entry-uid=\"41a3bf40728446c3\" data-sys-entry-locale=\"en-us\" data-sys-content-type-uid=\"00_suraj\" sys-style-type=\"block\" type=\"entry\" data-sys-can-edit=\"true\"></div>\n<p>one</p>\n<figure class=\"embedded-asset\" data-sys-asset-filelink=\"***REMOVED***/v3/assets/77263d300aee3e6b/120a5a04d91c9466/5ebb86965a68ad069038b729/iphone-mockup.png\" data-sys-asset-uid=\"120a5a04d91c9466\" data-sys-asset-filename=\"iphone-mockup.png\" data-sys-asset-contenttype=\"image/png\" type=\"asset\" sys-style-type=\"display\"></figure>",
+  "rich_text_editor": "<div class=\"redactor-component embedded-entry block-entry\" data-redactor-type=\"embed\" data-widget-code=\"\" data-sys-entry-uid=\"41a3bf40728446c3\" data-sys-entry-locale=\"en-us\" data-sys-content-type-uid=\"00_suraj\" sys-style-type=\"block\" type=\"entry\" data-sys-can-edit=\"true\"></div>\n<p>one</p>\n<figure class=\"embedded-asset\" data-sys-asset-filelink=\"https://images/v3/assets/77263d300aee3e6b/120a5a04d91c9466/5ebb86965a68ad069038b729/iphone-mockup.png\" data-sys-asset-uid=\"120a5a04d91c9466\" data-sys-asset-filename=\"iphone-mockup.png\" data-sys-asset-contenttype=\"image/png\" type=\"asset\" sys-style-type=\"display\"></figure>",
   "rich_text_editor_multiple": [
-    "<p>Two</p><img data-image=\"akofs65z4070\" src=\"***REMOVED***/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg\" data-sys-asset-uid=\"7324a68403ee7281\" alt=\"11.jpg\">"
+    "<p>Two</p><img data-image=\"akofs65z4070\" src=\"https://images/v3/assets/77263d300aee3e6b/7324a68403ee7281/5f83f543d418e407f919e0e4/11.jpg\" data-sys-asset-uid=\"7324a68403ee7281\" alt=\"11.jpg\">"
   ],
   "title": "Test Rich Text",
   "updated_at": "2020-11-05T08:26:14.590Z",