Use parenthesis with single-arg lambdas

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

View File

@@ -63,7 +63,7 @@ public class SecurityExpressionRootTests {
@Test
public void roleHierarchySupportIsCorrectlyUsedInEvaluatingRoles() {
this.root.setRoleHierarchy(authorities -> AuthorityUtils.createAuthorityList("ROLE_C"));
this.root.setRoleHierarchy((authorities) -> AuthorityUtils.createAuthorityList("ROLE_C"));
assertThat(this.root.hasRole("C")).isTrue();
assertThat(this.root.hasAuthority("ROLE_C")).isTrue();

View File

@@ -78,7 +78,7 @@ public class UserDetailsRepositoryReactiveAuthenticationManagerTests {
@Before
public void setup() {
this.manager = new UserDetailsRepositoryReactiveAuthenticationManager(this.userDetailsService);
given(this.scheduler.schedule(any())).willAnswer(a -> {
given(this.scheduler.schedule(any())).willAnswer((a) -> {
Runnable r = a.getArgument(0);
return Schedulers.immediate().schedule(r);
});

View File

@@ -236,7 +236,7 @@ public class JaasAuthenticationProviderTests {
@Test
public void testLoginExceptionResolver() {
assertThat(this.jaasProvider.getLoginExceptionResolver()).isNotNull();
this.jaasProvider.setLoginExceptionResolver(e -> new LockedException("This is just a test!"));
this.jaasProvider.setLoginExceptionResolver((e) -> new LockedException("This is just a test!"));
try {
this.jaasProvider.authenticate(new UsernamePasswordAuthenticationToken("user", "password"));

View File

@@ -62,7 +62,7 @@ public class DelegatingSecurityContextRunnableTests {
@Before
public void setUp() {
this.originalSecurityContext = SecurityContextHolder.createEmptyContext();
willAnswer((Answer<Object>) invocation -> {
willAnswer((Answer<Object>) (invocation) -> {
assertThat(SecurityContextHolder.getContext()).isEqualTo(this.securityContext);
return null;
}).given(this.delegate).run();

View File

@@ -42,7 +42,7 @@ public class ReactiveSecurityContextHolderTests {
new TestingAuthenticationToken("user", "password", "ROLE_USER"));
Mono<SecurityContext> context = Mono.subscriberContext()
.flatMap(c -> ReactiveSecurityContextHolder.getContext())
.flatMap((c) -> ReactiveSecurityContextHolder.getContext())
.subscriberContext(ReactiveSecurityContextHolder.withSecurityContext(Mono.just(expectedContext)));
StepVerifier.create(context).expectNext(expectedContext).verifyComplete();
@@ -70,7 +70,7 @@ public class ReactiveSecurityContextHolderTests {
new TestingAuthenticationToken("user", "password", "ROLE_USER"));
Mono<SecurityContext> context = Mono.subscriberContext()
.flatMap(c -> ReactiveSecurityContextHolder.getContext())
.flatMap((c) -> ReactiveSecurityContextHolder.getContext())
.subscriberContext(ReactiveSecurityContextHolder.clearContext())
.subscriberContext(ReactiveSecurityContextHolder.withSecurityContext(Mono.just(expectedContext)));
@@ -82,7 +82,7 @@ public class ReactiveSecurityContextHolderTests {
Authentication expectedAuthentication = new TestingAuthenticationToken("user", "password", "ROLE_USER");
Mono<Authentication> authentication = Mono.subscriberContext()
.flatMap(c -> ReactiveSecurityContextHolder.getContext()).map(SecurityContext::getAuthentication)
.flatMap((c) -> ReactiveSecurityContextHolder.getContext()).map(SecurityContext::getAuthentication)
.subscriberContext(ReactiveSecurityContextHolder.withAuthentication(expectedAuthentication));
StepVerifier.create(authentication).expectNext(expectedAuthentication).verifyComplete();

View File

@@ -49,7 +49,7 @@ public class PasswordEncodedUser {
}
private static Function<String, String> passwordEncoder() {
return rawPassword -> "{noop}" + rawPassword;
return (rawPassword) -> "{noop}" + rawPassword;
}
protected PasswordEncodedUser() {

View File

@@ -49,7 +49,7 @@ public class UserDetailsByNameServiceWrapperTests {
public final void testGetUserDetails() throws Exception {
UserDetailsByNameServiceWrapper svc = new UserDetailsByNameServiceWrapper();
final User user = new User("dummy", "dummy", true, true, true, true, AuthorityUtils.NO_AUTHORITIES);
svc.setUserDetailsService(name -> {
svc.setUserDetailsService((name) -> {
if (user != null && user.getUsername().equals(name)) {
return user;
}

View File

@@ -176,7 +176,8 @@ public class UserTests {
public void withUserWhenDetailsPasswordEncoderThenEncodes() {
UserDetails userDetails = User.withUsername("user").password("password").roles("USER").build();
UserDetails withEncodedPassword = User.withUserDetails(userDetails).passwordEncoder(p -> p + "encoded").build();
UserDetails withEncodedPassword = User.withUserDetails(userDetails).passwordEncoder((p) -> p + "encoded")
.build();
assertThat(withEncodedPassword.getPassword()).isEqualTo("passwordencoded");
}
@@ -184,7 +185,7 @@ public class UserTests {
@Test
public void withUsernameWhenPasswordEncoderAndPasswordThenEncodes() {
UserDetails withEncodedPassword = User.withUsername("user").password("password")
.passwordEncoder(p -> p + "encoded").roles("USER").build();
.passwordEncoder((p) -> p + "encoded").roles("USER").build();
assertThat(withEncodedPassword.getPassword()).isEqualTo("passwordencoded");
}
@@ -193,7 +194,7 @@ public class UserTests {
public void withUsernameWhenPasswordAndPasswordEncoderThenEncodes() {
// @formatter:off
UserDetails withEncodedPassword = User.withUsername("user")
.passwordEncoder(p -> p + "encoded")
.passwordEncoder((p) -> p + "encoded")
.password("password")
.roles("USER")
.build();
@@ -204,7 +205,7 @@ public class UserTests {
@Test
public void withUsernameWhenPasswordAndPasswordEncoderTwiceThenEncodesOnce() {
Function<String, String> encoder = p -> p + "encoded";
Function<String, String> encoder = (p) -> p + "encoded";
// @formatter:off
UserDetails withEncodedPassword = User.withUsername("user")
.passwordEncoder(encoder)