|
27 | 27 | import static com.microsoft.playwright.impl.Utils.toJsRegexFlags; |
28 | 28 |
|
29 | 29 | class UrlMatcher { |
30 | | - private final String baseURL; |
31 | 30 | public final String glob; |
32 | 31 | public final Pattern pattern; |
33 | 32 | public final Predicate<String> predicate; |
34 | 33 |
|
35 | 34 | static UrlMatcher forOneOf(URL baseUrl, Object object, LocalUtils localUtils, boolean isWebSocketUrl) { |
36 | 35 | if (object == null) { |
37 | | - return new UrlMatcher(null, null, null, null); |
| 36 | + return new UrlMatcher(null, null, null); |
38 | 37 | } |
39 | 38 | if (object instanceof String) { |
40 | 39 | return UrlMatcher.forGlob(baseUrl, (String) object, localUtils, isWebSocketUrl); |
@@ -66,29 +65,28 @@ private static String resolveUrl(String baseUrl, String spec) { |
66 | 65 |
|
67 | 66 | static UrlMatcher forGlob(URL baseURL, String glob, LocalUtils localUtils, boolean isWebSocketUrl) { |
68 | 67 | Pattern pattern = localUtils.globToRegex(glob, baseURL != null ? baseURL.toString() : null, isWebSocketUrl); |
69 | | - return new UrlMatcher(baseURL, glob, pattern, null); |
| 68 | + return new UrlMatcher(glob, pattern, null); |
70 | 69 | } |
71 | 70 |
|
72 | 71 | UrlMatcher(Pattern pattern) { |
73 | | - this(null, null, pattern, null); |
| 72 | + this(null, pattern, null); |
74 | 73 | } |
75 | 74 |
|
76 | 75 | UrlMatcher(Predicate<String> predicate) { |
77 | | - this(null, null, null, predicate); |
| 76 | + this(null, null, predicate); |
78 | 77 | } |
79 | 78 |
|
80 | | - private UrlMatcher(URL baseURL, String glob, Pattern pattern, Predicate<String> predicate) { |
81 | | - this.baseURL = baseURL != null ? baseURL.toString() : null; |
| 79 | + private UrlMatcher(String glob, Pattern pattern, Predicate<String> predicate) { |
82 | 80 | this.glob = glob; |
83 | 81 | this.pattern = pattern; |
84 | 82 | this.predicate = predicate; |
85 | 83 | } |
86 | 84 |
|
87 | 85 | boolean test(String value) { |
88 | | - return testImpl(baseURL, pattern, predicate, glob, value); |
| 86 | + return testImpl(pattern, predicate, glob, value); |
89 | 87 | } |
90 | 88 |
|
91 | | - private static boolean testImpl(String baseURL, Pattern pattern, Predicate<String> predicate, String glob, String value) { |
| 89 | + private static boolean testImpl(Pattern pattern, Predicate<String> predicate, String glob, String value) { |
92 | 90 | if (pattern != null) { |
93 | 91 | return pattern.matcher(value).find(); |
94 | 92 | } |
|
0 commit comments