DATACMNS-1240 - Update copyright years to 2018.

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

src/main/java/org/springframework/data/projection/Accessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the original author or authors.
+ * Copyright 2016-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.
@@ -36,7 +36,7 @@ public final class Accessor {
 
 	/**
 	 * Creates an {@link Accessor} for the given {@link Method}.
-	 * 
+	 *
 	 * @param method must not be {@literal null}.
 	 * @throws IllegalArgumentException in case the given method is not an accessor method.
 	 */
@@ -56,7 +56,7 @@ public final class Accessor {
 
 	/**
 	 * Returns whether the accessor is a getter.
-	 * 
+	 *
 	 * @return
 	 */
 	public boolean isGetter() {
@@ -65,7 +65,7 @@ public final class Accessor {
 
 	/**
 	 * Returns whether the accessor is a setter.
-	 * 
+	 *
 	 * @return
 	 */
 	public boolean isSetter() {
@@ -74,7 +74,7 @@ public final class Accessor {
 
 	/**
 	 * Returns the name of the property this accessor handles.
-	 * 
+	 *
 	 * @return will never be {@literal null}.
 	 */
 	public String getPropertyName() {

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

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

src/main/java/org/springframework/data/projection/MapAccessingMethodInterceptor.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.
@@ -29,7 +29,7 @@ import org.springframework.util.ReflectionUtils;
 
 /**
  * {@link MethodInterceptor} to support accessor methods to store and retrieve values from a {@link Map}.
- * 
+ *
  * @author Oliver Gierke
  * @since 1.10
  */

src/main/java/org/springframework/data/projection/MethodInterceptorFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-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,7 +21,7 @@ import org.aopalliance.intercept.MethodInterceptor;
  * SPI to create {@link MethodInterceptor} instances based on the given source object and the target type to produce. To
  * be registered with a {@link ProxyProjectionFactory} to customize the way method executions on projection proxies are
  * handled.
- * 
+ *
  * @author Oliver Gierke
  * @see ProxyProjectionFactory
  * @soundtrack Henrik Freischlader Trio - Nobody Else To Blame (Openness)
@@ -31,7 +31,7 @@ public interface MethodInterceptorFactory {
 
 	/**
 	 * Returns the {@link MethodInterceptor} to be used for the given source object and target type.
-	 * 
+	 *
 	 * @param source will never be {@literal null}.
 	 * @param targetType will never be {@literal null}.
 	 * @return
@@ -41,7 +41,7 @@ public interface MethodInterceptorFactory {
 	/**
 	 * Returns whether the current factory is supposed to be used to create a {@link MethodInterceptor} for proxy of the
 	 * given target type.
-	 * 
+	 *
 	 * @param source will never be {@literal null}.
 	 * @param targetType will never be {@literal null}.
 	 * @return

src/main/java/org/springframework/data/projection/ProjectingMethodInterceptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-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.util.ObjectUtils;
 /**
  * {@link MethodInterceptor} to delegate the invocation to a different {@link MethodInterceptor} but creating a
  * projecting proxy in case the returned value is not of the return type of the invoked method.
- * 
+ *
  * @author Oliver Gierke
  * @since 1.10
  */
@@ -53,7 +53,7 @@ class ProjectingMethodInterceptor implements MethodInterceptor {
 	private final @NonNull MethodInterceptor delegate;
 	private final @NonNull ConversionService conversionService;
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation)
 	 */
@@ -84,7 +84,7 @@ class ProjectingMethodInterceptor implements MethodInterceptor {
 	/**
 	 * Creates projections of the given {@link Collection}'s elements if necessary and returns a new collection containing
 	 * the projection results.
-	 * 
+	 *
 	 * @param sources must not be {@literal null}.
 	 * @param type must not be {@literal null}.
 	 * @return
@@ -109,7 +109,7 @@ class ProjectingMethodInterceptor implements MethodInterceptor {
 	/**
 	 * Creates projections of the given {@link Map}'s values if necessary and returns an new {@link Map} with the handled
 	 * values.
-	 * 
+	 *
 	 * @param sources must not be {@literal null}.
 	 * @param type must not be {@literal null}.
 	 * @return
@@ -134,7 +134,7 @@ class ProjectingMethodInterceptor implements MethodInterceptor {
 	/**
 	 * Returns whether the source object needs to be converted to the given target type and whether we can convert it at
 	 * all.
-	 * 
+	 *
 	 * @param source can be {@literal null}.
 	 * @param targetType must not be {@literal null}.
 	 * @return
@@ -151,7 +151,7 @@ class ProjectingMethodInterceptor implements MethodInterceptor {
 	/**
 	 * Turns the given value into a {@link Collection}. Will turn an array into a collection an wrap all other values into
 	 * a single-element collection.
-	 * 
+	 *
 	 * @param source must not be {@literal null}.
 	 * @return
 	 */

src/main/java/org/springframework/data/projection/ProjectionFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-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.
@@ -20,7 +20,7 @@ import org.springframework.lang.Nullable;
 /**
  * A factory to create projecting instances for other objects usually used to allow easy creation of representation
  * projections to define which properties of a domain objects shall be exported in which way.
- * 
+ *
  * @author Oliver Gierke
  * @since 1.10
  */
@@ -29,7 +29,7 @@ public interface ProjectionFactory {
 	/**
 	 * Creates a projection of the given type for the given source object. The individual mapping strategy is defined by
 	 * the implementations.
-	 * 
+	 *
 	 * @param projectionType the type to create, must not be {@literal null}.
 	 * @param source the object to create a projection for, must not be {@literal null}.
 	 * @return
@@ -38,7 +38,7 @@ public interface ProjectionFactory {
 
 	/**
 	 * Creates a projection to the given type for the given nullable source.
-	 * 
+	 *
 	 * @param projectionType must not be {@literal null}.
 	 * @param source can be {@literal null}.
 	 * @return
@@ -50,7 +50,7 @@ public interface ProjectionFactory {
 
 	/**
 	 * Creates a projection instance for the given type.
-	 * 
+	 *
 	 * @param projectionType the type to create, must not be {@literal null}.
 	 * @return
 	 */
@@ -58,7 +58,7 @@ public interface ProjectionFactory {
 
 	/**
 	 * Returns the {@link ProjectionInformation} for the given projection type.
-	 * 
+	 *
 	 * @param projectionType must not be {@literal null}.
 	 * @return
 	 * @since 1.12

src/main/java/org/springframework/data/projection/ProjectionInformation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.
@@ -20,7 +20,7 @@ import java.util.List;
 
 /**
  * Information about a projection type.
- * 
+ *
  * @author Oliver Gierke
  * @since 1.12
  */
@@ -28,14 +28,14 @@ public interface ProjectionInformation {
 
 	/**
 	 * Returns the projection type.
-	 * 
+	 *
 	 * @return will never be {@literal null}.
 	 */
 	Class<?> getType();
 
 	/**
 	 * Returns the properties that will be consumed by the projection type.
-	 * 
+	 *
 	 * @return will never be {@literal null}.
 	 */
 	List<PropertyDescriptor> getInputProperties();
@@ -44,7 +44,7 @@ public interface ProjectionInformation {
 	 * Returns whether supplying values for the properties returned via {@link #getInputProperties()} is sufficient to
 	 * create a working proxy instance. This will usually be used to determine whether the projection uses any dynamically
 	 * resolved properties.
-	 * 
+	 *
 	 * @return
 	 */
 	boolean isClosed();

src/main/java/org/springframework/data/projection/PropertyAccessingMethodInterceptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-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.
@@ -29,7 +29,7 @@ import org.springframework.util.ReflectionUtils;
 
 /**
  * Method interceptor to forward a delegation to bean property accessor methods to the property of a given target.
- * 
+ *
  * @author Oliver Gierke
  * @author Mark Paluch
  * @since 1.10
@@ -40,7 +40,7 @@ class PropertyAccessingMethodInterceptor implements MethodInterceptor {
 
 	/**
 	 * Creates a new {@link PropertyAccessingMethodInterceptor} for the given target object.
-	 * 
+	 *
 	 * @param target must not be {@literal null}.
 	 */
 	public PropertyAccessingMethodInterceptor(Object target) {
@@ -49,7 +49,7 @@ class PropertyAccessingMethodInterceptor implements MethodInterceptor {
 		this.target = new DirectFieldAccessFallbackBeanWrapper(target);
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation)
 	 */

src/main/java/org/springframework/data/projection/ProxyProjectionFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-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.
@@ -38,7 +38,7 @@ import org.springframework.util.ConcurrentReferenceHashMap;
  * default accessor methods are supported. In case the delegating lookups result in an object of different type that the
  * projection interface method's return type, another projection will be created to transparently mitigate between the
  * types.
- * 
+ *
  * @author Oliver Gierke
  * @author Christoph Strobl
  * @see SpelAwareProxyProjectionFactory
@@ -63,7 +63,7 @@ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware
 		this.conversionService = new DefaultConversionService();
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang.ClassLoader)
 	 */
@@ -75,7 +75,7 @@ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware
 	/**
 	 * Registers the given {@link MethodInterceptorFactory} to be used with the factory. Factories registered later enjoy
 	 * precedence over previously registered ones.
-	 * 
+	 *
 	 * @param factory must not be {@literal null}.
 	 * @since 1.13
 	 */
@@ -86,7 +86,7 @@ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware
 		this.factories.add(0, factory);
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.rest.core.projection.ProjectionFactory#createProjection(java.lang.Object, java.lang.Class)
 	 */
@@ -114,7 +114,7 @@ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware
 		return (T) factory.getProxy(classLoader == null ? ClassUtils.getDefaultClassLoader() : classLoader);
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.projection.ProjectionFactory#createProjection(java.lang.Class)
 	 */
@@ -126,7 +126,7 @@ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware
 		return createProjection(projectionType, new HashMap<String, Object>());
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.projection.ProjectionFactory#getProjectionInformation(java.lang.Class)
 	 */
@@ -139,7 +139,7 @@ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware
 	/**
 	 * Post-process the given {@link MethodInterceptor} for the given source instance and projection type. Default
 	 * implementation will simply return the given interceptor.
-	 * 
+	 *
 	 * @param interceptor will never be {@literal null}.
 	 * @param source will never be {@literal null}.
 	 * @param projectionType will never be {@literal null}.
@@ -152,7 +152,7 @@ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware
 
 	/**
 	 * Creates a fresh, cacheable {@link ProjectionInformation} instance for the given projection type.
-	 * 
+	 *
 	 * @param projectionType must not be {@literal null}.
 	 * @return
 	 */
@@ -162,7 +162,7 @@ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware
 
 	/**
 	 * Returns the {@link MethodInterceptor} to add to the proxy.
-	 * 
+	 *
 	 * @param source must not be {@literal null}.
 	 * @param projectionType must not be {@literal null}.
 	 * @return
@@ -178,7 +178,7 @@ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware
 
 	/**
 	 * Returns the {@link MethodInterceptorFactory} to be used with the given source object and target type.
-	 * 
+	 *
 	 * @param source must not be {@literal null}.
 	 * @param projectionType must not be {@literal null}.
 	 * @return
@@ -197,7 +197,7 @@ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware
 	/**
 	 * Custom {@link MethodInterceptor} to expose the proxy target class even if we set
 	 * {@link ProxyFactory#setOpaque(boolean)} to true to prevent properties on {@link Advised} to be rendered.
-	 * 
+	 *
 	 * @author Oliver Gierke
 	 */
 	private static class TargetAwareMethodInterceptor implements MethodInterceptor {
@@ -218,7 +218,7 @@ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware
 
 		/**
 		 * Creates a new {@link TargetAwareMethodInterceptor} with the given target class.
-		 * 
+		 *
 		 * @param targetType must not be {@literal null}.
 		 */
 		public TargetAwareMethodInterceptor(Class<?> targetType) {
@@ -227,7 +227,7 @@ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware
 			this.targetType = targetType;
 		}
 
-		/* 
+		/*
 		 * (non-Javadoc)
 		 * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation)
 		 */
@@ -247,7 +247,7 @@ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware
 
 	/**
 	 * {@link MethodInterceptorFactory} handling {@link Map}s as target objects.
-	 * 
+	 *
 	 * @author Oliver Gierke
 	 */
 	private static enum MapAccessingMethodInterceptorFactory implements MethodInterceptorFactory {
@@ -283,7 +283,7 @@ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware
 
 		INSTANCE;
 
-		/* 
+		/*
 		 * (non-Javadoc)
 		 * @see org.springframework.data.projection.MethodInterceptorFactory#createMethodInterceptor(java.lang.Object, java.lang.Class)
 		 */
@@ -292,7 +292,7 @@ class ProxyProjectionFactory implements ProjectionFactory, BeanClassLoaderAware
 			return new PropertyAccessingMethodInterceptor(source);
 		}
 
-		/* 
+		/*
 		 * (non-Javadoc)
 		 * @see org.springframework.data.projection.MethodInterceptorFactory#supports(java.lang.Object, java.lang.Class)
 		 */

src/main/java/org/springframework/data/projection/SpelAwareProxyProjectionFactory.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.
@@ -35,7 +35,7 @@ import org.springframework.util.ReflectionUtils;
 /**
  * A {@link ProxyProjectionFactory} that adds support to use {@link Value}-annotated methods on a projection interface
  * to evaluate the contained SpEL expression to define the outcome of the method call.
- * 
+ *
  * @author Oliver Gierke
  * @author Thomas Darimont
  * @author Mark Paluch
@@ -49,7 +49,7 @@ public class SpelAwareProxyProjectionFactory extends ProxyProjectionFactory impl
 
 	private @Nullable BeanFactory beanFactory;
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org.springframework.beans.factory.BeanFactory)
 	 */
@@ -70,7 +70,7 @@ public class SpelAwareProxyProjectionFactory extends ProxyProjectionFactory impl
 	/**
 	 * Inspects the given target type for methods with {@link Value} annotations and caches the result. Will create a
 	 * {@link SpelEvaluatingMethodInterceptor} if an annotation was found or return the delegate as is if not.
-	 * 
+	 *
 	 * @param interceptor the root {@link MethodInterceptor}.
 	 * @param source The backing source object.
 	 * @param projectionType the proxy target type.
@@ -87,7 +87,7 @@ public class SpelAwareProxyProjectionFactory extends ProxyProjectionFactory impl
 
 	/**
 	 * Returns whether the given type as a method annotated with {@link Value}.
-	 * 
+	 *
 	 * @param type must not be {@literal null}.
 	 * @return
 	 */

src/main/java/org/springframework/data/projection/SpelEvaluatingMethodInterceptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-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.springframework.util.StringUtils;
 /**
  * {@link MethodInterceptor} to invoke a SpEL expression to compute the method result. Will forward the resolution to a
  * delegate {@link MethodInterceptor} if no {@link Value} annotation is found.
- * 
+ *
  * @author Oliver Gierke
  * @author Thomas Darimont
  * @author Christoph Strobl
@@ -58,7 +58,7 @@ class SpelEvaluatingMethodInterceptor implements MethodInterceptor {
 	 * Creates a new {@link SpelEvaluatingMethodInterceptor} delegating to the given {@link MethodInterceptor} as fallback
 	 * and exposing the given target object via {@code target} to the SpEl expressions. If a {@link BeanFactory} is given,
 	 * bean references in SpEl expressions can be resolved as well.
-	 * 
+	 *
 	 * @param delegate must not be {@literal null}.
 	 * @param target must not be {@literal null}.
 	 * @param beanFactory can be {@literal null}.
@@ -94,7 +94,7 @@ class SpelEvaluatingMethodInterceptor implements MethodInterceptor {
 	 * Eagerly parses {@link Expression} defined on {@link Value} annotations. Returns a map with
 	 * {@code method.hashCode()} as key and the parsed {@link Expression} or an {@link Collections#emptyMap()} if no
 	 * {@code Expressions} were found.
-	 * 
+	 *
 	 * @param parser must not be {@literal null}.
 	 * @param targetInterface must not be {@literal null}.
 	 * @return
@@ -122,7 +122,7 @@ class SpelEvaluatingMethodInterceptor implements MethodInterceptor {
 		return Collections.unmodifiableMap(expressions);
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation)
 	 */
@@ -141,7 +141,7 @@ class SpelEvaluatingMethodInterceptor implements MethodInterceptor {
 
 	/**
 	 * Wrapper class to expose an object to the SpEL expression as {@code target}.
-	 * 
+	 *
 	 * @author Oliver Gierke
 	 */
 	@lombok.Value(staticConstructor = "of")

src/main/java/org/springframework/data/projection/TargetAware.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 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.
@@ -23,14 +23,14 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 
 /**
  * Extension of {@link org.springframework.aop.TargetClassAware} to be able to ignore the getter on JSON rendering.
- * 
+ *
  * @author Oliver Gierke
  */
 public interface TargetAware extends org.springframework.aop.TargetClassAware, RawTargetAccess {
 
 	/**
 	 * Returns the type of the proxy target.
-	 * 
+	 *
 	 * @return can be {@literal null}.
 	 */
 	@Nullable
@@ -39,7 +39,7 @@ public interface TargetAware extends org.springframework.aop.TargetClassAware, R
 
 	/**
 	 * Returns the proxy target.
-	 * 
+	 *
 	 * @return will never be {@literal null}.
 	 */
 	@JsonIgnore
@@ -48,7 +48,7 @@ public interface TargetAware extends org.springframework.aop.TargetClassAware, R
 	/**
 	 * Re-declaration of Spring Framework 4.3's {@link DecoratingProxy#getDecoratedClass()} so that we can exclude it from
 	 * Jackson serialization.
-	 * 
+	 *
 	 * @return
 	 */
 	@JsonIgnore