From 38de737663f29069aff072b0731e122b8d2c7b72 Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Fri, 9 Aug 2019 00:53:15 +0200 Subject: [PATCH] Java 8: Statement lambda can be replaced with expression lambda --- .../config/web/server/ServerHttpSecurity.java | 4 +--- .../DefaultReactiveOAuth2UserService.java | 18 ++++++++---------- ...AuthorizedClientExchangeFilterFunction.java | 10 ++++------ ...2AuthorizationRequestRedirectWebFilter.java | 6 ++---- ...ServerOAuth2AuthorizedClientRepository.java | 4 +--- .../server/SecurityMockServerConfigurers.java | 4 +--- .../logout/CookieClearingLogoutHandler.java | 4 +--- 7 files changed, 18 insertions(+), 32 deletions(-) diff --git a/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java b/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java index d708855cac..25c3f2d582 100644 --- a/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java +++ b/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java @@ -1184,9 +1184,7 @@ public class ServerHttpSecurity { return Collections.emptyMap(); } Map result = new HashMap<>(); - registrations.iterator().forEachRemaining(r -> { - result.put("/oauth2/authorization/" + r.getRegistrationId(), r.getClientName()); - }); + registrations.iterator().forEachRemaining(r -> result.put("/oauth2/authorization/" + r.getRegistrationId(), r.getClientName())); return result; } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/DefaultReactiveOAuth2UserService.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/DefaultReactiveOAuth2UserService.java index 4c67202b3d..b808cb8068 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/DefaultReactiveOAuth2UserService.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/DefaultReactiveOAuth2UserService.java @@ -117,16 +117,14 @@ public class DefaultReactiveOAuth2UserService implements ReactiveOAuth2UserServi } Mono> userAttributes = requestHeadersSpec .retrieve() - .onStatus(s -> s != HttpStatus.OK, response -> { - return parse(response).map(userInfoErrorResponse -> { - String description = userInfoErrorResponse.getErrorObject().getDescription(); - OAuth2Error oauth2Error = new OAuth2Error( - INVALID_USER_INFO_RESPONSE_ERROR_CODE, description, - null); - throw new OAuth2AuthenticationException(oauth2Error, - oauth2Error.toString()); - }); - }) + .onStatus(s -> s != HttpStatus.OK, response -> parse(response).map(userInfoErrorResponse -> { + String description = userInfoErrorResponse.getErrorObject().getDescription(); + OAuth2Error oauth2Error = new OAuth2Error( + INVALID_USER_INFO_RESPONSE_ERROR_CODE, description, + null); + throw new OAuth2AuthenticationException(oauth2Error, + oauth2Error.toString()); + })) .bodyToMono(typeReference); return userAttributes.map(attrs -> { diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunction.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunction.java index 1cd234c043..bd3f441359 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunction.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunction.java @@ -255,12 +255,10 @@ public final class ServletOAuth2AuthorizedClientExchangeFilterFunction * @return the {@link Consumer} to populate the attributes */ public Consumer> defaultRequest() { - return spec -> { - spec.attributes(attrs -> { - populateDefaultRequestResponse(attrs); - populateDefaultAuthentication(attrs); - }); - }; + return spec -> spec.attributes(attrs -> { + populateDefaultRequestResponse(attrs); + populateDefaultAuthentication(attrs); + }); } /** diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationRequestRedirectWebFilter.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationRequestRedirectWebFilter.java index 61dc51a7cd..907ebdfffb 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationRequestRedirectWebFilter.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationRequestRedirectWebFilter.java @@ -114,10 +114,8 @@ public class OAuth2AuthorizationRequestRedirectWebFilter implements WebFilter { public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { return this.authorizationRequestResolver.resolve(exchange) .switchIfEmpty(chain.filter(exchange).then(Mono.empty())) - .onErrorResume(ClientAuthorizationRequiredException.class, e -> { - return this.requestCache.saveRequest(exchange) - .then(this.authorizationRequestResolver.resolve(exchange, e.getClientRegistrationId())); - }) + .onErrorResume(ClientAuthorizationRequiredException.class, e -> this.requestCache.saveRequest(exchange) + .then(this.authorizationRequestResolver.resolve(exchange, e.getClientRegistrationId()))) .flatMap(clientRegistration -> sendRedirectForAuthorization(exchange, clientRegistration)); } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/UnAuthenticatedServerOAuth2AuthorizedClientRepository.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/UnAuthenticatedServerOAuth2AuthorizedClientRepository.java index 155a7de3a6..593489d52e 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/UnAuthenticatedServerOAuth2AuthorizedClientRepository.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/UnAuthenticatedServerOAuth2AuthorizedClientRepository.java @@ -69,9 +69,7 @@ public class UnAuthenticatedServerOAuth2AuthorizedClientRepository implements Se Assert.notNull(clientRegistrationId, "clientRegistrationId cannot be null"); Assert.isNull(serverWebExchange, "serverWebExchange " + serverWebExchange + "must be null"); Assert.isTrue(isUnauthenticated(authentication), "The user " + authentication + " should not be authenticated"); - return Mono.fromRunnable(() -> { - this.clientRegistrationIdToAuthorizedClient.remove(clientRegistrationId); - }); + return Mono.fromRunnable(() -> this.clientRegistrationIdToAuthorizedClient.remove(clientRegistrationId)); } private boolean isUnauthenticated(Authentication authentication) { diff --git a/test/src/main/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurers.java b/test/src/main/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurers.java index 41763e5356..adbf8ac4db 100644 --- a/test/src/main/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurers.java +++ b/test/src/main/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurers.java @@ -67,9 +67,7 @@ public class SecurityMockServerConfigurers { public static MockServerConfigurer springSecurity() { return new MockServerConfigurer() { public void beforeServerCreated(WebHttpHandlerBuilder builder) { - builder.filters( filters -> { - filters.add(0, new MutatorFilter()); - }); + builder.filters( filters -> filters.add(0, new MutatorFilter())); } }; } diff --git a/web/src/main/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandler.java b/web/src/main/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandler.java index 2751d5b9f0..bbbd42afff 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandler.java +++ b/web/src/main/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandler.java @@ -62,9 +62,7 @@ public final class CookieClearingLogoutHandler implements LogoutHandler { List> cookieList = new ArrayList<>(); for (Cookie cookie : cookiesToClear) { Assert.isTrue(cookie.getMaxAge() == 0, "Cookie maxAge must be 0"); - Function f = (request) -> { - return cookie; - }; + Function f = (request) -> cookie; cookieList.add(f); } this.cookiesToClear = cookieList;