Polishing

(cherry picked from commit b5f2e56)

Author: jhoeller

spring-context/src/main/java/org/springframework/context/i18n/LocaleContextHolder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 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.
@@ -154,7 +154,7 @@ else if (locale != null) {
 
 	/**
 	 * Return the Locale associated with the current thread, if any,
-	 * or the system default Locale else. This is effectively a
+	 * or the system default Locale otherwise. This is effectively a
 	 * replacement for {@link java.util.Locale#getDefault()},
 	 * able to optionally respect a user-level Locale setting.
 	 * <p>Note: This method has a fallback to the system default Locale.
@@ -219,10 +219,10 @@ else if (locale != null) {
 
 	/**
 	 * Return the TimeZone associated with the current thread, if any,
-	 * or the system default TimeZone else. This is effectively a
+	 * or the system default TimeZone otherwise. This is effectively a
 	 * replacement for {@link java.util.TimeZone#getDefault()},
 	 * able to optionally respect a user-level TimeZone setting.
-	 * <p>Note: This method has a fallback to the system default Locale.
+	 * <p>Note: This method has a fallback to the system default TimeZone.
 	 * If you'd like to check for the raw LocaleContext content
 	 * (which may indicate no specific time zone through {@code null}, use
 	 * {@link #getLocaleContext()} and call {@link TimeZoneAwareLocaleContext#getTimeZone()}

spring-core/src/main/java/org/springframework/core/Conventions.java

@@ -281,7 +281,7 @@ private static String pluralize(String name) {
 
 	/**
 	 * Retrieves the {@code Class} of an element in the {@code Collection}.
-	 * The exact element for which the {@code Class} is retreived will depend
+	 * The exact element for which the {@code Class} is retrieved will depend
 	 * on the concrete {@code Collection} implementation.
 	 */
 	private static <E> E peekAhead(Collection<E> collection) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 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.
@@ -36,18 +36,21 @@ final class CollectionToStringConverter implements ConditionalGenericConverter {
 
 	private final ConversionService conversionService;
 
+
 	public CollectionToStringConverter(ConversionService conversionService) {
 		this.conversionService = conversionService;
 	}
 
+
 	@Override
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Collection.class, String.class));
 	}
 
 	@Override
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
-		return ConversionUtils.canConvertElements(sourceType.getElementTypeDescriptor(), targetType, this.conversionService);
+		return ConversionUtils.canConvertElements(
+				sourceType.getElementTypeDescriptor(), targetType, this.conversionService);
 	}
 
 	@Override
@@ -56,7 +59,7 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 			return null;
 		}
 		Collection<?> sourceCollection = (Collection<?>) source;
-		if (sourceCollection.size() == 0) {
+		if (sourceCollection.isEmpty()) {
 			return "";
 		}
 		StringBuilder sb = new StringBuilder();
@@ -65,7 +68,8 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 			if (i > 0) {
 				sb.append(DELIMITER);
 			}
-			Object targetElement = this.conversionService.convert(sourceElement, sourceType.elementTypeDescriptor(sourceElement), targetType);
+			Object targetElement = this.conversionService.convert(
+					sourceElement, sourceType.elementTypeDescriptor(sourceElement), targetType);
 			sb.append(targetElement);
 			i++;
 		}

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

