This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch revert-6642-main-camel-17433-fix-javadochelper in repository https://gitbox.apache.org/repos/asf/camel.git
commit cb23b0764de35639cdfd4a5c4019336ba2782fb8 Author: Andrea Cosentino <[email protected]> AuthorDate: Fri Jan 7 14:05:23 2022 +0100 Revert "CAMEL-17433 fix JavadocHelper" This reverts commit 8d48dde56f525b3cec9e7d42741994a43ce8995e. --- .../apache/camel/tooling/util/JavadocHelper.java | 9 +++--- .../camel/tooling/util/JavadocHelperTest.java | 36 ---------------------- 2 files changed, 4 insertions(+), 41 deletions(-) diff --git a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java index e940559..9a89dcf 100644 --- a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java +++ b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java @@ -20,7 +20,7 @@ import static org.apache.camel.tooling.util.Strings.isNullOrEmpty; public final class JavadocHelper { - private static final String VALID_CHARS = ".,-='/\\!&%():;#${}<>"; + private static final String VALID_CHARS = ".,-='/\\!&%():;#${}"; private JavadocHelper() { } @@ -87,9 +87,8 @@ public final class JavadocHelper { } String s = sb.toString(); - // remove all XML tags. This isn't complete but likely to find anything actually used. - s = s.replaceAll("<(\\w|:|_)(\\w|:|_|-|\\.|\\d)*\\s.*/?>", ""); - s = s.replaceAll("</(\\w|:|_)(\\w|:|_|-|\\.|\\d)*\\s*>", ""); + // remove all XML tags + s = s.replaceAll("<.*?>", ""); // remove {@link inlined javadoc links which is special handled s = s.replaceAll("\\{@link\\s\\w+\\s(\\w+)}", "$1"); s = s.replaceAll("\\{@link\\s([\\w]+)}", "$1"); @@ -131,7 +130,7 @@ public final class JavadocHelper { return ""; } // must replace amp first, so we dont replace < to amp later - text = text.replaceAll("&(?!(amp;)|(lt;)|(gt;)|(quot;))", "&"); + text = text.replace("&", "&"); text = text.replace("\"", """); text = text.replace("<", "<"); text = text.replace(">", ">"); diff --git a/tooling/camel-tooling-util/src/test/java/org/apache/camel/tooling/util/JavadocHelperTest.java b/tooling/camel-tooling-util/src/test/java/org/apache/camel/tooling/util/JavadocHelperTest.java index 05dbfca..6e1698f 100644 --- a/tooling/camel-tooling-util/src/test/java/org/apache/camel/tooling/util/JavadocHelperTest.java +++ b/tooling/camel-tooling-util/src/test/java/org/apache/camel/tooling/util/JavadocHelperTest.java @@ -99,40 +99,4 @@ public class JavadocHelperTest { Assertions.assertEquals("Provides methods to interact with Transactions. E.g. sales, credits, refunds, searches, etc.", s3); } - - @Test - public void testltgtInJavaDoc() throws Exception { - String s = " * valid for versions < 26.0."; - String s2 = JavadocHelper.sanitizeDescription(s, false); - Assertions.assertEquals(s.substring(3), s2); - String s3 = " * valid for versions >= 26.0."; - String s4 = JavadocHelper.sanitizeDescription(s3, false); - Assertions.assertEquals(s3.substring(3), s4); - } - - @Test - public void testRemoveXmlTagsInJavaDoc() throws Exception { - String s = " * foo <xs:foo a=\"x\" b=\"y\"> bar"; - String s2 = JavadocHelper.sanitizeDescription(s, false); - Assertions.assertEquals("foo bar", s2); - String s3 = " * foo </xs:foo> bar"; - String s4 = JavadocHelper.sanitizeDescription(s3, false); - Assertions.assertEquals("foo bar", s4); - String s5 = " * foo </xs:foo > bar"; - String s6 = JavadocHelper.sanitizeDescription(s5, false); - Assertions.assertEquals("foo bar", s6); - String s7 = " * this < is not an xml > tag"; - String s8 = JavadocHelper.sanitizeDescription(s7, false); - Assertions.assertEquals(s7.substring(3), s8); - } - - @Test - public void testXmlEncode() throws Exception { - String s = "foo & bar > baz < foo " bar"; - String s2 = JavadocHelper.xmlEncode(s); - Assertions.assertEquals(s, s2); - String s3 = "foo & bar > baz < foo \" bar"; - String s4 = JavadocHelper.xmlEncode(s3); - Assertions.assertEquals(s, s4); - } }
