Polishing

Author: jhoeller

spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -25,7 +25,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
 
@@ -201,7 +200,7 @@ private Map<String, Object> asMap(Object object) {
 		}
 
 		Map<Object, Object> map = (Map<Object, Object>) object;
-		for (Entry<Object, Object> entry : map.entrySet()) {
+		for (Map.Entry<Object, Object> entry : map.entrySet()) {
 			Object value = entry.getValue();
 			if (value instanceof Map) {
 				value = asMap(value);
@@ -273,7 +272,7 @@ protected final Map<String, Object> getFlattenedMap(Map<String, Object> source)
 	}
 
 	private void buildFlattenedMap(Map<String, Object> result, Map<String, Object> source, String path) {
-		for (Entry<String, Object> entry : source.entrySet()) {
+		for (Map.Entry<String, Object> entry : source.entrySet()) {
 			String key = entry.getKey();
 			if (StringUtils.hasText(path)) {
 				if (key.startsWith("[")) {

spring-context/src/main/java/org/springframework/context/expression/BeanFactoryResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -34,11 +34,17 @@ public class BeanFactoryResolver implements BeanResolver {
 
 	private final BeanFactory beanFactory;
 
+
+	/**
+	 * Create a new {@link BeanFactoryResolver} for the given factory.
+	 * @param beanFactory the {@link BeanFactory} to resolve bean names against
+	 */
 	public BeanFactoryResolver(BeanFactory beanFactory) {
 		Assert.notNull(beanFactory, "BeanFactory must not be null");
 		this.beanFactory = beanFactory;
 	}
 
+
 	@Override
 	public Object resolve(EvaluationContext context, String beanName) throws AccessException {
 		try {

spring-context/src/main/java/org/springframework/context/expression/StandardBeanExpressionResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -143,8 +143,7 @@ public Object evaluate(String value, BeanExpressionContext evalContext) throws B
 			}
 			StandardEvaluationContext sec = this.evaluationCache.get(evalContext);
 			if (sec == null) {
-				sec = new StandardEvaluationContext();
-				sec.setRootObject(evalContext);
+				sec = new StandardEvaluationContext(evalContext);
 				sec.addPropertyAccessor(new BeanExpressionContextAccessor());
 				sec.addPropertyAccessor(new BeanFactoryAccessor());
 				sec.addPropertyAccessor(new MapAccessor());

spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -69,7 +69,7 @@ public abstract class SpringFactoriesLoader {
 	/**
 	 * Load and instantiate the factory implementations of the given type from
 	 * {@value #FACTORIES_RESOURCE_LOCATION}, using the given class loader.
-	 * <p>The returned factories are sorted in accordance with the {@link AnnotationAwareOrderComparator}.
+	 * <p>The returned factories are sorted through {@link AnnotationAwareOrderComparator}.
 	 * <p>If a custom instantiation strategy is required, use {@link #loadFactoryNames}
 	 * to obtain all registered factory names.
 	 * @param factoryClass the interface or abstract class representing the factory

spring-expression/src/main/java/org/springframework/expression/BeanResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -17,23 +17,22 @@
 package org.springframework.expression;
 
 /**
- * A bean resolver can be registered with the evaluation context
- * and will kick in for {@code @myBeanName} and {@code &myBeanName} expressions.
- * The <tt>&</tt> variant syntax allows access to the factory bean where
- * relevant.
+ * A bean resolver can be registered with the evaluation context and will kick in
+ * for bean references: {@code @myBeanName} and {@code &myBeanName} expressions.
+ * The <tt>&</tt> variant syntax allows access to the factory bean where relevant.
  *
  * @author Andy Clement
  * @since 3.0.3
  */
 public interface BeanResolver {
 
 	/**
-	 * Look up the named bean and return it. If attempting to access a factory
-	 * bean the name will have a <tt>&</tt> prefix.
+	 * Look up a bean by the given name and return a corresponding instance for it.
+	 * For attempting access to a factory bean, the name needs a <tt>&</tt> prefix.
 	 * @param context the current evaluation context
-	 * @param beanName the name of the bean to lookup
+	 * @param beanName the name of the bean to look up
 	 * @return an object representing the bean
-	 * @throws AccessException if there is an unexpected problem resolving the named bean
+	 * @throws AccessException if there is an unexpected problem resolving the bean
 	 */
 	Object resolve(EvaluationContext context, String beanName) throws AccessException;
 

spring-expression/src/test/java/org/springframework/expression/spel/AbstractExpressionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -44,7 +44,7 @@ public abstract class AbstractExpressionTests {
 
 	protected final ExpressionParser parser = new SpelExpressionParser();
 
-	protected final StandardEvaluationContext eContext = TestScenarioCreator.getTestEvaluationContext();
+	protected final StandardEvaluationContext context = TestScenarioCreator.getTestEvaluationContext();
 
 
 	/**
@@ -63,14 +63,14 @@ public void evaluate(String expression, Object expectedValue, Class<?> expectedR
 			SpelUtilities.printAbstractSyntaxTree(System.out, expr);
 		}
 
-		Object value = expr.getValue(eContext);
+		Object value = expr.getValue(context);
 
 		// Check the return value
 		if (value == null) {
 			if (expectedValue == null) {
 				return;  // no point doing other checks
 			}
-			assertEquals("Expression returned null value, but expected '" + expectedValue + "'", expectedValue, null);
+			assertNull("Expression returned null value, but expected '" + expectedValue + "'", expectedValue);
 		}
 
 		Class<?> resultType = value.getClass();
@@ -95,12 +95,12 @@ public void evaluateAndAskForReturnType(String expression, Object expectedValue,
 			SpelUtilities.printAbstractSyntaxTree(System.out, expr);
 		}
 
-		Object value = expr.getValue(eContext, expectedResultType);
+		Object value = expr.getValue(context, expectedResultType);
 		if (value == null) {
 			if (expectedValue == null) {
 				return;  // no point doing other checks
 			}
-			assertEquals("Expression returned null value, but expected '" + expectedValue + "'", expectedValue, null);
+			assertNull("Expression returned null value, but expected '" + expectedValue + "'", expectedValue);
 		}
 
 		Class<?> resultType = value.getClass();
@@ -127,12 +127,12 @@ public void evaluate(String expression, Object expectedValue, Class<?> expectedC
 		if (DEBUG) {
 			SpelUtilities.printAbstractSyntaxTree(System.out, expr);
 		}
-		Object value = expr.getValue(eContext);
+		Object value = expr.getValue(context);
 		if (value == null) {
 			if (expectedValue == null) {
 				return;  // no point doing other checks
 			}
-			assertEquals("Expression returned null value, but expected '" + expectedValue + "'", expectedValue, null);
+			assertNull("Expression returned null value, but expected '" + expectedValue + "'", expectedValue);
 		}
 		Class<? extends Object> resultType = value.getClass();
 		if (expectedValue instanceof String) {
@@ -142,10 +142,10 @@ public void evaluate(String expression, Object expectedValue, Class<?> expectedC
 		else {
 			assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue, value);
 		}
-		assertEquals("Type of the result was not as expected.  Expected '" + expectedClassOfResult +
-				"' but result was of type '" + resultType + "'", expectedClassOfResult.equals(resultType), true);
+		assertTrue("Type of the result was not as expected.  Expected '" + expectedClassOfResult +
+				"' but result was of type '" + resultType + "'", expectedClassOfResult.equals(resultType));
 
-		boolean isWritable = expr.isWritable(eContext);
+		boolean isWritable = expr.isWritable(context);
 		if (isWritable != shouldBeWritable) {
 			if (shouldBeWritable)
 				fail("Expected the expression to be writable but it is not");
@@ -184,10 +184,10 @@ protected void evaluateAndCheckError(String expression, Class<?> expectedReturnT
 				fail("Parser returned null for expression");
 			}
 			if (expectedReturnType != null) {
-				expr.getValue(eContext, expectedReturnType);
+				expr.getValue(context, expectedReturnType);
 			}
 			else {
-				expr.getValue(eContext);
+				expr.getValue(context);
 			}
 			fail("Should have failed with message " + expectedMessage);
 		}

spring-expression/src/test/java/org/springframework/expression/spel/BooleanExpressionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -104,11 +104,12 @@ protected Object convertNullSource(TypeDescriptor sourceType, TypeDescriptor tar
 				return targetType.getType() == Boolean.class ? false : null;
 			}
 		};
-		eContext.setTypeConverter(new StandardTypeConverter(conversionService));
+		context.setTypeConverter(new StandardTypeConverter(conversionService));
 
 		evaluate("null or true", Boolean.TRUE, Boolean.class, false);
 		evaluate("null and true", Boolean.FALSE, Boolean.class, false);
 		evaluate("!null", Boolean.TRUE, Boolean.class, false);
 		evaluate("null ? 'foo' : 'bar'", "bar", String.class, false);
 	}
+
 }

spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java

@@ -359,7 +359,7 @@ public void testTernaryOperator03() {
 	@Test
 	public void testTernaryOperator04() {
 		Expression e = parser.parseExpression("1>2?3:4");
-		assertFalse(e.isWritable(eContext));
+		assertFalse(e.isWritable(context));
 	}
 
 	@Test

spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -98,7 +98,7 @@ public void testMethodThrowingException_SPR6760() {
 		StandardEvaluationContext eContext = TestScenarioCreator.getTestEvaluationContext();
 		eContext.setVariable("bar", 3);
 		Object o = expr.getValue(eContext);
-		assertEquals(o, 3);
+		assertEquals(3, o);
 		assertEquals(1, parser.parseExpression("counter").getValue(eContext));
 
 		// Now the expression has cached that throwException(int) is the right thing to call
@@ -163,9 +163,9 @@ public void testMethodThrowingException_SPR6941() {
 		SpelExpressionParser parser = new SpelExpressionParser();
 		Expression expr = parser.parseExpression("throwException(#bar)");
 
-		eContext.setVariable("bar", 2);
+		context.setVariable("bar", 2);
 		try {
-			expr.getValue(eContext);
+			expr.getValue(context);
 			fail();
 		}
 		catch (Exception ex) {
@@ -187,9 +187,9 @@ public void testMethodThrowingException_SPR6941_2() {
 		SpelExpressionParser parser = new SpelExpressionParser();
 		Expression expr = parser.parseExpression("throwException(#bar)");
 
-		eContext.setVariable("bar", 4);
+		context.setVariable("bar", 4);
 		try {
-			expr.getValue(eContext);
+			expr.getValue(context);
 			fail();
 		}
 		catch (ExpressionInvocationTargetException ex) {
@@ -251,7 +251,7 @@ public void testAddingMethodResolvers() {
 		ctx.addMethodResolver(dummy);
 		assertEquals(2, ctx.getMethodResolvers().size());
 
-		List<MethodResolver> copy = new ArrayList<MethodResolver>();
+		List<MethodResolver> copy = new ArrayList<>();
 		copy.addAll(ctx.getMethodResolvers());
 		assertTrue(ctx.removeMethodResolver(dummy));
 		assertFalse(ctx.removeMethodResolver(dummy));
@@ -294,7 +294,7 @@ public void testInvocationOnNullContextObject() {
 	public void testMethodOfClass() throws Exception {
 		Expression expression = parser.parseExpression("getName()");
 		Object value = expression.getValue(new StandardEvaluationContext(String.class));
-		assertEquals(value, "java.lang.String");
+		assertEquals("java.lang.String", value);
 	}
 
 	@Test
@@ -341,7 +341,7 @@ private boolean isAnnotated(Method method) {
 		@Override
 		public List<Method> filter(List<Method> methods) {
 			filterCalled = true;
-			List<Method> forRemoval = new ArrayList<Method>();
+			List<Method> forRemoval = new ArrayList<>();
 			for (Method method: methods) {
 				if (removeIfNotAnnotated && !isAnnotated(method)) {
 					forRemoval.add(method);