@@ -138,14 +138,14 @@ public void removeConvertible(Class<?> sourceType, Class<?> targetType) {
 
 	@Override
 	public boolean canConvert(Class<?> sourceType, Class<?> targetType) {
-		Assert.notNull(targetType, "targetType to convert to cannot be null");
+		Assert.notNull(targetType, "Target type to convert to cannot be null");
 		return canConvert((sourceType != null ? TypeDescriptor.valueOf(sourceType) : null),
 				TypeDescriptor.valueOf(targetType));
 	}
 
 	@Override
 	public boolean canConvert(TypeDescriptor sourceType, TypeDescriptor targetType) {
-		Assert.notNull(targetType, "targetType to convert to cannot be null");
+		Assert.notNull(targetType, "Target type to convert to cannot be null");
 		if (sourceType == null) {
 			return true;
 		}
@@ -154,9 +154,9 @@ public boolean canConvert(TypeDescriptor sourceType, TypeDescriptor targetType)
 	}
 
 	/**
-	 * Return whether conversion between the sourceType and targetType can be bypassed.
+	 * Return whether conversion between the source type and the target type can be bypassed.
 	 * <p>More precisely, this method will return true if objects of sourceType can be
-	 * converted to the targetType by returning the source object unchanged.
+	 * converted to the target type by returning the source object unchanged.
 	 * @param sourceType context about the source type to convert from
 	 * (may be {@code null} if source is {@code null})
 	 * @param targetType context about the target type to convert to (required)
@@ -165,7 +165,7 @@ public boolean canConvert(TypeDescriptor sourceType, TypeDescriptor targetType)
 	 * @since 3.2
 	 */
 	public boolean canBypassConvert(TypeDescriptor sourceType, TypeDescriptor targetType) {
-		Assert.notNull(targetType, "targetType to convert to cannot be null");
+		Assert.notNull(targetType, "Target type to convert to cannot be null");
 		if (sourceType == null) {
 			return true;
 		}
@@ -176,20 +176,20 @@ public boolean canBypassConvert(TypeDescriptor sourceType, TypeDescriptor target
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T convert(Object source, Class<T> targetType) {
-		Assert.notNull(targetType, "targetType to convert to cannot be null");
+		Assert.notNull(targetType, "Target type to convert to cannot be null");
 		return (T) convert(source, TypeDescriptor.forObject(source), TypeDescriptor.valueOf(targetType));
 	}
 
 	@Override
 	public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
-		Assert.notNull(targetType, "targetType to convert to cannot be null");
+		Assert.notNull(targetType, "Target type to convert to cannot be null");
 		if (sourceType == null) {
-			Assert.isTrue(source == null, "source must be [null] if sourceType == [null]");
+			Assert.isTrue(source == null, "Source must be [null] if source type == [null]");
 			return handleResult(null, targetType, convertNullSource(null, targetType));
 		}
 		if (source != null && !sourceType.getObjectType().isInstance(source)) {
-			throw new IllegalArgumentException("source to convert from must be an instance of " +
-					sourceType + "; instead it was a " + source.getClass().getName());
+			throw new IllegalArgumentException("Source to convert from must be an instance of [" +
+					sourceType + "]; instead it was a [" + source.getClass().getName() + "]");
 		}
 		GenericConverter converter = getConverter(sourceType, targetType);
 		if (converter != null) {
@@ -201,9 +201,9 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 
 	/**
 	 * Convenience operation for converting a source object to the specified targetType,
-	 * where the targetType is a descriptor that provides additional conversion context.
+	 * where the target type is a descriptor that provides additional conversion context.
 	 * Simply delegates to {@link #convert(Object, TypeDescriptor, TypeDescriptor)} and
-	 * encapsulates the construction of the sourceType descriptor using
+	 * encapsulates the construction of the source type descriptor using
 	 * {@link TypeDescriptor#forObject(Object)}.
 	 * @param source the source object
 	 * @param targetType the target type
@@ -230,8 +230,8 @@ public String toString() {
 	 * {@link java.util.Optional#empty()} instance if the target type is
 	 * {@code java.util.Optional}. Subclasses may override this to return
 	 * custom {@code null} objects for specific target types.
-	 * @param sourceType the sourceType to convert from
-	 * @param targetType the targetType to convert to
+	 * @param sourceType the source type to convert from
+	 * @param targetType the target type to convert to
 	 * @return the converted null object
 	 */
 	protected Object convertNullSource(TypeDescriptor sourceType, TypeDescriptor targetType) {
@@ -275,7 +275,7 @@ protected GenericConverter getConverter(TypeDescriptor sourceType, TypeDescripto
 
 	/**
 	 * Return the default converter if no converter is found for the given sourceType/targetType pair.
-	 * <p>Returns a NO_OP Converter if the sourceType is assignable to the targetType.
+	 * <p>Returns a NO_OP Converter if the source type is assignable to the target type.
 	 * Returns {@code null} otherwise, indicating no suitable converter could be found.
 	 * @param sourceType the source type to convert from
 	 * @param targetType the target type to convert to

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 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.
@@ -68,13 +68,13 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 		else if (source instanceof Optional) {
 			return source;
 		}
-		else if (targetType.getResolvableType() == null) {
-			return Optional.of(source);
-		}
-		else {
+		else if (targetType.getResolvableType() != null) {
 			Object target = this.conversionService.convert(source, sourceType, new GenericTypeDescriptor(targetType));
 			return Optional.ofNullable(target);
 		}
+		else {
+			return Optional.of(source);
+		}
 	}
 
 

spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTestCase.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 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,7 +19,6 @@
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.net.Socket;
-
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.stream.XMLStreamException;
@@ -30,7 +29,6 @@
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
-
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
@@ -58,11 +56,13 @@ public abstract class AbstractStaxHandlerTestCase {
 
 	private XMLReader xmlReader;
 
+
 	@Before
 	public void createXMLReader() throws Exception {
 		xmlReader = XMLReaderFactory.createXMLReader();
 	}
 
+
 	@Test
 	public void noNamespacePrefixes() throws Exception {
 		Assume.assumeTrue(wwwSpringframeworkOrgIsAccessible());
@@ -109,8 +109,7 @@ public void namespacePrefixes() throws Exception {
 
 	@Test
 	public void noNamespacePrefixesDom() throws Exception {
-		DocumentBuilderFactory documentBuilderFactory =
-				DocumentBuilderFactory.newInstance();
+		DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
 		documentBuilderFactory.setNamespaceAware(true);
 		DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
 
@@ -131,8 +130,7 @@ public void noNamespacePrefixesDom() throws Exception {
 
 	@Test
 	public void namespacePrefixesDom() throws Exception {
-		DocumentBuilderFactory documentBuilderFactory =
-				DocumentBuilderFactory.newInstance();
+		DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
 		documentBuilderFactory.setNamespaceAware(true);
 		DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
 

spring-core/src/test/java/org/springframework/util/xml/StaxEventHandlerTests.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.
@@ -27,8 +27,7 @@
 public class StaxEventHandlerTests extends AbstractStaxHandlerTestCase {
 
 	@Override
-	protected AbstractStaxHandler createStaxHandler(Result result)
-			throws XMLStreamException {
+	protected AbstractStaxHandler createStaxHandler(Result result) throws XMLStreamException {
 		XMLOutputFactory outputFactory = XMLOutputFactory.newFactory();
 		XMLEventWriter eventWriter = outputFactory.createXMLEventWriter(result);
 		return new StaxEventHandler(eventWriter);

spring-core/src/test/java/org/springframework/util/xml/StaxStreamHandlerTests.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.
@@ -27,8 +27,7 @@
 public class StaxStreamHandlerTests extends AbstractStaxHandlerTestCase {
 
 	@Override
-	protected AbstractStaxHandler createStaxHandler(Result result)
-			throws XMLStreamException {
+	protected AbstractStaxHandler createStaxHandler(Result result) throws XMLStreamException {
 		XMLOutputFactory outputFactory = XMLOutputFactory.newFactory();
 		XMLStreamWriter streamWriter = outputFactory.createXMLStreamWriter(result);
 		return new StaxStreamHandler(streamWriter);

spring-oxm/src/main/java/org/springframework/oxm/Marshaller.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 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.
@@ -35,15 +35,15 @@
 public interface Marshaller {
 
 	/**
-	 * Indicates whether this marshaller can marshal instances of the supplied type.
+	 * Indicate whether this marshaller can marshal instances of the supplied type.
 	 * @param clazz the class that this marshaller is being asked if it can marshal
 	 * @return {@code true} if this marshaller can indeed marshal instances of the supplied class;
 	 * {@code false} otherwise
 	 */
 	boolean supports(Class<?> clazz);
 
 	/**
-	 * Marshals the object graph with the given root into the provided {@link Result}.
+	 * Marshal the object graph with the given root into the provided {@link Result}.
 	 * @param graph the root of the object graph to marshal
 	 * @param result the result to marshal to
 	 * @throws IOException if an I/O error occurs

spring-oxm/src/main/java/org/springframework/oxm/Unmarshaller.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 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.
@@ -30,15 +30,15 @@
 public interface Unmarshaller {
 
 	/**
-	 * Indicates whether this unmarshaller can unmarshal instances of the supplied type.
+	 * Indicate whether this unmarshaller can unmarshal instances of the supplied type.
 	 * @param clazz the class that this unmarshaller is being asked if it can marshal
 	 * @return {@code true} if this unmarshaller can indeed unmarshal to the supplied class;
 	 * {@code false} otherwise
 	 */
 	boolean supports(Class<?> clazz);
 
 	/**
-	 * Unmarshals the given {@link Source} into an object graph.
+	 * Unmarshal the given {@link Source} into an object graph.
 	 * @param source the source to marshal from
 	 * @return the object graph
 	 * @throws IOException if an I/O error occurs