Polish "Replace relevant code with lambda"

Closes spring-projectsgh-1454

Author: snicoll

spring-aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
@@ -139,7 +138,7 @@ private List<Method> findCandidateWriteMethods(MethodDescriptor[] methodDescript
 		// Sort non-void returning write methods to guard against the ill effects of
 		// non-deterministic sorting of methods returned from Class#getDeclaredMethods
 		// under JDK 7. See http://bugs.sun.com/view_bug.do?bug_id=7023180
-		Collections.sort(matches, (m1, m2) -> m2.toString().compareTo(m1.toString()));
+		matches.sort((m1, m2) -> m2.toString().compareTo(m1.toString()));
 		return matches;
 	}
 

spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java

@@ -412,43 +412,43 @@ private InjectionMetadata buildAutowiringMetadata(final Class<?> clazz) {
 			final LinkedList<InjectionMetadata.InjectedElement> currElements = new LinkedList<>();
 
 			ReflectionUtils.doWithLocalFields(targetClass, field -> {
-        AnnotationAttributes ann = findAutowiredAnnotation(field);
-        if (ann != null) {
-          if (Modifier.isStatic(field.getModifiers())) {
-            if (logger.isWarnEnabled()) {
-              logger.warn("Autowired annotation is not supported on static fields: " + field);
-            }
-            return;
-          }
-          boolean required = determineRequiredStatus(ann);
-          currElements.add(new AutowiredFieldElement(field, required));
-        }
-      });
+				AnnotationAttributes ann = findAutowiredAnnotation(field);
+				if (ann != null) {
+					if (Modifier.isStatic(field.getModifiers())) {
+						if (logger.isWarnEnabled()) {
+							logger.warn("Autowired annotation is not supported on static fields: " + field);
+						}
+						return;
+					}
+					boolean required = determineRequiredStatus(ann);
+					currElements.add(new AutowiredFieldElement(field, required));
+				}
+			});
 
 			ReflectionUtils.doWithLocalMethods(targetClass, method -> {
-        Method bridgedMethod = BridgeMethodResolver.findBridgedMethod(method);
-        if (!BridgeMethodResolver.isVisibilityBridgeMethodPair(method, bridgedMethod)) {
-          return;
-        }
-        AnnotationAttributes ann = findAutowiredAnnotation(bridgedMethod);
-        if (ann != null && method.equals(ClassUtils.getMostSpecificMethod(method, clazz))) {
-          if (Modifier.isStatic(method.getModifiers())) {
-            if (logger.isWarnEnabled()) {
-              logger.warn("Autowired annotation is not supported on static methods: " + method);
-            }
-            return;
-          }
-          if (method.getParameterCount() == 0) {
-            if (logger.isWarnEnabled()) {
-              logger.warn("Autowired annotation should only be used on methods with parameters: " +
-                  method);
-            }
-          }
-          boolean required = determineRequiredStatus(ann);
-          PropertyDescriptor pd = BeanUtils.findPropertyForMethod(bridgedMethod, clazz);
-          currElements.add(new AutowiredMethodElement(method, required, pd));
-        }
-      });
+				Method bridgedMethod = BridgeMethodResolver.findBridgedMethod(method);
+				if (!BridgeMethodResolver.isVisibilityBridgeMethodPair(method, bridgedMethod)) {
+					return;
+				}
+				AnnotationAttributes ann = findAutowiredAnnotation(bridgedMethod);
+				if (ann != null && method.equals(ClassUtils.getMostSpecificMethod(method, clazz))) {
+					if (Modifier.isStatic(method.getModifiers())) {
+						if (logger.isWarnEnabled()) {
+							logger.warn("Autowired annotation is not supported on static methods: " + method);
+						}
+						return;
+					}
+					if (method.getParameterCount() == 0) {
+						if (logger.isWarnEnabled()) {
+							logger.warn("Autowired annotation should only be used on methods with parameters: " +
+									method);
+						}
+					}
+					boolean required = determineRequiredStatus(ann);
+					PropertyDescriptor pd = BeanUtils.findPropertyForMethod(bridgedMethod, clazz);
+					currElements.add(new AutowiredMethodElement(method, required, pd));
+				}
+			});
 
 			elements.addAll(0, currElements);
 			targetClass = targetClass.getSuperclass();

spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/JCacheInterceptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-context/src/main/java/org/springframework/cache/annotation/AnnotationCacheOperationSource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-context/src/main/java/org/springframework/cache/interceptor/CacheInterceptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java

