Polishing

Author: jhoeller

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

@@ -241,7 +241,7 @@ public Constructor<?>[] determineCandidateConstructors(Class<?> beanClass, Strin
 							if (requiredConstructor != null) {
 								throw new BeanCreationException(beanName,
 										"Invalid autowire-marked constructor: " + candidate +
-										". Found another constructor with 'required' Autowired annotation: " +
+										". Found constructor with 'required' Autowired annotation already: " +
 										requiredConstructor);
 							}
 							if (candidate.getParameterTypes().length == 0) {
@@ -253,7 +253,7 @@ public Constructor<?>[] determineCandidateConstructors(Class<?> beanClass, Strin
 								if (!candidates.isEmpty()) {
 									throw new BeanCreationException(beanName,
 											"Invalid autowire-marked constructors: " + candidates +
-											". Found another constructor with 'required' Autowired annotation: " +
+											". Found constructor with 'required' Autowired annotation: " +
 											candidate);
 								}
 								requiredConstructor = candidate;

spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java

@@ -2610,7 +2610,7 @@ public interface GenericInterface1<T> {
 	}
 
 
-	public static class GenericInterface1Impl<T> implements GenericInterface1<T>{
+	public static class GenericInterface1Impl<T> implements GenericInterface1<T> {
 
 		@Autowired
 		private GenericInterface2<T> gi2;

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

@@ -200,7 +200,7 @@ public String toString() {
 	}
 
 
-	// subclassing hooks
+	// Protected template methods
 
 	/**
 	 * Template method to convert a null source.
@@ -548,7 +548,7 @@ private List<Class<?>> getClassHierarchy(Class<?> type) {
 				Class<?> candidate = hierarchy.get(i);
 				candidate = (array ? candidate.getComponentType() : ClassUtils.resolvePrimitiveIfNecessary(candidate));
 				Class<?> superclass = candidate.getSuperclass();
-				if (candidate.getSuperclass() != null && superclass != Object.class) {
+				if (superclass != null && superclass != Object.class) {
 					addToClassHierarchy(i + 1, candidate.getSuperclass(), array, hierarchy, visited);
 				}
 				for (Class<?> implementedInterface : candidate.getInterfaces()) {
@@ -563,6 +563,7 @@ private List<Class<?>> getClassHierarchy(Class<?> type) {
 
 		private void addToClassHierarchy(int index, Class<?> type, boolean asArray,
 				List<Class<?>> hierarchy, Set<Class<?>> visited) {
+
 			if (asArray) {
 				type = Array.newInstance(type, 0).getClass();
 			}

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

@@ -194,7 +194,6 @@ public static SortedSet<Integer> findAvailableUdpPorts(int numRequested, int min
 	private static enum SocketType {
 
 		TCP {
-
 			@Override
 			protected boolean isPortAvailable(int port) {
 				try {
@@ -209,7 +208,6 @@ protected boolean isPortAvailable(int port) {
 		},
 
 		UDP {
-
 			@Override
 			protected boolean isPortAvailable(int port) {
 				try {

spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java

@@ -57,11 +57,13 @@
  * @author Keith Donald
  * @author Juergen Hoeller
  * @author Phillip Webb
+ * @author David Haraburda
  */
 public class GenericConversionServiceTests {
 
 	private GenericConversionService conversionService = new GenericConversionService();
 
+
 	@Test
 	public void canConvert() {
 		assertFalse(conversionService.canConvert(String.class, Integer.class));
@@ -749,6 +751,13 @@ public void testEnumToStringConversion() {
 		assertEquals("A", result);
 	}
 
+	@Test
+	public void testSubclassOfEnumToString() throws Exception {
+		conversionService.addConverter(new EnumToStringConverter(conversionService));
+		String result = conversionService.convert(EnumWithSubclass.FIRST, String.class);
+		assertEquals("FIRST", result);
+	}
+
 	@Test
 	public void testEnumWithInterfaceToStringConversion() {
 		// SPR-9692
@@ -850,6 +859,7 @@ public void rawCollectionAsSource() throws Exception {
 	@ExampleAnnotation
 	public String annotatedString;
 
+
 	@Retention(RetentionPolicy.RUNTIME)
 	public static @interface ExampleAnnotation {
 	}
@@ -892,8 +902,7 @@ public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		}
 
 		@Override
-		public Object convert(Object source, TypeDescriptor sourceType,
-				TypeDescriptor targetType) {
+		public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 			return null;
 		}
 
@@ -936,6 +945,7 @@ interface MyEnumInterface {
 		String getCode();
 	}
 
+
 	public static enum MyEnum implements MyEnumInterface {
 
 		A {
@@ -947,6 +957,17 @@ public String getCode() {
 	}
 
 
+	public enum EnumWithSubclass {
+
+		FIRST {
+			@Override
+			public String toString() {
+				return "1st";
+			}
+		}
+	}
+
+
 	public static class MyStringToRawCollectionConverter implements Converter<String, Collection> {
 
 		@Override
@@ -955,6 +976,7 @@ public Collection convert(String source) {
 		}
 	}
 
+
 	public static class MyStringToGenericCollectionConverter implements Converter<String, Collection<?>> {
 
 		@Override
@@ -963,6 +985,7 @@ public Collection<?> convert(String source) {
 		}
 	}
 
+
 	private static class MyEnumInterfaceToStringConverter<T extends MyEnumInterface> implements Converter<T, String> {
 
 		@Override
@@ -971,6 +994,7 @@ public String convert(T source) {
 		}
 	}
 
+
 	public static class MyStringToStringCollectionConverter implements Converter<String, Collection<String>> {
 
 		@Override
@@ -979,6 +1003,7 @@ public Collection<String> convert(String source) {
 		}
 	}
 
+
 	public static class MyStringToIntegerCollectionConverter implements Converter<String, Collection<Integer>> {
 
 		@Override

spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java

@@ -357,7 +357,7 @@ public int[] batchUpdate(String sql, Map<String, ?>[] batchValues) {
 
 	@Override
 	public int[] batchUpdate(String sql, SqlParameterSource[] batchArgs) {
-		ParsedSql parsedSql = this.getParsedSql(sql);
+		ParsedSql parsedSql = getParsedSql(sql);
 		return NamedParameterBatchUpdateUtils.executeBatchUpdateWithNamedParameters(parsedSql, batchArgs, getJdbcOperations());
 	}
 

spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/Header.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -40,8 +40,7 @@
 
 	/**
 	 * Whether the header is required.
-	 * <p>
-	 * Default is {@code true}, leading to an exception if the header missing. Switch this
+	 * <p>Default is {@code true}, leading to an exception if the header missing. Switch this
 	 * to {@code false} if you prefer a {@code null} in case of the header missing.
 	 */
 	boolean required() default true;

spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolverTests.java

@@ -88,7 +88,6 @@ public void resolveArgument() throws Exception {
 
 	@Test
 	public void resolveArgumentNativeHeader() throws Exception {
-
 		TestMessageHeaderAccessor headers = new TestMessageHeaderAccessor();
 		headers.setNativeHeader("param1", "foo");
 		Message<byte[]> message = MessageBuilder.withPayload(new byte[0]).setHeaders(headers).build();
@@ -98,7 +97,6 @@ public void resolveArgumentNativeHeader() throws Exception {
 
 	@Test
 	public void resolveArgumentNativeHeaderAmbiguity() throws Exception {
-
 		TestMessageHeaderAccessor headers = new TestMessageHeaderAccessor();
 		headers.setHeader("param1", "foo");
 		headers.setNativeHeader("param1", "native-foo");

spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -23,7 +23,8 @@
 import org.springframework.util.Assert;
 
 /**
- * Abstract base for {@link ClientHttpRequest} that makes sure that headers and body are not written multiple times.
+ * Abstract base for {@link ClientHttpRequest} that makes sure that headers
+ * and body are not written multiple times.
  *
  * @author Arjen Poutsma
  * @since 3.0
@@ -55,8 +56,7 @@ public final ClientHttpResponse execute() throws IOException {
 	}
 
 	/**
-	 * Asserts that this request has not been {@linkplain #execute() executed} yet.
-	 *
+	 * Assert that this request has not been {@linkplain #execute() executed} yet.
 	 * @throws IllegalStateException if this request has been executed
 	 */
 	protected void assertNotExecuted() {

spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 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,16 +28,15 @@
 import org.springframework.util.Assert;
 
 /**
- * {@link ClientHttpRequestFactory} implementation that uses standard J2SE facilities.
+ * {@link ClientHttpRequestFactory} implementation that uses standard JDK facilities.
  *
  * @author Arjen Poutsma
  * @author Juergen Hoeller
  * @since 3.0
  * @see java.net.HttpURLConnection
  * @see HttpComponentsClientHttpRequestFactory
  */
-public class SimpleClientHttpRequestFactory
-		implements ClientHttpRequestFactory, AsyncClientHttpRequestFactory {
+public class SimpleClientHttpRequestFactory implements ClientHttpRequestFactory, AsyncClientHttpRequestFactory {
 
 	private static final int DEFAULT_CHUNK_SIZE = 4096;
 
@@ -111,30 +110,28 @@ public void setReadTimeout(int readTimeout) {
 	}
 
 	/**
-	 * Set if the underlying URLConnection can be set to 'output streaming' mode. When
-	 * output streaming is enabled, authentication and redirection cannot be handled
-	 * automatically. If output streaming is disabled the
-	 * {@link HttpURLConnection#setFixedLengthStreamingMode(int)
-	 * setFixedLengthStreamingMode} and
-	 * {@link HttpURLConnection#setChunkedStreamingMode(int) setChunkedStreamingMode}
-	 * methods of the underlying connection will never be called.
-	 * <p>Default is {@code true}.
+	 * Set if the underlying URLConnection can be set to 'output streaming' mode.
+	 * Default is {@code true}.
+	 * <p>When output streaming is enabled, authentication and redirection cannot be handled automatically.
+	 * If output streaming is disabled, the {@link HttpURLConnection#setFixedLengthStreamingMode} and
+	 * {@link HttpURLConnection#setChunkedStreamingMode} methods of the underlying connection will never
+	 * be called.
 	 * @param outputStreaming if output streaming is enabled
 	 */
 	public void setOutputStreaming(boolean outputStreaming) {
 		this.outputStreaming = outputStreaming;
 	}
 
 	/**
-	 * Sets the task executor for this request factory. Setting this property is required
-	 * for {@linkplain #createAsyncRequest(URI, HttpMethod) creating asynchronous
-	 * request}.
+	 * Set the task executor for this request factory. Setting this property is required
+	 * for {@linkplain #createAsyncRequest(URI, HttpMethod) creating asynchronous requests}.
 	 * @param taskExecutor the task executor
 	 */
 	public void setTaskExecutor(AsyncListenableTaskExecutor taskExecutor) {
 		this.taskExecutor = taskExecutor;
 	}
 
+
 	@Override
 	public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException {
 		HttpURLConnection connection = openConnection(uri.toURL(), this.proxy);
@@ -153,10 +150,8 @@ public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IO
 	 * is required before calling this method.
 	 */
 	@Override
-	public AsyncClientHttpRequest createAsyncRequest(URI uri, HttpMethod httpMethod)
-			throws IOException {
-		Assert.state(this.taskExecutor != null, "Asynchronous execution requires an " +
-				"AsyncTaskExecutor to be set");
+	public AsyncClientHttpRequest createAsyncRequest(URI uri, HttpMethod httpMethod) throws IOException {
+		Assert.state(this.taskExecutor != null, "Asynchronous execution requires an AsyncTaskExecutor to be set");
 		HttpURLConnection connection = openConnection(uri.toURL(), this.proxy);
 		prepareConnection(connection, httpMethod.name());
 		if (this.bufferRequestBody) {

spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpResponse.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -24,7 +24,7 @@
 import org.springframework.util.StringUtils;
 
 /**
- * {@link ClientHttpResponse} implementation that uses standard J2SE facilities.
+ * {@link ClientHttpResponse} implementation that uses standard JDK facilities.
  * Obtained via {@link SimpleBufferingClientHttpRequest#execute()} and
  * {@link SimpleStreamingClientHttpRequest#execute()}.
  *

spring-web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -48,6 +48,7 @@ public AbstractCookieValueMethodArgumentResolver(ConfigurableBeanFactory beanFac
 		super(beanFactory);
 	}
 
+
 	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		return parameter.hasParameterAnnotation(CookieValue.class);
@@ -60,16 +61,17 @@ protected NamedValueInfo createNamedValueInfo(MethodParameter parameter) {
 	}
 
 	@Override
-	protected void handleMissingValue(String cookieName, MethodParameter param) throws ServletRequestBindingException {
-		String paramType = param.getParameterType().getName();
-		throw new ServletRequestBindingException(
-				"Missing cookie named '" + cookieName + "' for method parameter type [" + paramType + "]");
+	protected void handleMissingValue(String name, MethodParameter parameter) throws ServletRequestBindingException {
+		throw new ServletRequestBindingException("Missing cookie '" + name +
+				"' for method parameter of type " + parameter.getParameterType().getSimpleName());
 	}
 
+
 	private static class CookieValueNamedValueInfo extends NamedValueInfo {
 
 		private CookieValueNamedValueInfo(CookieValue annotation) {
 			super(annotation.value(), annotation.required(), annotation.defaultValue());
 		}
 	}
+
 }

spring-web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java

@@ -96,7 +96,7 @@ else if (namedValueInfo.required) {
 			}
 			arg = handleNullValue(namedValueInfo.name, arg, paramType);
 		}
-		else if ("".equals(arg) && (namedValueInfo.defaultValue != null)) {
+		else if ("".equals(arg) && namedValueInfo.defaultValue != null) {
 			arg = resolveDefaultValue(namedValueInfo.defaultValue);
 		}