Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix removed code by merge

This commit is contained in:
Marcus Da Coregio 2022-12-05 14:57:28 -08:00
parent 2fdf762726
commit f1698ec188
1 changed files with 14 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,22 +202,24 @@ public final class UrlAuthorizationConfigurer<H extends HttpSecurityBuilder<H>>
setApplicationContext(context); setApplicationContext(context);
} }
/**
* @deprecated use {@link #requestMatchers(HttpMethod, String...)} instead
*/
@Override @Override
@Deprecated public AuthorizedUrl requestMatchers(String... patterns) {
public MvcMatchersAuthorizedUrl mvcMatchers(HttpMethod method, String... mvcPatterns) { return super.requestMatchers(patterns);
return new MvcMatchersAuthorizedUrl(createMvcMatchers(method, mvcPatterns));
} }
/**
* @deprecated use {@link #requestMatchers(String...)} instead
*/
@Override @Override
@Deprecated public AuthorizedUrl requestMatchers(HttpMethod method, String... patterns) {
public MvcMatchersAuthorizedUrl mvcMatchers(String... patterns) { return super.requestMatchers(method, patterns);
return mvcMatchers(null, patterns); }
@Override
public AuthorizedUrl requestMatchers(HttpMethod method) {
return super.requestMatchers(method);
}
@Override
public AuthorizedUrl requestMatchers(RequestMatcher... requestMatchers) {
return super.requestMatchers(requestMatchers);
} }
@Override @Override
@ -242,32 +244,6 @@ public final class UrlAuthorizationConfigurer<H extends HttpSecurityBuilder<H>>
} }
/**
* An {@link AuthorizedUrl} that allows optionally configuring the
* {@link MvcRequestMatcher#setMethod(HttpMethod)}
*
* @author Rob Winch
*/
public final class MvcMatchersAuthorizedUrl extends AuthorizedUrl {
/**
* Creates a new instance
* @param requestMatchers the {@link RequestMatcher} instances to map
*/
private MvcMatchersAuthorizedUrl(List<MvcRequestMatcher> requestMatchers) {
super(requestMatchers);
}
@SuppressWarnings("unchecked")
public AuthorizedUrl servletPath(String servletPath) {
for (MvcRequestMatcher matcher : (List<MvcRequestMatcher>) getMatchers()) {
matcher.setServletPath(servletPath);
}
return this;
}
}
/** /**
* Maps the specified {@link RequestMatcher} instances to {@link ConfigAttribute} * Maps the specified {@link RequestMatcher} instances to {@link ConfigAttribute}
* instances. * instances.