Revert "[UNDERTOW-1748] add comment line to predicates"

This reverts commit 223be0f.
undertow-io · Feb 14, 2023 · 157bcff · 157bcff
1 parent 6da238e
commit 157bcff
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/core/src/main/java/io/undertow/server/handlers/builder/PredicatedHandlersParser.java b/core/src/main/java/io/undertow/server/handlers/builder/PredicatedHandlersParser.java
@@ -647,23 +647,6 @@ public static Deque<Token> tokenize(final String string) {
                 }
             } else {
                 switch (c) {
-                    case '#':
-                        final Token previous = ret.peekLast();
-                        if(previous == null ||(previous != null && previous.getToken().equals("\n"))) {
-                            //its either first line ever or new line
-                            pos++;
-                            while (pos < string.length()) {
-                                char skip = string.charAt(pos);
-                                if(skip == '\n' || skip == '\r') {
-                                    break;
-                                }
-                                pos++;
-                            }
-                            break;
-                        } else {
-                            current.append(c);
-                            break;
-                        }
                     case ' ':
                     case '\t': {
                         if (current.length() != 0) {

diff --git a/core/src/test/java/io/undertow/predicate/PredicateParsingTestCase.java b/core/src/test/java/io/undertow/predicate/PredicateParsingTestCase.java
@@ -76,12 +76,12 @@ public void testPredicateContextVariable() {
 
     @Test
     public void testRegularExpressionsWithPredicateContext() {
-        Predicate predicate = PredicateParser.parse("#Im Not related\nregex[pattern=#a* , value=%{RELATIVE_PATH}] and equals[{$0, #aaa}]", PredicateParsingTestCase.class.getClassLoader());
+        Predicate predicate = PredicateParser.parse("regex[pattern=a* , value=%{RELATIVE_PATH}] and equals[{$0, aaa}]", PredicateParsingTestCase.class.getClassLoader());
         HttpServerExchange e = new HttpServerExchange(null);
         e.putAttachment(Predicate.PREDICATE_CONTEXT, new HashMap<String, Object>());
-        e.setRelativePath("#aaab");
+        e.setRelativePath("aaab");
         Assert.assertTrue(predicate.resolve(e));
-        e.setRelativePath("#aaaab");
+        e.setRelativePath("aaaab");
         Assert.assertFalse(predicate.resolve(e));
 
         predicate = PredicateParser.parse("regex[pattern='a(b*)a*' , value=%{RELATIVE_PATH}] and equals[$1, bb]", PredicateParsingTestCase.class.getClassLoader());

diff --git a/core/src/test/java/io/undertow/server/handlers/PredicatedHandlersTestCase.java b/core/src/test/java/io/undertow/server/handlers/PredicatedHandlersTestCase.java
@@ -52,7 +52,6 @@ public void testRewrite() throws IOException {
                                         "regex('(.*).css') -> {rewrite['${1}.xcss'];set(attribute='%{o,chained}', value=true)} \n" +
                                         "regex('(.*).redirect$') -> redirect['${1}.redirected']\n\n\n\n\n" +
                                         "set[attribute='%{o,someHeader}', value=always]\n" +
-                                        "#ImJust a Comment\n"+
                                         "path-template('/foo/{bar}/{f}') -> set[attribute='%{o,template}', value='${bar}']\r\n" +
                                         "path-template('/bar->foo') -> redirect(/);" +
                                         "regex('(.*).css') -> set[attribute='%{o,css}', value='true'] else set[attribute='%{o,css}', value='false']; " +