Skip to content

Commit f10e8b5

Browse files
committed
remove baseurl
1 parent 5b2bbd0 commit f10e8b5

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

playwright/src/main/java/com/microsoft/playwright/impl/UrlMatcher.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,13 @@
2727
import static com.microsoft.playwright.impl.Utils.toJsRegexFlags;
2828

2929
class UrlMatcher {
30-
private final String baseURL;
3130
public final String glob;
3231
public final Pattern pattern;
3332
public final Predicate<String> predicate;
3433

3534
static UrlMatcher forOneOf(URL baseUrl, Object object, LocalUtils localUtils, boolean isWebSocketUrl) {
3635
if (object == null) {
37-
return new UrlMatcher(null, null, null, null);
36+
return new UrlMatcher(null, null, null);
3837
}
3938
if (object instanceof String) {
4039
return UrlMatcher.forGlob(baseUrl, (String) object, localUtils, isWebSocketUrl);
@@ -66,29 +65,28 @@ private static String resolveUrl(String baseUrl, String spec) {
6665

6766
static UrlMatcher forGlob(URL baseURL, String glob, LocalUtils localUtils, boolean isWebSocketUrl) {
6867
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);
7069
}
7170

7271
UrlMatcher(Pattern pattern) {
73-
this(null, null, pattern, null);
72+
this(null, pattern, null);
7473
}
7574

7675
UrlMatcher(Predicate<String> predicate) {
77-
this(null, null, null, predicate);
76+
this(null, null, predicate);
7877
}
7978

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) {
8280
this.glob = glob;
8381
this.pattern = pattern;
8482
this.predicate = predicate;
8583
}
8684

8785
boolean test(String value) {
88-
return testImpl(baseURL, pattern, predicate, glob, value);
86+
return testImpl(pattern, predicate, glob, value);
8987
}
9088

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) {
9290
if (pattern != null) {
9391
return pattern.matcher(value).find();
9492
}

0 commit comments

Comments
 (0)