DATACMNS-1240 - Update copyright years to 2018.

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

src/main/java/org/springframework/data/convert/ClassGeneratingEntityInstantiator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2017 the original author or authors.
+ * Copyright 2015-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.
@@ -447,7 +447,7 @@ public class ClassGeneratingEntityInstantiator implements EntityInstantiator {
 
 		/**
 		 * Insert not-{@literal null} assertion for a parameter.
-		 * 
+		 *
 		 * @param mv the method visitor into which instructions should be inserted
 		 * @param parameterName name of the parameter to create the appropriate assertion message.
 		 */

src/main/java/org/springframework/data/convert/ConfigurableTypeInformationMapper.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.

src/main/java/org/springframework/data/convert/ConverterBuilder.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.
@@ -27,7 +27,7 @@ import org.springframework.util.Assert;
  * API to easily set up {@link GenericConverter} instances using Java 8 lambdas, mostly in bidirectional fashion for
  * easy registration as custom type converters of the Spring Data mapping subsystem. The registration starts either with
  * the definition of a reading or writing converter that can then be completed.
- * 
+ *
  * @author Oliver Gierke
  * @since 2.0
  * @see #reading(Class, Class, Function)
@@ -39,7 +39,7 @@ public interface ConverterBuilder {
 	/**
 	 * Creates a new {@link ReadingConverterBuilder} to produce a converter to read values of the given source (the store
 	 * type) into the given target (the domain type).
-	 * 
+	 *
 	 * @param source must not be {@literal null}.
 	 * @param target must not be {@literal null}.
 	 * @param function must not be {@literal null}.
@@ -58,7 +58,7 @@ public interface ConverterBuilder {
 	/**
 	 * Creates a new {@link WritingConverterBuilder} to produce a converter to write values of the given source (the
 	 * domain type) into the given target (the store type).
-	 * 
+	 *
 	 * @param source must not be {@literal null}.
 	 * @param target must not be {@literal null}.
 	 * @param function must not be {@literal null}.
@@ -76,7 +76,7 @@ public interface ConverterBuilder {
 
 	/**
 	 * Returns all {@link GenericConverter} instances to be registered for the current {@link ConverterBuilder}.
-	 * 
+	 *
 	 * @return
 	 */
 	Set<GenericConverter> getConverters();
@@ -91,7 +91,7 @@ public interface ConverterBuilder {
 
 		/**
 		 * Returns the writing converter already created.
-		 * 
+		 *
 		 * @return
 		 */
 		GenericConverter getWritingConverter();
@@ -107,7 +107,7 @@ public interface ConverterBuilder {
 
 		/**
 		 * Returns the reading converter already created.
-		 * 
+		 *
 		 * @return
 		 */
 		GenericConverter getReadingConverter();
@@ -123,7 +123,7 @@ public interface ConverterBuilder {
 
 		/**
 		 * Creates a new {@link ConverterAware} by registering the given {@link Function} to add a write converter.
-		 * 
+		 *
 		 * @param function must not be {@literal null}.
 		 * @return
 		 */
@@ -140,7 +140,7 @@ public interface ConverterBuilder {
 
 		/**
 		 * Creates a new {@link ConverterAware} by registering the given {@link Function} to add a write converter.
-		 * 
+		 *
 		 * @param function must not be {@literal null}.
 		 * @return
 		 */

src/main/java/org/springframework/data/convert/CustomConversions.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.

src/main/java/org/springframework/data/convert/DefaultConverterBuilder.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.
@@ -42,7 +42,7 @@ import org.springframework.lang.Nullable;
 /**
  * Builder to easily set up (bi-directional) {@link Converter} instances for Spring Data type mapping using Lambdas. Use
  * factory methods on {@link ConverterBuilder} to create instances of this class.
- * 
+ *
  * @author Oliver Gierke
  * @since 2.0
  * @see ConverterBuilder#writing(Class, Class, Function)
@@ -58,7 +58,7 @@ class DefaultConverterBuilder<S, T>
 	private final @NonNull Optional<Function<? super S, ? extends T>> writing;
 	private final @NonNull Optional<Function<? super T, ? extends S>> reading;
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.convert.WritingConverterBuilder#andReading(java.util.function.Function)
 	 */
@@ -67,7 +67,7 @@ class DefaultConverterBuilder<S, T>
 		return withReading(Optional.of(function));
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.convert.ReadingConverterBuilder#andWriting(java.util.function.Function)
 	 */
@@ -76,7 +76,7 @@ class DefaultConverterBuilder<S, T>
 		return withWriting(Optional.of(function));
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.convert.ReadingConverterBuilder#getRequiredReadingConverter()
 	 */
@@ -86,7 +86,7 @@ class DefaultConverterBuilder<S, T>
 				.orElseThrow(() -> new IllegalStateException("No reading converter specified!"));
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.convert.WritingConverterBuilder#getRequiredWritingConverter()
 	 */
@@ -127,7 +127,7 @@ class DefaultConverterBuilder<S, T>
 		private final ConvertiblePair convertiblePair;
 		private final Function<? super S, ? extends T> function;
 
-		/* 
+		/*
 		 * (non-Javadoc)
 		 * @see org.springframework.core.convert.converter.GenericConverter#convert(java.lang.Object, org.springframework.core.convert.TypeDescriptor, org.springframework.core.convert.TypeDescriptor)
 		 */
@@ -138,7 +138,7 @@ class DefaultConverterBuilder<S, T>
 			return function.apply((S) source);
 		}
 
-		/* 
+		/*
 		 * (non-Javadoc)
 		 * @see org.springframework.core.convert.converter.GenericConverter#getConvertibleTypes()
 		 */

src/main/java/org/springframework/data/convert/DefaultTypeMapper.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.

src/main/java/org/springframework/data/convert/EntityConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2012 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.
@@ -23,7 +23,7 @@ import org.springframework.data.mapping.context.MappingContext;
 /**
  * Combined {@link EntityReader} and {@link EntityWriter} and add the ability to access a {@link MappingContext} and
  * {@link ConversionService}.
- * 
+ *
  * @param <E> the concrete {@link PersistentEntity} implementation the converter is based on.
  * @param <P> the concrete {@link PersistentProperty} implementation the converter is based on.
  * @param <T> the most common type the {@link EntityConverter} can actually convert.
@@ -35,14 +35,14 @@ public interface EntityConverter<E extends PersistentEntity<?, P>, P extends Per
 
 	/**
 	 * Returns the underlying {@link MappingContext} used by the converter.
-	 * 
+	 *
 	 * @return never {@literal null}
 	 */
 	MappingContext<? extends E, P> getMappingContext();
 
 	/**
 	 * Returns the underlying {@link ConversionService} used by the converter.
-	 * 
+	 *
 	 * @return never {@literal null}.
 	 */
 	ConversionService getConversionService();

src/main/java/org/springframework/data/convert/EntityInstantiator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 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.
@@ -21,14 +21,14 @@ import org.springframework.data.mapping.model.ParameterValueProvider;
 
 /**
  * SPI to abstract strategies to create instances for {@link PersistentEntity}s.
- * 
+ *
  * @author Oliver Gierke
  */
 public interface EntityInstantiator {
 
 	/**
 	 * Creates a new instance of the given entity using the given source to pull data from.
-	 * 
+	 *
 	 * @param entity will not be {@literal null}.
 	 * @param provider will not be {@literal null}.
 	 * @return

src/main/java/org/springframework/data/convert/EntityInstantiators.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 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.

src/main/java/org/springframework/data/convert/EntityReader.java

@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * 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.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,14 +17,14 @@ package org.springframework.data.convert;
 
 /**
  * Interface to read object from store specific sources.
- * 
+ *
  * @author Oliver Gierke
  */
 public interface EntityReader<T, S> {
 
 	/**
 	 * Reads the given source into the given type.
-	 * 
+	 *
 	 * @param type they type to convert the given source to.
 	 * @param source the source to create an object of the given type from.
 	 * @return

src/main/java/org/springframework/data/convert/EntityWriter.java

@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * 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.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,7 @@ package org.springframework.data.convert;
 
 /**
  * Interface to write objects into store specific sinks.
- * 
+ *
  * @param <T> the entity type the converter can handle
  * @param <S> the store specific sink the converter is able to write to
  * @author Oliver Gierke

src/main/java/org/springframework/data/convert/JodaTimeConverters.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.

src/main/java/org/springframework/data/convert/Jsr310Converters.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -40,7 +40,7 @@ import org.springframework.util.ClassUtils;
 
 /**
  * Helper class to register JSR-310 specific {@link Converter} implementations in case the we're running on Java 8.
- * 
+ *
  * @author Oliver Gierke
  * @author Barak Schoster
  * @author Christoph Strobl
@@ -52,7 +52,7 @@ public abstract class Jsr310Converters {
 
 	/**
 	 * Returns the converters to be registered. Will only return converters in case we're running on Java 8.
-	 * 
+	 *
 	 * @return
 	 */
 	public static Collection<Converter<?, ?>> getConvertersToRegister() {

src/main/java/org/springframework/data/convert/KotlinClassGeneratingEntityInstantiator.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.

src/main/java/org/springframework/data/convert/MappingContextTypeInformationMapper.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.

src/main/java/org/springframework/data/convert/ReadingConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 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.
@@ -27,7 +27,7 @@ import org.springframework.core.convert.converter.Converter;
 /**
  * Annotation to clarify intended usage of a {@link Converter} as reading converter in case the conversion types leave
  * room for disambiguation.
- * 
+ *
  * @author Oliver Gierke
  */
 @Target(TYPE)

src/main/java/org/springframework/data/convert/ReflectionEntityInstantiator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 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.

src/main/java/org/springframework/data/convert/SimpleTypeInformationMapper.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.

src/main/java/org/springframework/data/convert/ThreeTenBackPortConverters.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2017 the original author or authors.
+ * Copyright 2015-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.
@@ -40,7 +40,7 @@ import org.threeten.bp.ZoneId;
 /**
  * Helper class to register {@link Converter} implementations for the ThreeTen Backport project in case it's present on
  * the classpath.
- * 
+ *
  * @author Oliver Gierke
  * @author Christoph Strobl
  * @see <a href="http://www.threeten.org/threetenbp">http://www.threeten.org/threetenbp</a>
@@ -53,7 +53,7 @@ public abstract class ThreeTenBackPortConverters {
 
 	/**
 	 * Returns the converters to be registered. Will only return converters in case we're running on Java 8.
-	 * 
+	 *
 	 * @return
 	 */
 	public static Collection<Converter<?, ?>> getConvertersToRegister() {
@@ -93,7 +93,7 @@ public abstract class ThreeTenBackPortConverters {
 
 		INSTANCE;
 
-		/* 
+		/*
 		 * (non-Javadoc)
 		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
 		 */

src/main/java/org/springframework/data/convert/TypeAliasAccessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 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.
@@ -19,14 +19,14 @@ import org.springframework.data.mapping.Alias;
 
 /**
  * Interface to abstract implementations of how to access a type alias from a given source or sink.
- * 
+ *
  * @author Oliver Gierke
  */
 public interface TypeAliasAccessor<S> {
 
 	/**
 	 * Reads the type alias to be used from the given source.
-	 * 
+	 *
 	 * @param source
 	 * @return can be {@literal null} in case no alias was found.
 	 */
@@ -34,7 +34,7 @@ public interface TypeAliasAccessor<S> {
 
 	/**
 	 * Writes the given type alias to the given sink.
-	 * 
+	 *
 	 * @param sink
 	 * @param alias
 	 */

src/main/java/org/springframework/data/convert/TypeInformationMapper.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.

src/main/java/org/springframework/data/convert/TypeMapper.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.

src/main/java/org/springframework/data/convert/WritingConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 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.
@@ -27,7 +27,7 @@ import org.springframework.core.convert.converter.Converter;
 /**
  * Annotation to clarify intended usage of a {@link Converter} as writing converter in case the conversion types leave
  * room for disambiguation.
- * 
+ *
  * @author Oliver Gierke
  */
 @Target(TYPE)