chore: fix refactoring regression

victools · Nov 15, 2023 · c88c9c4 · c88c9c4
1 parent 0a94ae4
commit c88c9c4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/...a-maven-plugin/src/main/java/com/github/victools/jsonschema/plugin/maven/GlobHandler.java b/...a-maven-plugin/src/main/java/com/github/victools/jsonschema/plugin/maven/GlobHandler.java
@@ -21,6 +21,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
+import java.util.stream.IntStream;
 
 /**
  * Conversion logic from globs to regular expressions.
@@ -33,12 +34,12 @@ public class GlobHandler {
     private static final char EXCLAMATION_SIGN_CHAR = '!';
     private static final char COMMA_CHAR = ',';
 
-    private static final List<Character> GLOB_IDENTIFIERS = Arrays.asList(
+    private static final int[] GLOB_IDENTIFIERS = {
             ESCAPE_CHAR, ASTERISK_CHAR, QUESTION_MARK_CHAR, '/', '+', '[', '{'
-    );
-    private static final List<Character> INPUT_CHARS_REQUIRING_ESCAPE = Arrays.asList(
+    };
+    private static final int[] INPUT_CHARS_REQUIRING_ESCAPE = {
             '.', '(', ')', '+', '|', '^', '$', '@', '%'
-    );
+    };
 
     /**
      * Generate predicate to check the given input for filtering classes on the classpath.
@@ -68,7 +69,7 @@ public static Pattern createClassOrPackageNamePattern(String input, boolean forP
     }
 
     private static String convertInputToRegex(String input) {
-        if (input.chars().anyMatch(GLOB_IDENTIFIERS::contains)) {
+        if (IntStream.of(GLOB_IDENTIFIERS).anyMatch(identifier -> input.chars().anyMatch(inputChar -> inputChar == identifier))) {
             // convert glob pattern into regular expression
             return GlobHandler.convertGlobToRegex(input);
         }
@@ -124,7 +125,7 @@ private static String convertGlobToRegex(String pattern) {
                 handleCommaChar(sb, inGroup);
                 break;
             default:
-                boolean shouldBeEscaped = INPUT_CHARS_REQUIRING_ESCAPE.contains(ch)
+                boolean shouldBeEscaped = IntStream.of(INPUT_CHARS_REQUIRING_ESCAPE).anyMatch(specialChar -> specialChar == ch)
                         && (inClass.get() == 0 || (ch == '^' && firstIndexInClass.get() == index.get()));
                 if (shouldBeEscaped) {
                     sb.append(ESCAPE_CHAR);

diff --git a/...ven-plugin/src/test/java/com/github/victools/jsonschema/plugin/maven/GlobHandlerTest.java b/...ven-plugin/src/test/java/com/github/victools/jsonschema/plugin/maven/GlobHandlerTest.java
@@ -31,7 +31,7 @@ public class GlobHandlerTest {
 
     static Stream<Arguments> parametersForTestBasicPattern() {
         return Stream.of(
-            Arguments.of("single star becomes all-but-shlash star", "gl*b", "gl[^/]*b"),
+            Arguments.of("single star becomes all-but-slash star", "gl*b", "gl[^/]*b"),
             Arguments.of("double star becomes dot star", "gl**b", "gl.*b"),
             Arguments.of("escaped star is unchanged", "gl\\*b", "gl\\*b"),
             Arguments.of("question mark becomes all-but-shlash", "gl?b", "gl[^/]b"),