Skip to content

Commit f1698ec

Browse files
Fix removed code by merge
1 parent 2fdf762 commit f1698ec

File tree

1 file changed

+14
-38
lines changed

1 file changed

+14
-38
lines changed

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

Lines changed: 14 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -202,22 +202,24 @@ private StandardInterceptUrlRegistry(ApplicationContext context) {
202202
setApplicationContext(context);
203203
}
204204

205-
/**
206-
* @deprecated use {@link #requestMatchers(HttpMethod, String...)} instead
207-
*/
208205
@Override
209-
@Deprecated
210-
public MvcMatchersAuthorizedUrl mvcMatchers(HttpMethod method, String... mvcPatterns) {
211-
return new MvcMatchersAuthorizedUrl(createMvcMatchers(method, mvcPatterns));
206+
public AuthorizedUrl requestMatchers(String... patterns) {
207+
return super.requestMatchers(patterns);
208+
}
209+
210+
@Override
211+
public AuthorizedUrl requestMatchers(HttpMethod method, String... patterns) {
212+
return super.requestMatchers(method, patterns);
212213
}
213214

214-
/**
215-
* @deprecated use {@link #requestMatchers(String...)} instead
216-
*/
217215
@Override
218-
@Deprecated
219-
public MvcMatchersAuthorizedUrl mvcMatchers(String... patterns) {
220-
return mvcMatchers(null, patterns);
216+
public AuthorizedUrl requestMatchers(HttpMethod method) {
217+
return super.requestMatchers(method);
218+
}
219+
220+
@Override
221+
public AuthorizedUrl requestMatchers(RequestMatcher... requestMatchers) {
222+
return super.requestMatchers(requestMatchers);
221223
}
222224

223225
@Override
@@ -242,32 +244,6 @@ public H and() {
242244

243245
}
244246

245-
/**
246-
* An {@link AuthorizedUrl} that allows optionally configuring the
247-
* {@link MvcRequestMatcher#setMethod(HttpMethod)}
248-
*
249-
* @author Rob Winch
250-
*/
251-
public final class MvcMatchersAuthorizedUrl extends AuthorizedUrl {
252-
253-
/**
254-
* Creates a new instance
255-
* @param requestMatchers the {@link RequestMatcher} instances to map
256-
*/
257-
private MvcMatchersAuthorizedUrl(List<MvcRequestMatcher> requestMatchers) {
258-
super(requestMatchers);
259-
}
260-
261-
@SuppressWarnings("unchecked")
262-
public AuthorizedUrl servletPath(String servletPath) {
263-
for (MvcRequestMatcher matcher : (List<MvcRequestMatcher>) getMatchers()) {
264-
matcher.setServletPath(servletPath);
265-
}
266-
return this;
267-
}
268-
269-
}
270-
271247
/**
272248
* Maps the specified {@link RequestMatcher} instances to {@link ConfigAttribute}
273249
* instances.

0 commit comments

Comments
 (0)