Anonymous type can be replaced with lambda

Author: larsgrefer

acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java

@@ -17,7 +17,6 @@
 
 import java.io.Serializable;
 import java.lang.reflect.Field;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -33,7 +32,6 @@
 import org.springframework.core.convert.ConversionException;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.PreparedStatementSetter;
 import org.springframework.jdbc.core.ResultSetExtractor;
 import org.springframework.security.acls.domain.AccessControlEntryImpl;
 import org.springframework.security.acls.domain.AclAuthorizationStrategy;
@@ -248,14 +246,12 @@ private void lookupPrimaryKeys(final Map<Serializable, Acl> acls,
 		String sql = computeRepeatingSql(lookupPrimaryKeysWhereClause, findNow.size());
 
 		Set<Long> parentsToLookup = jdbcTemplate.query(sql,
-				new PreparedStatementSetter() {
-					public void setValues(PreparedStatement ps) throws SQLException {
-						int i = 0;
-
-						for (Long toFind : findNow) {
-							i++;
-							ps.setLong(i, toFind);
-						}
+				ps -> {
+					int i = 0;
+
+					for (Long toFind : findNow) {
+						i++;
+						ps.setLong(i, toFind);
 					}
 				}, new ProcessResultSet(acls, sids));
 
@@ -383,22 +379,20 @@ private Map<ObjectIdentity, Acl> lookupObjectIdentities(
 				objectIdentities.size());
 
 		Set<Long> parentsToLookup = jdbcTemplate.query(sql,
-				new PreparedStatementSetter() {
-					public void setValues(PreparedStatement ps) throws SQLException {
-						int i = 0;
-						for (ObjectIdentity oid : objectIdentities) {
-							// Determine prepared statement values for this iteration
-							String type = oid.getType();
-
-							// No need to check for nulls, as guaranteed non-null by
-							// ObjectIdentity.getIdentifier() interface contract
-							String identifier = oid.getIdentifier().toString();
-
-							// Inject values
-							ps.setString((2 * i) + 1, identifier);
-							ps.setString((2 * i) + 2, type);
-							i++;
-						}
+				ps -> {
+					int i = 0;
+					for (ObjectIdentity oid : objectIdentities) {
+						// Determine prepared statement values for this iteration
+						String type = oid.getType();
+
+						// No need to check for nulls, as guaranteed non-null by
+						// ObjectIdentity.getIdentifier() interface contract
+						String identifier = oid.getIdentifier().toString();
+
+						// Inject values
+						ps.setString((2 * i) + 1, identifier);
+						ps.setString((2 * i) + 2, type);
+						i++;
 					}
 				}, new ProcessResultSet(acls, sids));
 

acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java

@@ -16,8 +16,6 @@
 package org.springframework.security.acls.jdbc;
 
 import java.io.Serializable;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -29,7 +27,6 @@
 import org.springframework.core.convert.ConversionService;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
 import org.springframework.security.acls.domain.ObjectIdentityImpl;
 import org.springframework.security.acls.model.Acl;
 import org.springframework.security.acls.model.AclService;
@@ -95,14 +92,11 @@ public JdbcAclService(JdbcOperations jdbcOperations, LookupStrategy lookupStrate
 	public List<ObjectIdentity> findChildren(ObjectIdentity parentIdentity) {
 		Object[] args = { parentIdentity.getIdentifier().toString(), parentIdentity.getType() };
 		List<ObjectIdentity> objects = jdbcOperations.query(findChildrenSql, args,
-				new RowMapper<ObjectIdentity>() {
-					public ObjectIdentity mapRow(ResultSet rs, int rowNum)
-							throws SQLException {
-						String javaType = rs.getString("class");
-						Serializable identifier = (Serializable) rs.getObject("obj_id");
-						identifier = aclClassIdUtils.identifierFrom(identifier, rs);
-						return new ObjectIdentityImpl(javaType, identifier);
-					}
+				(rs, rowNum) -> {
+					String javaType = rs.getString("class");
+					Serializable identifier = (Serializable) rs.getObject("obj_id");
+					identifier = aclClassIdUtils.identifierFrom(identifier, rs);
+					return new ObjectIdentityImpl(javaType, identifier);
 				});
 
 		if (objects.size() == 0) {

aspects/src/main/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspect.aj

@@ -72,11 +72,7 @@ public aspect AnnotationSecurityAspect implements InitializingBean {
 						return proceed();
 				}
 
-				AspectJCallback callback = new AspectJCallback() {
-						public Object proceedWithObject() {
-								return proceed();
-						}
-				};
+				AspectJCallback callback = () -> proceed();
 
 				return this.securityInterceptor.invoke(thisJoinPoint, callback);
 		}

cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationFilterTests.java

@@ -67,11 +67,7 @@ public void testNormalOperation() throws Exception {
 		request.addParameter("ticket", "ST-0-ER94xMJmn6pha35CQRoZ");
 
 		CasAuthenticationFilter filter = new CasAuthenticationFilter();
-		filter.setAuthenticationManager(new AuthenticationManager() {
-			public Authentication authenticate(Authentication a) {
-				return a;
-			}
-		});
+		filter.setAuthenticationManager(a -> a);
 
 		assertThat(filter.requiresAuthentication(request, new MockHttpServletResponse())).isTrue();
 
@@ -83,10 +79,8 @@ public Authentication authenticate(Authentication a) {
 	@Test(expected = AuthenticationException.class)
 	public void testNullServiceTicketHandledGracefully() throws Exception {
 		CasAuthenticationFilter filter = new CasAuthenticationFilter();
-		filter.setAuthenticationManager(new AuthenticationManager() {
-			public Authentication authenticate(Authentication a) {
-				throw new BadCredentialsException("Rejected");
-			}
+		filter.setAuthenticationManager(a -> {
+			throw new BadCredentialsException("Rejected");
 		});
 
 		filter.attemptAuthentication(new MockHttpServletRequest(),

config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java

@@ -99,9 +99,7 @@ public final class WebSecurity extends
 
 	private SecurityExpressionHandler<FilterInvocation> expressionHandler = defaultWebSecurityExpressionHandler;
 
-	private Runnable postBuildAction = new Runnable() {
-		public void run() {
-		}
+	private Runnable postBuildAction = () -> {
 	};
 
 	/**

config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java

@@ -320,12 +320,10 @@ protected UserDetailsService userDetailsService() {
 
 	public void init(final WebSecurity web) throws Exception {
 		final HttpSecurity http = getHttp();
-		web.addSecurityFilterChainBuilder(http).postBuildAction(new Runnable() {
-			public void run() {
-				FilterSecurityInterceptor securityInterceptor = http
-						.getSharedObject(FilterSecurityInterceptor.class);
-				web.securityInterceptor(securityInterceptor);
-			}
+		web.addSecurityFilterChainBuilder(http).postBuildAction(() -> {
+			FilterSecurityInterceptor securityInterceptor = http
+					.getSharedObject(FilterSecurityInterceptor.class);
+			web.securityInterceptor(securityInterceptor);
 		});
 	}
 

core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java

@@ -178,19 +178,9 @@ private String findParameterName(Annotation[] parameterAnnotations) {
 		return null;
 	}
 
-	private static final ParameterNameFactory<Constructor<?>> CONSTRUCTOR_METHODPARAM_FACTORY = new ParameterNameFactory<Constructor<?>>() {
+	private static final ParameterNameFactory<Constructor<?>> CONSTRUCTOR_METHODPARAM_FACTORY = constructor -> constructor.getParameterAnnotations();
 
-		public Annotation[][] findParameterAnnotations(Constructor<?> constructor) {
-			return constructor.getParameterAnnotations();
-		}
-	};
-
-	private static final ParameterNameFactory<Method> METHOD_METHODPARAM_FACTORY = new ParameterNameFactory<Method>() {
-
-		public Annotation[][] findParameterAnnotations(Method method) {
-			return method.getParameterAnnotations();
-		}
-	};
+	private static final ParameterNameFactory<Method> METHOD_METHODPARAM_FACTORY = method -> method.getParameterAnnotations();
 
 	/**
 	 * Strategy interface for looking up the parameter names.

core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java

@@ -16,8 +16,6 @@
 
 package org.springframework.security.core.userdetails.jdbc;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -27,7 +25,6 @@
 import org.springframework.context.MessageSource;
 import org.springframework.context.MessageSourceAware;
 import org.springframework.context.support.MessageSourceAccessor;
-import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.support.JdbcDaoSupport;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.SpringSecurityMessageSource;
@@ -225,17 +222,12 @@ public UserDetails loadUserByUsername(String username)
 	 */
 	protected List<UserDetails> loadUsersByUsername(String username) {
 		return getJdbcTemplate().query(this.usersByUsernameQuery,
-				new String[] { username }, new RowMapper<UserDetails>() {
-					@Override
-					public UserDetails mapRow(ResultSet rs, int rowNum)
-							throws SQLException {
-						String username = rs.getString(1);
-						String password = rs.getString(2);
-						boolean enabled = rs.getBoolean(3);
-						return new User(username, password, enabled, true, true, true,
-								AuthorityUtils.NO_AUTHORITIES);
-					}
-
+				new String[] { username }, (rs, rowNum) -> {
+					String username1 = rs.getString(1);
+					String password = rs.getString(2);
+					boolean enabled = rs.getBoolean(3);
+					return new User(username1, password, enabled, true, true, true,
+							AuthorityUtils.NO_AUTHORITIES);
 				});
 	}
 
@@ -246,14 +238,10 @@ public UserDetails mapRow(ResultSet rs, int rowNum)
 	 */
 	protected List<GrantedAuthority> loadUserAuthorities(String username) {
 		return getJdbcTemplate().query(this.authoritiesByUsernameQuery,
-				new String[] { username }, new RowMapper<GrantedAuthority>() {
-					@Override
-					public GrantedAuthority mapRow(ResultSet rs, int rowNum)
-							throws SQLException {
-						String roleName = JdbcDaoImpl.this.rolePrefix + rs.getString(2);
-
-						return new SimpleGrantedAuthority(roleName);
-					}
+				new String[] { username }, (rs, rowNum) -> {
+					String roleName = JdbcDaoImpl.this.rolePrefix + rs.getString(2);
+
+					return new SimpleGrantedAuthority(roleName);
 				});
 	}
 
@@ -265,14 +253,10 @@ public GrantedAuthority mapRow(ResultSet rs, int rowNum)
 	 */
 	protected List<GrantedAuthority> loadGroupAuthorities(String username) {
 		return getJdbcTemplate().query(this.groupAuthoritiesByUsernameQuery,
-				new String[] { username }, new RowMapper<GrantedAuthority>() {
-					@Override
-					public GrantedAuthority mapRow(ResultSet rs, int rowNum)
-							throws SQLException {
-						String roleName = getRolePrefix() + rs.getString(3);
-
-						return new SimpleGrantedAuthority(roleName);
-					}
+				new String[] { username }, (rs, rowNum) -> {
+					String roleName = getRolePrefix() + rs.getString(3);
+
+					return new SimpleGrantedAuthority(roleName);
 				});
 	}