Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-08-05 01:36:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use parenthesis with single-arg lambdas

Browse Source 
Use regular expression search/replace to ensure all single-arg
lambdas have parenthesis. This aligns with the style used in Spring
Boot and ensure that single-arg and multi-arg lambdas are consistent.

Issue gh-8945
This commit is contained in:
Phillip Webb
2020-07-29 18:18:05 -07:00
committed by Rob Winch
parent 01d90c9881
commit 52f20b5281
426 changed files with 1668 additions and 1617 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/src/main/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurers.java
+11 -11
View File
@@ -110,7 +110,7 @@ public final class SecurityMockServerConfigurers {
return new MockServerConfigurer() {
@Override
public void beforeServerCreated(WebHttpHandlerBuilder builder) {
builder.filters(filters -> filters.add(0, new MutatorFilter()));
builder.filters((filters) -> filters.add(0, new MutatorFilter()));
}
};
}
@@ -253,8 +253,8 @@ public final class SecurityMockServerConfigurers {
public void afterConfigurerAdded(WebTestClient.Builder builder,
@Nullable WebHttpHandlerBuilder httpHandlerBuilder, @Nullable ClientHttpConnector connector) {
CsrfWebFilter filter = new CsrfWebFilter();
filter.setRequireCsrfProtectionMatcher(e -> ServerWebExchangeMatcher.MatchResult.notMatch());
httpHandlerBuilder.filters(filters -> filters.add(0, filter));
filter.setRequireCsrfProtectionMatcher((e) -> ServerWebExchangeMatcher.MatchResult.notMatch());
httpHandlerBuilder.filters((filters) -> filters.add(0, filter));
}
@Override
@@ -399,7 +399,7 @@ public final class SecurityMockServerConfigurers {
}
private Consumer<List<WebFilter>> addSetupMutatorFilter() {
return filters -> filters.add(0, new SetupMutatorFilter(this.context));
return (filters) -> filters.add(0, new SetupMutatorFilter(this.context));
}
}
@@ -414,7 +414,7 @@ public final class SecurityMockServerConfigurers {
@Override
public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain webFilterChain) {
exchange.getAttributes().computeIfAbsent(MutatorFilter.ATTRIBUTE_NAME, key -> this.context);
exchange.getAttributes().computeIfAbsent(MutatorFilter.ATTRIBUTE_NAME, (key) -> this.context);
return webFilterChain.filter(exchange);
}
@@ -494,7 +494,7 @@ public final class SecurityMockServerConfigurers {
*/
public JwtMutator authorities(Collection<GrantedAuthority> authorities) {
Assert.notNull(authorities, "authorities cannot be null");
this.authoritiesConverter = jwt -> authorities;
this.authoritiesConverter = (jwt) -> authorities;
return this;
}
@@ -505,7 +505,7 @@ public final class SecurityMockServerConfigurers {
*/
public JwtMutator authorities(GrantedAuthority... authorities) {
Assert.notNull(authorities, "authorities cannot be null");
this.authoritiesConverter = jwt -> Arrays.asList(authorities);
this.authoritiesConverter = (jwt) -> Arrays.asList(authorities);
return this;
}
@@ -672,7 +672,7 @@ public final class SecurityMockServerConfigurers {
}
private Collection<GrantedAuthority> getAuthorities(Collection<?> scopes) {
return scopes.stream().map(scope -> new SimpleGrantedAuthority("SCOPE_" + scope))
return scopes.stream().map((scope) -> new SimpleGrantedAuthority("SCOPE_" + scope))
.collect(Collectors.toList());
}
@@ -1046,7 +1046,7 @@ public final class SecurityMockServerConfigurers {
private OAuth2ClientMutator(String registrationId) {
this.registrationId = registrationId;
clientRegistration(c -> {
clientRegistration((c) -> {
});
}
@@ -1119,7 +1119,7 @@ public final class SecurityMockServerConfigurers {
private Consumer<List<WebFilter>> addAuthorizedClientFilter() {
OAuth2AuthorizedClient client = getClient();
return filters -> filters.add(0, (exchange, chain) -> {
return (filters) -> filters.add(0, (exchange, chain) -> {
ReactiveOAuth2AuthorizedClientManager authorizationClientManager = OAuth2ClientServerTestUtils
.getOAuth2AuthorizedClientManager(exchange);
if (!(authorizationClientManager instanceof TestReactiveOAuth2AuthorizedClientManager)) {
@@ -1209,7 +1209,7 @@ public final class SecurityMockServerConfigurers {
OAuth2AuthorizedClientArgumentResolver resolver = findResolver(exchange,
OAuth2AuthorizedClientArgumentResolver.class);
if (resolver == null) {
return authorizeRequest -> DEFAULT_CLIENT_REPO.loadAuthorizedClient(
return (authorizeRequest) -> DEFAULT_CLIENT_REPO.loadAuthorizedClient(
authorizeRequest.getClientRegistrationId(), authorizeRequest.getPrincipal(), exchange);
}
return (ReactiveOAuth2AuthorizedClientManager) ReflectionTestUtils.getField(resolver,
test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java
+5 -5
View File
@@ -1094,7 +1094,7 @@ public final class SecurityMockMvcRequestPostProcessors {
*/
public JwtRequestPostProcessor authorities(Collection<GrantedAuthority> authorities) {
Assert.notNull(authorities, "authorities cannot be null");
this.authoritiesConverter = jwt -> authorities;
this.authoritiesConverter = (jwt) -> authorities;
return this;
}
@@ -1105,7 +1105,7 @@ public final class SecurityMockMvcRequestPostProcessors {
*/
public JwtRequestPostProcessor authorities(GrantedAuthority... authorities) {
Assert.notNull(authorities, "authorities cannot be null");
this.authoritiesConverter = jwt -> Arrays.asList(authorities);
this.authoritiesConverter = (jwt) -> Arrays.asList(authorities);
return this;
}
@@ -1237,7 +1237,7 @@ public final class SecurityMockMvcRequestPostProcessors {
}
private Collection<GrantedAuthority> getAuthorities(Collection<?> scopes) {
return scopes.stream().map(scope -> new SimpleGrantedAuthority("SCOPE_" + scope))
return scopes.stream().map((scope) -> new SimpleGrantedAuthority("SCOPE_" + scope))
.collect(Collectors.toList());
}
@@ -1556,7 +1556,7 @@ public final class SecurityMockMvcRequestPostProcessors {
private OAuth2ClientRequestPostProcessor(String registrationId) {
this.registrationId = registrationId;
clientRegistration(c -> {
clientRegistration((c) -> {
});
}
@@ -1686,7 +1686,7 @@ public final class SecurityMockMvcRequestPostProcessors {
OAuth2AuthorizedClientArgumentResolver resolver = findResolver(request,
OAuth2AuthorizedClientArgumentResolver.class);
if (resolver == null) {
return authorizeRequest -> DEFAULT_CLIENT_REPO.loadAuthorizedClient(
return (authorizeRequest) -> DEFAULT_CLIENT_REPO.loadAuthorizedClient(
authorizeRequest.getClientRegistrationId(), authorizeRequest.getPrincipal(), request);
}
return (OAuth2AuthorizedClientManager) ReflectionTestUtils.getField(resolver,