DATACMNS-1240 - Update copyright years to 2018.

Also, remove some trailing whitespaces and align outdated license header format.

src/main/java/org/springframework/data/config/BeanComponentDefinitionBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 the original author or authors.
+ * Copyright 2012-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.
@@ -26,7 +26,7 @@ import org.w3c.dom.Element;
 
 /**
  * Helper to create {@link BeanComponentDefinition} more easily.
- * 
+ *
  * @author Oliver Gierke
  */
 public class BeanComponentDefinitionBuilder {
@@ -37,7 +37,7 @@ public class BeanComponentDefinitionBuilder {
 	/**
 	 * Creates a new {@link BeanComponentDefinitionBuilder} using the given {@link Element} as default source and the
 	 * given {@link ParserContext}.
-	 * 
+	 *
 	 * @param defaultSource must not be {@literal null}.
 	 * @param context must not be {@literal null}.
 	 */
@@ -52,7 +52,7 @@ public class BeanComponentDefinitionBuilder {
 
 	/**
 	 * Creates a {@link BeanComponentDefinition} from the given {@link BeanDefinitionBuilder}. Will generate a bean name.
-	 * 
+	 *
 	 * @param builder must not be {@literal null}.
 	 * @return
 	 */
@@ -69,7 +69,7 @@ public class BeanComponentDefinitionBuilder {
 	/**
 	 * Creates a {@link BeanComponentDefinition} from the given {@link BeanDefinitionBuilder} and inspects the backing
 	 * {@link Element}s id attribute for a name. It will use this one if found or the given fallback if not.
-	 * 
+	 *
 	 * @param builder must not be {@literal null}.
 	 * @param fallback must not be {@literal null} or empty.
 	 * @return
@@ -84,7 +84,7 @@ public class BeanComponentDefinitionBuilder {
 
 	/**
 	 * Creates a {@link BeanComponentDefinition} from the given {@link BeanDefinitionBuilder} using the given name.
-	 * 
+	 *
 	 * @param builder must not be {@literal null}.
 	 * @param name must not be {@literal null} or empty.
 	 * @return
@@ -96,7 +96,7 @@ public class BeanComponentDefinitionBuilder {
 	/**
 	 * Creates a new {@link BeanComponentDefinition} from the given {@link BeanDefinitionBuilder} using the given name and
 	 * raw source object.
-	 * 
+	 *
 	 * @param builder must not be {@literal null}.
 	 * @param name must not be {@literal null}.
 	 * @param rawSource

src/main/java/org/springframework/data/config/ConfigurationUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-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.
@@ -23,7 +23,7 @@ import org.springframework.util.Assert;
 /**
  * Helper class to centralize common functionality that needs to be used in various places of the configuration
  * implementation.
- * 
+ *
  * @author Oliver Gierke
  * @since 2.0
  * @soundtrack Richard Spaven - The Self (feat. Jordan Rakei)
@@ -32,7 +32,7 @@ public interface ConfigurationUtils {
 
 	/**
 	 * Returns the {@link ResourceLoader} from the given {@link XmlReaderContext}.
-	 * 
+	 *
 	 * @param context must not be {@literal null}.
 	 * @return
 	 * @throws IllegalArgumentException if no {@link ResourceLoader} can be obtained from the {@link XmlReaderContext}.
@@ -52,7 +52,7 @@ public interface ConfigurationUtils {
 
 	/**
 	 * Returns the {@link ClassLoader} used by the given {@link XmlReaderContext}.
-	 * 
+	 *
 	 * @param context must not be {@literal null}.
 	 * @return
 	 * @throws IllegalArgumentException if no {@link ClassLoader} can be obtained from the given {@link XmlReaderContext}.
@@ -63,7 +63,7 @@ public interface ConfigurationUtils {
 
 	/**
 	 * Returns the {@link ClassLoader} used by the given {@link ResourceLoader}.
-	 * 
+	 *
 	 * @param resourceLoader must not be {@literal null}.
 	 * @return
 	 * @throws IllegalArgumentException if the given {@link ResourceLoader} does not expose a {@link ClassLoader}.
@@ -83,7 +83,7 @@ public interface ConfigurationUtils {
 
 	/**
 	 * Returns the bean class name of the given {@link BeanDefinition}.
-	 * 
+	 *
 	 * @param beanDefinition must not be {@literal null}.
 	 * @return
 	 * @throws IllegalArgumentException if the given {@link BeanDefinition} does not contain a bean class name.

src/main/java/org/springframework/data/config/ParsingUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 the original author or authors.
+ * Copyright 2011-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.
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
 
 /**
  * Utility methods for {@link BeanDefinitionParser} implementations.
- * 
+ *
  * @author Oliver Gierke
  * @author Mark Paluch
  */
@@ -41,7 +41,7 @@ public abstract class ParsingUtils {
 	/**
 	 * Configures a property value for the given property name reading the attribute of the given name from the given
 	 * {@link Element} if the attribute is configured.
-	 * 
+	 *
 	 * @param builder must not be {@literal null}.
 	 * @param element must not be {@literal null}.
 	 * @param attrName must not be {@literal null} or empty.
@@ -65,7 +65,7 @@ public abstract class ParsingUtils {
 	/**
 	 * Sets the property with the given attribute name on the given {@link BeanDefinitionBuilder} to the value of the
 	 * attribute with the given name if the attribute is configured.
-	 * 
+	 *
 	 * @param builder must not be {@literal null}.
 	 * @param element must not be {@literal null}.
 	 * @param attribute must not be {@literal null} or empty.
@@ -76,7 +76,7 @@ public abstract class ParsingUtils {
 
 	/**
 	 * Configures a bean property reference with the value of the attribute of the given name if it is configured.
-	 * 
+	 *
 	 * @param builder must not be {@literal null}.
 	 * @param element must not be {@literal null}.
 	 * @param attribute must not be {@literal null} or empty.
@@ -100,7 +100,7 @@ public abstract class ParsingUtils {
 	/**
 	 * Returns the {@link BeanDefinition} built by the given {@link BeanDefinitionBuilder} enriched with source
 	 * information derived from the given {@link Element}.
-	 * 
+	 *
 	 * @param builder must not be {@literal null}.
 	 * @param context must not be {@literal null}.
 	 * @param element must not be {@literal null}.
@@ -117,7 +117,7 @@ public abstract class ParsingUtils {
 
 	/**
 	 * Returns the {@link AbstractBeanDefinition} built by the given builder with the given extracted source applied.
-	 * 
+	 *
 	 * @param builder must not be {@literal null}.
 	 * @param source
 	 * @return
@@ -134,7 +134,7 @@ public abstract class ParsingUtils {
 	/**
 	 * Returns a {@link BeanDefinition} for an {@link ObjectFactoryCreatingFactoryBean} pointing to the bean with the
 	 * given name.
-	 * 
+	 *
 	 * @param targetBeanName must not be {@literal null} or empty.
 	 * @param source
 	 * @return

src/main/java/org/springframework/data/config/TypeFilterParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 the original author or authors.
+ * Copyright 2010-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.
@@ -39,7 +39,7 @@ import org.w3c.dom.NodeList;
 /**
  * Parser to populate the given {@link ClassPathScanningCandidateComponentProvider} with {@link TypeFilter}s parsed from
  * the given {@link Element}'s children.
- * 
+ *
  * @author Oliver Gierke
  */
 public class TypeFilterParser {
@@ -52,7 +52,7 @@ public class TypeFilterParser {
 
 	/**
 	 * Creates a new {@link TypeFilterParser} with the given {@link ReaderContext}.
-	 * 
+	 *
 	 * @param readerContext must not be {@literal null}.
 	 */
 	public TypeFilterParser(XmlReaderContext readerContext) {
@@ -62,7 +62,7 @@ public class TypeFilterParser {
 	/**
 	 * Constructor to ease testing as {@link XmlReaderContext#getBeanClassLoader()} is final and thus cannot be mocked
 	 * easily.
-	 * 
+	 *
 	 * @param readerContext must not be {@literal null}.
 	 * @param classLoader must not be {@literal null}.
 	 */
@@ -78,7 +78,7 @@ public class TypeFilterParser {
 	/**
 	 * Returns all {@link TypeFilter} declared in nested elements of the given {@link Element}. Allows to selectively
 	 * retrieve including or excluding filters based on the given {@link Type}.
-	 * 
+	 *
 	 * @param element must not be {@literal null}.
 	 * @param type must not be {@literal null}.
 	 * @return
@@ -109,7 +109,7 @@ public class TypeFilterParser {
 
 	/**
 	 * Creates a {@link TypeFilter} instance from the given {@link Element} and {@link ClassLoader}.
-	 * 
+	 *
 	 * @param element must not be {@literal null}.
 	 * @param classLoader must not be {@literal null}.
 	 * @return
@@ -132,7 +132,7 @@ public class TypeFilterParser {
 	/**
 	 * Enum representing all the filter types available for {@code include} and {@code exclude} elements. This acts as
 	 * factory for {@link TypeFilter} instances.
-	 * 
+	 *
 	 * @author Oliver Gierke
 	 * @see #getFilter(String, ClassLoader)
 	 */
@@ -182,7 +182,7 @@ public class TypeFilterParser {
 
 		/**
 		 * Returns the {@link TypeFilter} for the given expression and {@link ClassLoader}.
-		 * 
+		 *
 		 * @param expression
 		 * @param classLoader
 		 * @return
@@ -192,7 +192,7 @@ public class TypeFilterParser {
 
 		/**
 		 * Returns the {@link FilterType} for the given type as {@link String}.
-		 * 
+		 *
 		 * @param typeString
 		 * @return
 		 * @throws IllegalArgumentException if no {@link FilterType} could be found for the given argument.
@@ -222,7 +222,7 @@ public class TypeFilterParser {
 		/**
 		 * Returns the {@link Element} if the given {@link Node} is an {@link Element} and it's name equals the one of the
 		 * type.
-		 * 
+		 *
 		 * @param node
 		 * @return
 		 */