Anonymous type can be replaced with lambda

core/src/test/java/org/springframework/security/access/expression/SecurityExpressionRootTests.java

@@ -19,15 +19,12 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.assertj.core.api.Assertions.*;
 
-import java.util.Collection;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.security.access.hierarchicalroles.RoleHierarchy;
 import org.springframework.security.authentication.AuthenticationTrustResolver;
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;
 
 /**
@@ -66,12 +63,7 @@ public class SecurityExpressionRootTests {
 
 	@Test
 	public void roleHierarchySupportIsCorrectlyUsedInEvaluatingRoles() throws Exception {
-		root.setRoleHierarchy(new RoleHierarchy() {
-			public Collection<GrantedAuthority> getReachableGrantedAuthorities(
-					Collection<? extends GrantedAuthority> authorities) {
-				return AuthorityUtils.createAuthorityList("ROLE_C");
-			}
-		});
+		root.setRoleHierarchy(authorities -> AuthorityUtils.createAuthorityList("ROLE_C"));
 
 		assertThat(root.hasRole("C")).isTrue();
 		assertThat(root.hasAuthority("ROLE_C")).isTrue();

core/src/test/java/org/springframework/security/access/hierarchicalroles/HierarchicalRolesTestHelper.java

@@ -75,11 +75,7 @@ public abstract class HierarchicalRolesTestHelper {
 
 		for (final String role : roles) {
 			// Use non SimpleGrantedAuthority (SEC-863)
-			authorities.add(new GrantedAuthority() {
-				public String getAuthority() {
-					return role;
-				}
-			});
+			authorities.add((GrantedAuthority) () -> role);
 		}
 
 		return authorities;

core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java

@@ -234,11 +234,7 @@ public class JaasAuthenticationProviderTests {
 	@Test
 	public void testLoginExceptionResolver() {
 		assertThat(jaasProvider.getLoginExceptionResolver()).isNotNull();
-		jaasProvider.setLoginExceptionResolver(new LoginExceptionResolver() {
-			public AuthenticationException resolveException(LoginException e) {
-				return new LockedException("This is just a test!");
-			}
-		});
+		jaasProvider.setLoginExceptionResolver(e -> new LockedException("This is just a test!"));
 
 		try {
 			jaasProvider.authenticate(new UsernamePasswordAuthenticationToken("user",

core/src/test/java/org/springframework/security/authentication/jaas/TestLoginModule.java

@@ -16,8 +16,6 @@
 
 package org.springframework.security.authentication.jaas;
 
-import java.security.Principal;
-
 import java.util.Map;
 
 import javax.security.auth.Subject;
@@ -77,17 +75,9 @@ public class TestLoginModule implements LoginModule {
 			throw new LoginException("Bad Password");
 		}
 
-		subject.getPrincipals().add(new Principal() {
-			public String getName() {
-				return "TEST_PRINCIPAL";
-			}
-		});
+		subject.getPrincipals().add(() -> "TEST_PRINCIPAL");
 
-		subject.getPrincipals().add(new Principal() {
-			public String getName() {
-				return "NULL_PRINCIPAL";
-			}
-		});
+		subject.getPrincipals().add(() -> "NULL_PRINCIPAL");
 
 		return true;
 	}

core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnableTests.java

@@ -28,7 +28,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.invocation.InvocationOnMock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
 import org.springframework.core.task.SyncTaskExecutor;
@@ -59,11 +58,9 @@ public class DelegatingSecurityContextRunnableTests {
 	@Before
 	public void setUp() throws Exception {
 		originalSecurityContext = SecurityContextHolder.createEmptyContext();
-		doAnswer(new Answer<Object>() {
-			public Object answer(InvocationOnMock invocation) throws Throwable {
-				assertThat(SecurityContextHolder.getContext()).isEqualTo(securityContext);
-				return null;
-			}
+		doAnswer((Answer<Object>) invocation -> {
+			assertThat(SecurityContextHolder.getContext()).isEqualTo(securityContext);
+			return null;
 		}).when(delegate).run();
 
 		executor = Executors.newFixedThreadPool(1);

core/src/test/java/org/springframework/security/core/userdetails/UserDetailsByNameServiceWrapperTests.java

@@ -48,14 +48,12 @@ public class UserDetailsByNameServiceWrapperTests  {
 		UserDetailsByNameServiceWrapper svc = new UserDetailsByNameServiceWrapper();
 		final User user = new User("dummy", "dummy", true, true, true, true,
 				AuthorityUtils.NO_AUTHORITIES);
-		svc.setUserDetailsService(new UserDetailsService() {
-			public UserDetails loadUserByUsername(String name) {
-				if (user != null && user.getUsername().equals(name)) {
-					return user;
-				}
-				else {
-					return null;
-				}
+		svc.setUserDetailsService(name -> {
+			if (user != null && user.getUsername().equals(name)) {
+				return user;
+			}
+			else {
+				return null;
 			}
 		});
 		svc.afterPropertiesSet();