Polish "Replace relevant code with lambda"

Closes gh-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.
 	 */