@@ -363,7 +363,7 @@ else if (ejbRefClass != null && field.isAnnotationPresent(ejbRefClass)) {
 						throw new IllegalStateException("@EJB annotation is not supported on static fields");
 					}
 					currElements.add(new EjbRefElement(field, field, null));
-        }
+				}
 				else if (field.isAnnotationPresent(Resource.class)) {
 					if (Modifier.isStatic(field.getModifiers())) {
 						throw new IllegalStateException("@Resource annotation is not supported on static fields");

spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java

@@ -19,8 +19,6 @@
 import java.beans.PropertyDescriptor;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -280,7 +278,7 @@ else if (ConfigurationClassUtils.checkConfigurationClassCandidate(beanDef, this.
 		}
 
 		// Sort by previously determined @Order value, if applicable
-		Collections.sort(configCandidates, (bd1, bd2) -> {
+		configCandidates.sort((bd1, bd2) -> {
 			int i1 = ConfigurationClassUtils.getOrder(bd1.getBeanDefinition());
 			int i2 = ConfigurationClassUtils.getOrder(bd2.getBeanDefinition());
 			return (i1 < i2) ? -1 : (i1 > i2) ? 1 : 0;

spring-core/src/main/java/org/springframework/util/ReflectionUtils.java

@@ -47,12 +47,6 @@
  */
 public abstract class ReflectionUtils {
 
-	/**
-	 * Pre-built FieldFilter that matches all non-static, non-final fields.
-	 */
-	public static final FieldFilter COPYABLE_FIELDS =
-			field -> !(Modifier.isStatic(field.getModifiers()) || Modifier.isFinal(field.getModifiers()));
-
 	/**
 	 * Naming prefix for CGLIB-renamed methods.
 	 * @see #isCglibRenamedMethod
@@ -851,6 +845,13 @@ public interface FieldFilter {
 	}
 
 
+	/**
+	 * Pre-built FieldFilter that matches all non-static, non-final fields.
+	 */
+	public static final FieldFilter COPYABLE_FIELDS =
+			field -> !(Modifier.isStatic(field.getModifiers()) || Modifier.isFinal(field.getModifiers()));
+
+
 	/**
 	 * Pre-built MethodFilter that matches all non-bridge methods.
 	 */

spring-core/src/main/java/org/springframework/util/concurrent/CompletableToListenableFutureAdapter.java

@@ -21,9 +21,6 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import java.util.function.BiFunction;
-
-import org.springframework.lang.Nullable;
 
 /**
  * Adapts a {@link CompletableFuture} or {@link CompletionStage} into a
@@ -53,9 +50,9 @@ public CompletableToListenableFutureAdapter(CompletionStage<T> completionStage)
 	 */
 	public CompletableToListenableFutureAdapter(CompletableFuture<T> completableFuture) {
 		this.completableFuture = completableFuture;
-		this.completableFuture.handle((result, exception) -> {
-			if (exception != null) {
-				callbacks.failure(exception);
+		this.completableFuture.handle((result, ex) -> {
+			if (ex != null) {
+				callbacks.failure(ex);
 			}
 			else {
 				callbacks.success(result);

spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java

@@ -20,7 +20,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.springframework.asm.ClassWriter;
 import org.springframework.asm.MethodVisitor;
 import org.springframework.expression.EvaluationException;
 import org.springframework.expression.TypedValue;
@@ -137,10 +136,11 @@ public void generateCode(MethodVisitor mv, CodeFlow codeflow) {
 		final String constantFieldName = "inlineList$" + codeflow.nextFieldId();
 		final String className = codeflow.getClassName();
 
-		codeflow.registerNewField((cw, codeflow1)
-				-> cw.visitField(ACC_PRIVATE|ACC_STATIC|ACC_FINAL, constantFieldName, "Ljava/util/List;", null, null));
-		
-		codeflow.registerNewClinit((mv1, codeflow12) -> generateClinitCode(className, constantFieldName, mv1, codeflow12, false));
+		codeflow.registerNewField((cw, cflow) ->
+				cw.visitField(ACC_PRIVATE | ACC_STATIC | ACC_FINAL, constantFieldName, "Ljava/util/List;", null, null));
+
+		codeflow.registerNewClinit((mVisitor, cflow) ->
+				generateClinitCode(className, constantFieldName, mVisitor, cflow, false));
 
 		mv.visitFieldInsn(GETSTATIC, className, constantFieldName, "Ljava/util/List;");
 		codeflow.pushDescriptor("Ljava/util/List");

spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodResolver.java

@@ -21,8 +21,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -121,7 +119,7 @@ public MethodExecutor resolve(EvaluationContext context, Object targetObject, St
 
 			// Sort methods into a sensible order
 			if (methods.size() > 1) {
-				Collections.sort(methods, (m1, m2) -> {
+				methods.sort((m1, m2) -> {
 					int m1pl = m1.getParameterCount();
 					int m2pl = m2.getParameterCount();
 					// varargs methods go last

spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 import org.springframework.beans.factory.FactoryBean;

spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java

@@ -16,15 +16,12 @@
 
 package org.springframework.jdbc.core.support;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.Properties;
 import javax.sql.DataSource;
 
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.PropertiesBeanDefinitionReader;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowCallbackHandler;
 import org.springframework.util.Assert;
 
 /**
@@ -105,10 +102,10 @@ public void setJdbcTemplate(JdbcTemplate jdbcTemplate) {
 	public void loadBeanDefinitions(String sql) {
 		Assert.notNull(this.jdbcTemplate, "Not fully configured - specify DataSource or JdbcTemplate");
 		final Properties props = new Properties();
-		this.jdbcTemplate.query(sql, resultSet -> {
-			String beanName = resultSet.getString(1);
-			String property = resultSet.getString(2);
-			String value = resultSet.getString(3);
+		this.jdbcTemplate.query(sql, rs -> {
+			String beanName = rs.getString(1);
+			String property = rs.getString(2);
+			String value = rs.getString(3);
 			// Make a properties entry by combining bean name and property.
 			props.setProperty(beanName + '.' + property, value);
 		});

spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java

@@ -586,9 +586,9 @@ public void afterConnected(TcpConnection<byte[]> connection) {
 			}
 			this.tcpConnection = connection;
 			this.tcpConnection.onReadInactivity(() -> {
-				if (tcpConnection != null && !isStompConnected) {
+				if (this.tcpConnection != null && !this.isStompConnected) {
 					handleTcpConnectionFailure("No CONNECTED frame received in " +
-						MAX_TIME_TO_CONNECTED_FRAME + " ms.", null);
+							MAX_TIME_TO_CONNECTED_FRAME + " ms.", null);
 				}
 			}, MAX_TIME_TO_CONNECTED_FRAME);
 			connection.send(MessageBuilder.createMessage(EMPTY_PAYLOAD, this.connectHeaders.getMessageHeaders()));
@@ -697,18 +697,19 @@ private void initHeartbeats(StompHeaderAccessor connectedHeaders) {
 			long serverReceiveInterval = connectedHeaders.getHeartbeat()[1];
 
 			if (clientSendInterval > 0 && serverReceiveInterval > 0) {
-				long interval = Math.max(clientSendInterval,  serverReceiveInterval);
+				long interval = Math.max(clientSendInterval, serverReceiveInterval);
 				this.tcpConnection.onWriteInactivity(() -> {
-					TcpConnection<byte[]> conn = tcpConnection;
+					TcpConnection<byte[]> conn = this.tcpConnection;
 					if (conn != null) {
 						conn.send(HEARTBEAT_MESSAGE).addCallback(
-							new ListenableFutureCallback<Void>() {
-								public void onSuccess(Void result) {
-								}
-								public void onFailure(Throwable ex) {
-									handleTcpConnectionFailure("Failed to forward heartbeat: " + ex.getMessage(), ex);
-								}
-							});
+								new ListenableFutureCallback<Void>() {
+									public void onSuccess(Void result) {
+									}
+
+									public void onFailure(Throwable ex) {
+										handleTcpConnectionFailure("Failed to forward heartbeat: " + ex.getMessage(), ex);
+									}
+								});
 					}
 				}, interval);
 			}

spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java

@@ -30,7 +30,6 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import javax.persistence.EntityManager;
@@ -350,7 +349,8 @@ public final void afterPropertiesSet() throws PersistenceException {
 		}
 
 		if (this.bootstrapExecutor != null) {
-			this.nativeEntityManagerFactoryFuture = this.bootstrapExecutor.submit(this::buildNativeEntityManagerFactory);
+			this.nativeEntityManagerFactoryFuture = this.bootstrapExecutor.submit(
+					this::buildNativeEntityManagerFactory);
 		}
 		else {
 			this.nativeEntityManagerFactory = buildNativeEntityManagerFactory();