Skip to content

Commit 3d5bc54

Browse files
jzheauxjzheaux
committed
Polish Opt-in
1 parent eb22c9b commit 3d5bc54

File tree

14 files changed

+62
-65
lines changed

14 files changed

+62
-65
lines changed

‎config/src/main/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
4747
import org.springframework.security.web.util.matcher.AnyRequestMatcher;
4848
import org.springframework.security.web.util.matcher.DispatcherTypeRequestMatcher;
49-
import org.springframework.security.web.util.matcher.MethodPatternRequestMatcherFactory;
49+
import org.springframework.security.web.util.matcher.MethodPathRequestMatcherFactory;
5050
import org.springframework.security.web.util.matcher.OrRequestMatcher;
5151
import org.springframework.security.web.util.matcher.RegexRequestMatcher;
5252
import org.springframework.security.web.util.matcher.RequestMatcher;
@@ -219,7 +219,7 @@ public C requestMatchers(HttpMethod method, String... patterns) {
219219
return requestMatchers(RequestMatchers.antMatchersAsArray(method, patterns));
220220
}
221221
List<RequestMatcher> matchers = new ArrayList<>();
222-
MethodPatternRequestMatcherFactory requestMatcherFactory = getRequestMatcherFactory();
222+
MethodPathRequestMatcherFactory requestMatcherFactory = getRequestMatcherFactory();
223223
for (String pattern : patterns) {
224224
matchers.add(requestMatcherFactory.matcher(method, pattern));
225225
}
@@ -331,9 +331,9 @@ public C requestMatchers(HttpMethod method) {
331331
*/
332332
protected abstract C chainRequestMatchers(List<RequestMatcher> requestMatchers);
333333

334-
private MethodPatternRequestMatcherFactory getRequestMatcherFactory() {
335-
return this.context.getBeanProvider(MethodPatternRequestMatcherFactory.class)
336-
.getIfUnique(DefaultMethodPatternRequestMatcherFactory::new);
334+
private MethodPathRequestMatcherFactory getRequestMatcherFactory() {
335+
return this.context.getBeanProvider(MethodPathRequestMatcherFactory.class)
336+
.getIfUnique(DefaultMethodPathRequestMatcherFactory::new);
337337
}
338338

339339
/**
@@ -409,12 +409,12 @@ static List<RequestMatcher> regexMatchers(String... regexPatterns) {
409409

410410
}
411411

412-
class DefaultMethodPatternRequestMatcherFactory implements MethodPatternRequestMatcherFactory {
412+
class DefaultMethodPathRequestMatcherFactory implements MethodPathRequestMatcherFactory {
413413

414414
@Override
415-
public RequestMatcher matcher(HttpMethod method, String pattern) {
416-
AntPathRequestMatcher ant = new AntPathRequestMatcher(pattern, (method != null) ? method.name() : null);
417-
MvcRequestMatcher mvc = createMvcMatchers(method, pattern).get(0);
415+
public RequestMatcher matcher(HttpMethod method, String path) {
416+
AntPathRequestMatcher ant = new AntPathRequestMatcher(path, (method != null) ? method.name() : null);
417+
MvcRequestMatcher mvc = createMvcMatchers(method, path).get(0);
418418
return new DeferredRequestMatcher((c) -> resolve(ant, mvc, c), mvc, ant);
419419
}
420420

‎config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
import org.springframework.security.web.session.HttpSessionEventPublisher;
9494
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
9595
import org.springframework.security.web.util.matcher.AnyRequestMatcher;
96-
import org.springframework.security.web.util.matcher.MethodPatternRequestMatcherFactory;
96+
import org.springframework.security.web.util.matcher.MethodPathRequestMatcherFactory;
9797
import org.springframework.security.web.util.matcher.OrRequestMatcher;
9898
import org.springframework.security.web.util.matcher.RequestMatcher;
9999
import org.springframework.util.Assert;
@@ -3686,8 +3686,8 @@ public HttpSecurity securityMatcher(RequestMatcher requestMatcher) {
36863686
*/
36873687
public HttpSecurity securityMatcher(String... patterns) {
36883688
List<RequestMatcher> matchers = new ArrayList<>();
3689-
MethodPatternRequestMatcherFactory factory = getSharedObject(ApplicationContext.class)
3690-
.getBeanProvider(MethodPatternRequestMatcherFactory.class)
3689+
MethodPathRequestMatcherFactory factory = getSharedObject(ApplicationContext.class)
3690+
.getBeanProvider(MethodPathRequestMatcherFactory.class)
36913691
.getIfUnique(() -> (method, pattern) -> mvcPresent ? createMvcMatcher(pattern) : createAntMatcher(pattern));
36923692
for (String pattern : patterns) {
36933693
matchers.add(factory.matcher(pattern));

‎config/src/main/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.springframework.security.web.authentication.session.SessionAuthenticationStrategy;
3030
import org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter;
3131
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
32-
import org.springframework.security.web.util.matcher.MethodPatternRequestMatcherFactory;
32+
import org.springframework.security.web.util.matcher.MethodPathRequestMatcherFactory;
3333
import org.springframework.security.web.util.matcher.RequestMatcher;
3434

3535
/**
@@ -274,9 +274,9 @@ private void initDefaultLoginFilter(H http) {
274274
}
275275
}
276276

277-
private MethodPatternRequestMatcherFactory getRequestMatcherFactory() {
277+
private MethodPathRequestMatcherFactory getRequestMatcherFactory() {
278278
return getBuilder().getSharedObject(ApplicationContext.class)
279-
.getBeanProvider(MethodPatternRequestMatcherFactory.class)
279+
.getBeanProvider(MethodPathRequestMatcherFactory.class)
280280
.getIfUnique(() -> AntPathRequestMatcher::antMatcher);
281281
}
282282

‎config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import org.springframework.security.web.context.HttpSessionSecurityContextRepository;
4141
import org.springframework.security.web.context.SecurityContextRepository;
4242
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
43-
import org.springframework.security.web.util.matcher.MethodPatternRequestMatcherFactory;
43+
import org.springframework.security.web.util.matcher.MethodPathRequestMatcherFactory;
4444
import org.springframework.security.web.util.matcher.OrRequestMatcher;
4545
import org.springframework.security.web.util.matcher.RequestMatcher;
4646
import org.springframework.util.Assert;
@@ -374,9 +374,9 @@ private RequestMatcher createLogoutRequestMatcher(String httpMethod) {
374374
return getRequestMatcherFactory().matcher(HttpMethod.valueOf(httpMethod), this.logoutUrl);
375375
}
376376

377-
private MethodPatternRequestMatcherFactory getRequestMatcherFactory() {
377+
private MethodPathRequestMatcherFactory getRequestMatcherFactory() {
378378
return getBuilder().getSharedObject(ApplicationContext.class)
379-
.getBeanProvider(MethodPatternRequestMatcherFactory.class)
379+
.getBeanProvider(MethodPathRequestMatcherFactory.class)
380380
.getIfUnique(() -> AntPathRequestMatcher::antMatcher);
381381
}
382382

‎config/src/main/java/org/springframework/security/config/annotation/web/configurers/PasswordManagementConfigurer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.springframework.security.web.RequestMatcherRedirectFilter;
2222
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
2323
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
24-
import org.springframework.security.web.util.matcher.MethodPatternRequestMatcherFactory;
24+
import org.springframework.security.web.util.matcher.MethodPathRequestMatcherFactory;
2525
import org.springframework.util.Assert;
2626

2727
/**
@@ -61,9 +61,9 @@ public void configure(B http) throws Exception {
6161
http.addFilterBefore(postProcess(changePasswordFilter), UsernamePasswordAuthenticationFilter.class);
6262
}
6363

64-
private MethodPatternRequestMatcherFactory getRequestMatcherFactory() {
64+
private MethodPathRequestMatcherFactory getRequestMatcherFactory() {
6565
return getBuilder().getSharedObject(ApplicationContext.class)
66-
.getBeanProvider(MethodPatternRequestMatcherFactory.class)
66+
.getBeanProvider(MethodPathRequestMatcherFactory.class)
6767
.getIfUnique(() -> AntPathRequestMatcher::antMatcher);
6868
}
6969

‎config/src/main/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.springframework.security.web.util.matcher.AndRequestMatcher;
3333
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
3434
import org.springframework.security.web.util.matcher.MediaTypeRequestMatcher;
35-
import org.springframework.security.web.util.matcher.MethodPatternRequestMatcherFactory;
35+
import org.springframework.security.web.util.matcher.MethodPathRequestMatcherFactory;
3636
import org.springframework.security.web.util.matcher.NegatedRequestMatcher;
3737
import org.springframework.security.web.util.matcher.RequestHeaderRequestMatcher;
3838
import org.springframework.security.web.util.matcher.RequestMatcher;
@@ -169,9 +169,9 @@ private RequestMatcher notMatchingMediaType(H http, MediaType mediaType) {
169169
return new NegatedRequestMatcher(mediaRequest);
170170
}
171171

172-
private MethodPatternRequestMatcherFactory getRequestMatcherFactory() {
172+
private MethodPathRequestMatcherFactory getRequestMatcherFactory() {
173173
return getBuilder().getSharedObject(ApplicationContext.class)
174-
.getBeanProvider(MethodPatternRequestMatcherFactory.class)
174+
.getBeanProvider(MethodPathRequestMatcherFactory.class)
175175
.getIfUnique(() -> AntPathRequestMatcher::antMatcher);
176176
}
177177

‎config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
import org.springframework.security.web.util.matcher.AndRequestMatcher;
9494
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
9595
import org.springframework.security.web.util.matcher.AnyRequestMatcher;
96-
import org.springframework.security.web.util.matcher.MethodPatternRequestMatcherFactory;
96+
import org.springframework.security.web.util.matcher.MethodPathRequestMatcherFactory;
9797
import org.springframework.security.web.util.matcher.NegatedRequestMatcher;
9898
import org.springframework.security.web.util.matcher.OrRequestMatcher;
9999
import org.springframework.security.web.util.matcher.RequestHeaderRequestMatcher;
@@ -626,9 +626,9 @@ private void registerDelegateApplicationListener(ApplicationListener<?> delegate
626626
delegating.addListener(smartListener);
627627
}
628628

629-
private MethodPatternRequestMatcherFactory getRequestMatcherFactory() {
629+
private MethodPathRequestMatcherFactory getRequestMatcherFactory() {
630630
return getBuilder().getSharedObject(ApplicationContext.class)
631-
.getBeanProvider(MethodPatternRequestMatcherFactory.class)
631+
.getBeanProvider(MethodPathRequestMatcherFactory.class)
632632
.getIfUnique(() -> AntPathRequestMatcher::antMatcher);
633633
}
634634

‎config/src/main/java/org/springframework/security/config/annotation/web/configurers/ott/OneTimeTokenLoginConfigurer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
import org.springframework.security.web.authentication.ui.DefaultResourcesFilter;
5454
import org.springframework.security.web.csrf.CsrfToken;
5555
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
56-
import org.springframework.security.web.util.matcher.MethodPatternRequestMatcherFactory;
56+
import org.springframework.security.web.util.matcher.MethodPathRequestMatcherFactory;
5757
import org.springframework.security.web.util.matcher.RequestMatcher;
5858
import org.springframework.util.Assert;
5959
import org.springframework.util.StringUtils;
@@ -210,9 +210,9 @@ protected RequestMatcher createLoginProcessingUrlMatcher(String loginProcessingU
210210
return getRequestMatcherFactory().matcher(HttpMethod.POST, loginProcessingUrl);
211211
}
212212

213-
private MethodPatternRequestMatcherFactory getRequestMatcherFactory() {
213+
private MethodPathRequestMatcherFactory getRequestMatcherFactory() {
214214
return getBuilder().getSharedObject(ApplicationContext.class)
215-
.getBeanProvider(MethodPatternRequestMatcherFactory.class)
215+
.getBeanProvider(MethodPathRequestMatcherFactory.class)
216216
.getIfUnique(() -> AntPathRequestMatcher::antMatcher);
217217
}
218218

‎config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
import org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter;
5858
import org.springframework.security.web.util.matcher.AndRequestMatcher;
5959
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
60-
import org.springframework.security.web.util.matcher.MethodPatternRequestMatcherFactory;
60+
import org.springframework.security.web.util.matcher.MethodPathRequestMatcherFactory;
6161
import org.springframework.security.web.util.matcher.NegatedRequestMatcher;
6262
import org.springframework.security.web.util.matcher.OrRequestMatcher;
6363
import org.springframework.security.web.util.matcher.ParameterRequestMatcher;
@@ -505,9 +505,9 @@ private Saml2AuthenticationRequestRepository<AbstractSaml2AuthenticationRequest>
505505
return repository;
506506
}
507507

508-
private MethodPatternRequestMatcherFactory getRequestMatcherFactory() {
508+
private MethodPathRequestMatcherFactory getRequestMatcherFactory() {
509509
return getBuilder().getSharedObject(ApplicationContext.class)
510-
.getBeanProvider(MethodPatternRequestMatcherFactory.class)
510+
.getBeanProvider(MethodPathRequestMatcherFactory.class)
511511
.getIfUnique(() -> AntPathRequestMatcher::antMatcher);
512512
}
513513

‎config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LogoutConfigurer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
import org.springframework.security.web.csrf.CsrfTokenRepository;
6767
import org.springframework.security.web.util.matcher.AndRequestMatcher;
6868
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
69-
import org.springframework.security.web.util.matcher.MethodPatternRequestMatcherFactory;
69+
import org.springframework.security.web.util.matcher.MethodPathRequestMatcherFactory;
7070
import org.springframework.security.web.util.matcher.ParameterRequestMatcher;
7171
import org.springframework.security.web.util.matcher.RequestMatcher;
7272

@@ -335,9 +335,9 @@ private Saml2LogoutResponseResolver createSaml2LogoutResponseResolver(
335335
return this.logoutResponseConfigurer.logoutResponseResolver(registrations);
336336
}
337337

338-
private MethodPatternRequestMatcherFactory getRequestMatcherFactory() {
338+
private MethodPathRequestMatcherFactory getRequestMatcherFactory() {
339339
return getBuilder().getSharedObject(ApplicationContext.class)
340-
.getBeanProvider(MethodPatternRequestMatcherFactory.class)
340+
.getBeanProvider(MethodPathRequestMatcherFactory.class)
341341
.getIfUnique(() -> AntPathRequestMatcher::antMatcher);
342342
}
343343

‎config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2MetadataConfigurer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.springframework.security.saml2.provider.service.web.metadata.RequestMatcherMetadataResponseResolver;
3434
import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
3535
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
36-
import org.springframework.security.web.util.matcher.MethodPatternRequestMatcherFactory;
36+
import org.springframework.security.web.util.matcher.MethodPathRequestMatcherFactory;
3737
import org.springframework.util.Assert;
3838

3939
/**
@@ -171,9 +171,9 @@ private RelyingPartyRegistrationRepository getRelyingPartyRegistrationRepository
171171
}
172172
}
173173

174-
private MethodPatternRequestMatcherFactory getRequestMatcherFactory() {
174+
private MethodPathRequestMatcherFactory getRequestMatcherFactory() {
175175
return getBuilder().getSharedObject(ApplicationContext.class)
176-
.getBeanProvider(MethodPatternRequestMatcherFactory.class)
176+
.getBeanProvider(MethodPathRequestMatcherFactory.class)
177177
.getIfUnique(() -> AntPathRequestMatcher::antMatcher);
178178
}
179179

‎config/src/test/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistryTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import org.springframework.security.web.servlet.util.matcher.MvcRequestMatcher;
4343
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
4444
import org.springframework.security.web.util.matcher.DispatcherTypeRequestMatcher;
45-
import org.springframework.security.web.util.matcher.MethodPatternRequestMatcherFactory;
45+
import org.springframework.security.web.util.matcher.MethodPathRequestMatcherFactory;
4646
import org.springframework.security.web.util.matcher.RegexRequestMatcher;
4747
import org.springframework.security.web.util.matcher.RequestMatcher;
4848
import org.springframework.test.web.servlet.MockMvc;
@@ -89,15 +89,15 @@ public void setUp() {
8989
ObjectProvider<ObjectPostProcessor<Object>> given = this.context.getBeanProvider(type);
9090
given(given).willReturn(postProcessors);
9191
given(postProcessors.getObject()).willReturn(NO_OP_OBJECT_POST_PROCESSOR);
92-
MethodPatternRequestMatcherFactory factory = this.matcherRegistry.new DefaultMethodPatternRequestMatcherFactory();
93-
ObjectProvider<MethodPatternRequestMatcherFactory> requestMatcherFactory = new ObjectProvider<>() {
92+
MethodPathRequestMatcherFactory factory = this.matcherRegistry.new DefaultMethodPathRequestMatcherFactory();
93+
ObjectProvider<MethodPathRequestMatcherFactory> requestMatcherFactory = new ObjectProvider<>() {
9494
@Override
9595
@NonNull
96-
public MethodPatternRequestMatcherFactory getObject() throws BeansException {
96+
public MethodPathRequestMatcherFactory getObject() throws BeansException {
9797
return factory;
9898
}
9999
};
100-
given(this.context.getBeanProvider(MethodPatternRequestMatcherFactory.class)).willReturn(requestMatcherFactory);
100+
given(this.context.getBeanProvider(MethodPathRequestMatcherFactory.class)).willReturn(requestMatcherFactory);
101101
given(this.context.getServletContext()).willReturn(MockServletContext.mvc());
102102
this.matcherRegistry.setApplicationContext(this.context);
103103
mockMvcIntrospector(true);

‎web/src/main/java/org/springframework/security/web/servlet/util/matcher/PathPatternRequestMatcher.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.springframework.lang.Nullable;
3333
import org.springframework.security.web.access.intercept.RequestAuthorizationContext;
3434
import org.springframework.security.web.util.matcher.AnyRequestMatcher;
35-
import org.springframework.security.web.util.matcher.MethodPatternRequestMatcherFactory;
35+
import org.springframework.security.web.util.matcher.MethodPathRequestMatcherFactory;
3636
import org.springframework.security.web.util.matcher.RequestMatcher;
3737
import org.springframework.util.Assert;
3838
import org.springframework.web.util.ServletRequestPathUtils;
@@ -209,7 +209,7 @@ public String toString() {
209209
* ...
210210
* </code>
211211
*/
212-
public static final class Builder implements MethodPatternRequestMatcherFactory {
212+
public static final class Builder implements MethodPathRequestMatcherFactory {
213213

214214
private final PathPatternParser parser;
215215

@@ -226,8 +226,8 @@ private Builder(PathPatternParser parser) {
226226
/**
227227
* Match requests starting with this {@code servletPath}.
228228
* @param servletPath the servlet path prefix
229-
* @see PathPatternRequestMatcher#servletPath
230229
* @return the {@link Builder} for more configuration
230+
* @see PathPatternRequestMatcher#servletPath
231231
*/
232232
public Builder servletPath(String servletPath) {
233233
this.servletPath = new ServletPathRequestMatcher(servletPath);
@@ -262,13 +262,13 @@ public Builder servletPath(String servletPath) {
262262
* <p>
263263
* A more comprehensive list can be found at {@link PathPattern}.
264264
* @param method the {@link HttpMethod} to match, may be null
265-
* @param pattern the path pattern to match
265+
* @param path the path pattern to match
266266
* @return the {@link Builder} for more configuration
267267
*/
268-
public PathPatternRequestMatcher matcher(@Nullable HttpMethod method, String pattern) {
269-
Assert.notNull(pattern, "pattern cannot be null");
270-
Assert.isTrue(pattern.startsWith("/"), "pattern must start with a /");
271-
PathPattern pathPattern = this.parser.parse(pattern);
268+
public PathPatternRequestMatcher matcher(@Nullable HttpMethod method, String path) {
269+
Assert.notNull(path, "pattern cannot be null");
270+
Assert.isTrue(path.startsWith("/"), "pattern must start with a /");
271+
PathPattern pathPattern = this.parser.parse(path);
272272
PathPatternRequestMatcher requestMatcher = new PathPatternRequestMatcher(pathPattern);
273273
if (method != null) {
274274
requestMatcher.setMethod(new HttpMethodRequestMatcher(method));

‎web/src/main/java/org/springframework/security/web/util/matcher/MethodPatternRequestMatcherFactory.java renamed to ‎web/src/main/java/org/springframework/security/web/util/matcher/MethodPathRequestMatcherFactory.java

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,28 +25,25 @@
2525
* @author Josh Cummings
2626
* @since 6.5
2727
*/
28-
public interface MethodPatternRequestMatcherFactory {
28+
public interface MethodPathRequestMatcherFactory {
2929

3030
/**
31-
* Request a method-pattern request matcher given the following {{@code method} and
32-
* {@code pattern}.
33-
* This method in this case is treated as a wildcard.
34-
*
35-
* @param pattern the path pattern to use
31+
* Request a method-pattern request matcher given the following {@code method} and
32+
* {@code pattern}. This method in this case is treated as a wildcard.
33+
* @param path the path pattern to use
3634
* @return the {@link RequestMatcher}
3735
*/
38-
default RequestMatcher matcher(String pattern) {
39-
return matcher(null, pattern);
36+
default RequestMatcher matcher(String path) {
37+
return matcher(null, path);
4038
}
4139

4240
/**
43-
* Request a method-pattern request matcher given the following
44-
* {@code method} and {@code pattern}.
45-
*
41+
* Request a method-pattern request matcher given the following {@code method} and
42+
* {@code pattern}.
4643
* @param method the method to use, may be null
47-
* @param pattern the path pattern to use
44+
* @param path the path pattern to use
4845
* @return the {@link RequestMatcher}
4946
*/
50-
RequestMatcher matcher(@Nullable HttpMethod method, String pattern);
47+
RequestMatcher matcher(@Nullable HttpMethod method, String path);
5148

5249
}

0 commit comments

Comments
 (0)