Java 8: Statement lambda can be replaced with expression lambda

Author: larsgrefer

config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java

@@ -1184,9 +1184,7 @@ private Map<String, String> getLinks() {
 				return Collections.emptyMap();
 			}
 			Map<String, String> 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;
 		}
 

oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/userinfo/DefaultReactiveOAuth2UserService.java

@@ -117,16 +117,14 @@ public Mono<OAuth2User> loadUser(OAuth2UserRequest userRequest)
 			}
 			Mono<Map<String, Object>> 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 -> {

oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunction.java

@@ -255,12 +255,10 @@ public Consumer<WebClient.Builder> oauth2Configuration() {
 	 * @return the {@link Consumer} to populate the attributes
 	 */
 	public Consumer<WebClient.RequestHeadersSpec<?>> defaultRequest() {
-		return spec -> {
-			spec.attributes(attrs -> {
-				populateDefaultRequestResponse(attrs);
-				populateDefaultAuthentication(attrs);
-			});
-		};
+		return spec -> spec.attributes(attrs -> {
+			populateDefaultRequestResponse(attrs);
+			populateDefaultAuthentication(attrs);
+		});
 	}
 
 	/**

oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/OAuth2AuthorizationRequestRedirectWebFilter.java

@@ -114,10 +114,8 @@ public void setRequestCache(ServerRequestCache requestCache) {
 	public Mono<Void> 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));
 	}
 

oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/UnAuthenticatedServerOAuth2AuthorizedClientRepository.java

@@ -69,9 +69,7 @@ public Mono<Void> removeAuthorizedClient(String clientRegistrationId, Authentica
 		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) {

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()));
 			}
 		};
 	}

web/src/main/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandler.java

@@ -62,9 +62,7 @@ public CookieClearingLogoutHandler(Cookie... cookiesToClear) {
 		List<Function<HttpServletRequest, Cookie>> cookieList = new ArrayList<>();
 		for (Cookie cookie : cookiesToClear) {
 			Assert.isTrue(cookie.getMaxAge() == 0, "Cookie maxAge must be 0");
-			Function<HttpServletRequest, Cookie> f = (request) -> {
-				return cookie;
-			};
+			Function<HttpServletRequest, Cookie> f = (request) -> cookie;
 			cookieList.add(f);
 		}
 		this.cookiesToClear = cookieList;