Polishing

(cherry picked from commit 0711d6d)

Author: jhoeller

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -204,7 +204,7 @@ public <T> T convertIfNecessary(String propertyName, Object oldValue, Object new
 				if (Object.class.equals(requiredType)) {
 					return (T) convertedValue;
 				}
-				if (requiredType.isArray()) {
+				else if (requiredType.isArray()) {
 					// Array required -> apply appropriate conversion of elements.
 					if (convertedValue instanceof String && Enum.class.isAssignableFrom(requiredType.getComponentType())) {
 						convertedValue = StringUtils.commaDelimitedListToStringArray((String) convertedValue);
@@ -339,7 +339,6 @@ private Object attemptToConvertStringToEnum(Class<?> requiredType, String trimme
 			catch (Throwable ex) {
 				if (logger.isTraceEnabled()) {
 					logger.trace("Field [" + convertedValue + "] isn't an enum value", ex);
-
 				}
 			}
 		}

spring-context/src/main/java/org/springframework/format/support/FormattingConversionService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -88,8 +88,8 @@ public void addFormatterForFieldType(Class<?> fieldType, Printer<?> printer, Par
 	}
 
 	@Override
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public void addFormatterForFieldAnnotation(AnnotationFormatterFactory annotationFormatterFactory) {
+	@SuppressWarnings("unchecked")
+	public void addFormatterForFieldAnnotation(AnnotationFormatterFactory<? extends Annotation> annotationFormatterFactory) {
 		Class<? extends Annotation> annotationType = (Class<? extends Annotation>)
 				GenericTypeResolver.resolveTypeArgument(annotationFormatterFactory.getClass(), AnnotationFormatterFactory.class);
 		if (annotationType == null) {
@@ -148,7 +148,7 @@ private Class<?> resolvePrinterObjectType(Printer<?> printer) {
 
 		@Override
 		public String toString() {
-			return this.fieldType.getName() + " -> " + String.class.getName() + " : " + this.printer;
+			return (this.fieldType.getName() + " -> " + String.class.getName() + " : " + this.printer);
 		}
 	}
 
@@ -197,7 +197,7 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 
 		@Override
 		public String toString() {
-			return String.class.getName() + " -> " + this.fieldType.getName() + ": " + this.parser;
+			return (String.class.getName() + " -> " + this.fieldType.getName() + ": " + this.parser);
 		}
 	}
 
@@ -249,8 +249,8 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 
 		@Override
 		public String toString() {
-			return "@" + this.annotationType.getName() + " " + this.fieldType.getName() + " -> " +
-					String.class.getName() + ": " + this.annotationFormatterFactory;
+			return ("@" + this.annotationType.getName() + " " + this.fieldType.getName() + " -> " +
+					String.class.getName() + ": " + this.annotationFormatterFactory);
 		}
 	}
 
@@ -302,8 +302,8 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 
 		@Override
 		public String toString() {
-			return String.class.getName() + " -> @" + this.annotationType.getName() + " " +
-					this.fieldType.getName() + ": " + this.annotationFormatterFactory;
+			return (String.class.getName() + " -> @" + this.annotationType.getName() + " " +
+					this.fieldType.getName() + ": " + this.annotationFormatterFactory);
 		}
 	}
 

spring-context/src/main/java/org/springframework/validation/DataBinder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -553,6 +553,7 @@ public List<Validator> getValidators() {
 		return Collections.unmodifiableList(this.validators);
 	}
 
+
 	//---------------------------------------------------------------------
 	// Implementation of PropertyEditorRegistry/TypeConverter interface
 	//---------------------------------------------------------------------

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -22,10 +22,11 @@
 import org.springframework.util.StringUtils;
 
 /**
- * Converts a String to a Locale.
+ * Converts from a String to a {@link java.util.Locale}.
  *
  * @author Keith Donald
  * @since 3.0
+ * @see StringUtils#parseLocaleString
  */
 final class StringToLocaleConverter implements Converter<String, Locale> {
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -22,19 +22,17 @@
 import org.springframework.util.StringUtils;
 
 /**
- * Converts from a String to a java.util.UUID by calling {@link UUID#fromString(String)}.
+ * Converts from a String to a {@link java.util.UUID}.
  *
  * @author Phillip Webb
  * @since 3.2
+ * @see UUID#fromString
  */
 final class StringToUUIDConverter implements Converter<String, UUID> {
 
 	@Override
 	public UUID convert(String source) {
-		if (StringUtils.hasLength(source)) {
-			return UUID.fromString(source.trim());
-		}
-		return null;
+		return (StringUtils.hasLength(source) ? UUID.fromString(source.trim()) : null);
 	}
 
 }

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -59,8 +59,7 @@ private static class ResourceUrlEncodingResponseWrapper extends HttpServletRespo
 		/* Cache the index of the path within the DispatcherServlet mapping. */
 		private Integer indexLookupPath;
 
-
-		private ResourceUrlEncodingResponseWrapper(HttpServletRequest request, HttpServletResponse wrapped) {
+		public ResourceUrlEncodingResponseWrapper(HttpServletRequest request, HttpServletResponse wrapped) {
 			super(wrapped);
 			this.request = request;
 		}
@@ -69,11 +68,11 @@ private ResourceUrlEncodingResponseWrapper(HttpServletRequest request, HttpServl
 		public String encodeURL(String url) {
 			ResourceUrlProvider resourceUrlProvider = getResourceUrlProvider();
 			if (resourceUrlProvider == null) {
-				logger.debug("Request attribute exposing ResourceUrlProvider not found.");
+				logger.debug("Request attribute exposing ResourceUrlProvider not found");
 				return super.encodeURL(url);
 			}
 			initIndexLookupPath(resourceUrlProvider);
-			if(url.length() >= this.indexLookupPath) {
+			if (url.length() >= this.indexLookupPath) {
 				String prefix = url.substring(0, this.indexLookupPath);
 				String lookupPath = url.substring(this.indexLookupPath);
 				lookupPath = resourceUrlProvider.getForLookupPath(lookupPath);