Polishing

spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java

@@ -124,7 +124,7 @@ public class DateTimeFormattingTests {
 	@Test
 	public void testBindLocalDateArray() {
 		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("localDate", new String[]{"10/31/09"});
+		propertyValues.add("localDate", new String[] {"10/31/09"});
 		binder.bind(propertyValues);
 		assertEquals(0, binder.getBindingResult().getErrorCount());
 	}

spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java

@@ -185,9 +185,6 @@ final class ObjectToObjectConverter implements ConditionalGenericConverter {
 			method = ClassUtils.getStaticMethod(targetClass, "of", sourceClass);
 			if (method == null) {
 				method = ClassUtils.getStaticMethod(targetClass, "from", sourceClass);
-				if (method == null) {
-					return null;
-				}
 			}
 		}
 		return method;

spring-core/src/main/java/org/springframework/core/env/ConfigurablePropertyResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -19,10 +19,10 @@ package org.springframework.core.env;
 import org.springframework.core.convert.support.ConfigurableConversionService;
 
 /**
- * Configuration interface to be implemented by most if not all {@link PropertyResolver
+ * Configuration interface to be implemented by most if not all {@link PropertyResolver}
- * PropertyResolver} types. Provides facilities for accessing and customizing the
+ * types. Provides facilities for accessing and customizing the
- * {@link org.springframework.core.convert.ConversionService ConversionService} used when
+ * {@link org.springframework.core.convert.ConversionService ConversionService}
- * converting property values from one type to another.
+ * used when converting property values from one type to another.
  *
  * @author Chris Beams
  * @since 3.1
@@ -30,7 +30,7 @@ import org.springframework.core.convert.support.ConfigurableConversionService;
 public interface ConfigurablePropertyResolver extends PropertyResolver {
 
 	/**
-	 * @return the {@link ConfigurableConversionService} used when performing type
+	 * Return the {@link ConfigurableConversionService} used when performing type
 	 * conversions on properties.
 	 * <p>The configurable nature of the returned conversion service allows for
 	 * the convenient addition and removal of individual {@code Converter} instances:
@@ -46,10 +46,10 @@ public interface ConfigurablePropertyResolver extends PropertyResolver {
 	/**
 	 * Set the {@link ConfigurableConversionService} to be used when performing type
 	 * conversions on properties.
-	 * <p><strong>Note:</strong> as an alternative to fully replacing the {@code
+	 * <p><strong>Note:</strong> as an alternative to fully replacing the
-	 * ConversionService}, consider adding or removing individual {@code Converter}
+	 * {@code ConversionService}, consider adding or removing individual
-	 * instances by drilling into {@link #getConversionService()} and calling methods
+	 * {@code Converter} instances by drilling into {@link #getConversionService()}
-	 * such as {@code #addConverter}.
+	 * and calling methods such as {@code #addConverter}.
 	 * @see PropertyResolver#getProperty(String, Class)
 	 * @see #getConversionService()
 	 * @see org.springframework.core.convert.converter.ConverterRegistry#addConverter

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractRequestAttributesArgumentResolverTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.mvc.method.annotation;
 
 import java.lang.reflect.Method;
@@ -40,14 +41,8 @@ import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
-import static org.junit.Assert.assertFalse;
+import static org.mockito.BDDMockito.*;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -87,7 +82,7 @@ public abstract class AbstractRequestAttributesArgumentResolverTests {
 	@Test
 	public void supportsParameter() throws Exception {
 		assertTrue(this.resolver.supportsParameter(new MethodParameter(this.handleMethod, 0)));
-		assertFalse(this.resolver.supportsParameter(new MethodParameter(this.handleMethod, 4)));
+		assertFalse(this.resolver.supportsParameter(new MethodParameter(this.handleMethod, -1)));
 	}
 
 	@Test
@@ -180,6 +175,8 @@ public abstract class AbstractRequestAttributesArgumentResolverTests {
 			@SessionAttribute(name="foo") Optional<Foo> optionalFoo) {
 	}
 
+
 	private static class Foo {
 	}
+
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestAttributeMethodArgumentResolverTests.java

@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.mvc.method.annotation;
 
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 
-
 /**
  * Unit tests for {@link RequestAttributeMethodArgumentResolver}.
+ *
  * @author Rossen Stoyanchev
+ * @since 4.3
  */
-public class RequestAttributeMethodArgumentResolverTests
+public class RequestAttributeMethodArgumentResolverTests extends AbstractRequestAttributesArgumentResolverTests {
-		extends AbstractRequestAttributesArgumentResolverTests {
-
 
 	@Override
 	protected HandlerMethodArgumentResolver createResolver() {

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SessionAttributeMethodArgumentResolverTests.java

@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.mvc.method.annotation;
 
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 
-
 /**
  * Unit tests for {@link SessionAttributeMethodArgumentResolver}.
+ *
  * @author Rossen Stoyanchev
+ * @since 4.3
  */
-public class SessionAttributeMethodArgumentResolverTests
+public class SessionAttributeMethodArgumentResolverTests extends AbstractRequestAttributesArgumentResolverTests {
-		extends AbstractRequestAttributesArgumentResolverTests {
-
 
 	@Override
 	protected HandlerMethodArgumentResolver createResolver() {