General removal of deprecated API.

See #2466

Author: mp911de

src/main/java/org/springframework/data/auditing/AuditingHandler.java

@@ -19,11 +19,9 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.data.domain.AuditorAware;
-import org.springframework.data.mapping.PersistentEntity;
-import org.springframework.data.mapping.PersistentProperty;
-import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.context.PersistentEntities;
 import org.springframework.util.Assert;
 
@@ -40,20 +38,6 @@ public class AuditingHandler extends AuditingHandlerSupport implements Initializ
 
 	private Optional<AuditorAware<?>> auditorAware;
 
-	/**
-	 * Creates a new {@link AuditableBeanWrapper} using the given {@link MappingContext} when looking up auditing metadata
-	 * via reflection.
-	 *
-	 * @param mappingContext must not be {@literal null}.
-	 * @since 1.8
-	 * @deprecated use {@link AuditingHandler(PersistentEntities)} instead.
-	 */
-	@Deprecated
-	public AuditingHandler(
-			MappingContext<? extends PersistentEntity<?, ?>, ? extends PersistentProperty<?>> mappingContext) {
-		this(PersistentEntities.of(mappingContext));
-	}
-
 	/**
 	 * Creates a new {@link AuditableBeanWrapper} using the given {@link PersistentEntities} when looking up auditing
 	 * metadata via reflection.

src/main/java/org/springframework/data/auditing/IsNewAwareAuditingHandler.java

@@ -35,19 +35,6 @@ public class IsNewAwareAuditingHandler extends AuditingHandler {
 
 	private final PersistentEntities entities;
 
-	/**
-	 * Creates a new {@link IsNewAwareAuditingHandler} for the given {@link MappingContext}.
-	 *
-	 * @param mappingContext must not be {@literal null}.
-	 * @since 1.8
-	 * @deprecated use {@link IsNewAwareAuditingHandler(PersistentEntities)} instead.
-	 */
-	@Deprecated
-	public IsNewAwareAuditingHandler(
-			MappingContext<? extends PersistentEntity<?, ?>, ? extends PersistentProperty<?>> mappingContext) {
-		this(PersistentEntities.of(mappingContext));
-	}
-
 	/**
 	 * Creates a new {@link IsNewAwareAuditingHandler} for the given {@link MappingContext}.
 	 *

src/main/java/org/springframework/data/mapping/PersistentProperty.java

@@ -64,17 +64,6 @@ public interface PersistentProperty<P extends PersistentProperty<P>> {
 	 */
 	TypeInformation<?> getTypeInformation();
 
-	/**
-	 * Returns the {@link TypeInformation} if the property references a {@link PersistentEntity}. Will return
-	 * {@literal null} in case it refers to a simple type. Will return {@link Collection}'s component type or the
-	 * {@link Map}'s value type transparently.
-	 *
-	 * @return
-	 * @deprecated since 2.6 for removal in 3.0. Use {@link #getPersistentEntityTypeInformation()} instead.
-	 */
-	@Deprecated
-	Iterable<? extends TypeInformation<?>> getPersistentEntityTypes();
-
 	/**
 	 * Returns the detected {@link TypeInformation TypeInformations} if the property references a {@link PersistentEntity}.
 	 * Will return an {@literal empty} {@link Iterable} in case it refers to a simple type. Will return the {@link Collection}'s

src/main/java/org/springframework/data/mapping/model/AbstractPersistentProperty.java

@@ -158,15 +158,6 @@ public TypeInformation<?> getTypeInformation() {
 		return information;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.PersistentProperty#getPersistentEntityTypes()
-	 */
-	@Override
-	public Iterable<? extends TypeInformation<?>> getPersistentEntityTypes() {
-		return getPersistentEntityTypeInformation();
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.PersistentProperty#getPersistentEntityTypeInformation()

src/main/java/org/springframework/data/mapping/model/InstantiationAwarePropertyAccessor.java

@@ -46,26 +46,6 @@ public class InstantiationAwarePropertyAccessor<T> implements PersistentProperty
 
 	private T bean;
 
-	/**
-	 * Creates an {@link InstantiationAwarePropertyAccessor} using the given delegate {@link PersistentPropertyAccessor}
-	 * and {@link EntityInstantiators}.
-	 *
-	 * @param delegate must not be {@literal null}.
-	 * @param instantiators must not be {@literal null}.
-	 * @deprecated since 2.4. Using this constructor allows only setting a single property as
-	 *             {@link PersistentPropertyAccessor} holds a reference to the initial bean state.
-	 */
-	@Deprecated
-	public InstantiationAwarePropertyAccessor(PersistentPropertyAccessor<T> delegate, EntityInstantiators instantiators) {
-
-		Assert.notNull(delegate, "Delegate PersistentPropertyAccessor must not be null!");
-		Assert.notNull(instantiators, "EntityInstantiators must not be null!");
-
-		this.instantiators = instantiators;
-		this.delegateFunction = t -> delegate;
-		this.bean = delegate.getBean();
-	}
-
 	/**
 	 * Creates an {@link InstantiationAwarePropertyAccessor} using the given delegate {@code accessorFunction} and
 	 * {@link EntityInstantiators}. {@code accessorFunction} is used to obtain a new {@link PersistentPropertyAccessor}

src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java

@@ -320,16 +320,7 @@ public String getId() {
 	 * @param repositoryType will never be {@literal null}.
 	 * @return
 	 */
-	protected T create(CreationalContext<T> creationalContext, Class<T> repositoryType) {
-
-		CdiRepositoryConfiguration cdiRepositoryConfiguration = lookupConfiguration(beanManager, qualifiers);
-
-		Optional<Bean<?>> customImplementationBean = getCustomImplementationBean(repositoryType,
-				cdiRepositoryConfiguration);
-		Optional<Object> customImplementation = customImplementationBean.map(this::getDependencyInstance);
-
-		return create(creationalContext, repositoryType, customImplementation);
-	}
+	protected abstract T create(CreationalContext<T> creationalContext, Class<T> repositoryType);
 
 	/**
 	 * Creates the actual component instance given a {@link RepositoryFactorySupport repository factory supplier} and the
@@ -415,24 +406,6 @@ private static Class<?> lookupFragmentInterface(Class<?> repositoryType, String
 						Arrays.asList(repositoryType.getInterfaces()))));
 	}
 
-	/**
-	 * Creates the actual component instance.
-	 *
-	 * @param creationalContext will never be {@literal null}.
-	 * @param repositoryType will never be {@literal null}.
-	 * @param customImplementation can be {@literal null}.
-	 * @return
-	 * @deprecated since 2.1, override {@link #create(CreationalContext, Class)} in which you create a repository factory
-	 *             and call {@link #create(RepositoryFactorySupport, Class, RepositoryFragments)}.
-	 */
-	@Deprecated
-	protected T create(CreationalContext<T> creationalContext, Class<T> repositoryType,
-			Optional<Object> customImplementation) {
-		throw new UnsupportedOperationException(
-				"You have to implement create(CreationalContext<T>, Class<T>, Optional<Object>) "
-						+ "in order to use custom repository implementations");
-	}
-
 	/**
 	 * Looks up an instance of a {@link CdiRepositoryConfiguration}. In case the instance cannot be found within the CDI
 	 * scope, a default configuration is used.

src/main/java/org/springframework/data/repository/query/ParameterAccessor.java

@@ -16,7 +16,6 @@
 package org.springframework.data.repository.query;
 
 import java.util.Iterator;
-import java.util.Optional;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -45,16 +44,6 @@ public interface ParameterAccessor extends Iterable<Object> {
 	 */
 	Sort getSort();
 
-	/**
-	 * Returns the dynamic projection type to be used when executing the query or {@literal null} if none is defined.
-	 *
-	 * @return
-	 * @since 1.12
-	 * @deprecated use {@link #findDynamicProjection()} instead.
-	 */
-	@Deprecated
-	Optional<Class<?>> getDynamicProjection();
-
 	/**
 	 * Returns the dynamic projection type to be used when executing the query or {@literal null} if none is defined.
 	 *

src/main/java/org/springframework/data/repository/query/ParametersParameterAccessor.java

@@ -16,7 +16,6 @@
 package org.springframework.data.repository.query;
 
 import java.util.Iterator;
-import java.util.Optional;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -126,18 +125,6 @@ public Sort getSort() {
 		return Sort.unsorted();
 	}
 
-	/**
-	 * Returns the dynamic projection type if available, {@literal null} otherwise.
-	 *
-	 * @return
-	 */
-	public Optional<Class<?>> getDynamicProjection() {
-
-		return Optional.ofNullable(parameters.hasDynamicProjection() //
-				? (Class<?>) values[parameters.getDynamicProjectionIndex()] //
-				: null);
-	}
-
 	/**
 	 * Returns the dynamic projection type if available, {@literal null} otherwise.
 	 *

src/main/java/org/springframework/data/repository/support/PageableExecutionUtils.java

@@ -19,8 +19,6 @@
 import reactor.core.publisher.Mono;
 
 import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.Optional;
 
 import org.springframework.core.ReactiveAdapter;
@@ -220,39 +218,6 @@ public static boolean isMultiValueType(Class<?> type) {
 				: findDescriptor(type).map(ReactiveTypeDescriptor::isMultiValue).orElse(false);
 	}
 
-	/**
-	 * Returns a collection of no-value wrapper types.
-	 *
-	 * @return a collection of no-value wrapper types.
-	 * @deprecated not supported anymore.
-	 */
-	@Deprecated
-	public static Collection<Class<?>> getNoValueTypes() {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * Returns a collection of single-value wrapper types.
-	 *
-	 * @return a collection of single-value wrapper types.
-	 * @deprecated not supported anymore.
-	 */
-	@Deprecated
-	public static Collection<Class<?>> getSingleValueTypes() {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * Returns a collection of multi-value wrapper types.
-	 *
-	 * @return a collection of multi-value wrapper types.
-	 * @deprecated not supported anymore.
-	 */
-	@Deprecated
-	public static Collection<Class<?>> getMultiValueTypes() {
-		return Collections.emptyList();
-	}
-
 	/**
 	 * Returns whether the given type is a reactive wrapper type.
 	 *

src/main/java/org/springframework/data/repository/util/NullableWrapper.java

@@ -46,10 +46,8 @@ public class Lazy<T> implements Supplier<T> {
 	 * Creates a new {@link Lazy} instance for the given supplier.
 	 *
 	 * @param supplier
-	 * @deprecated prefer {@link Lazy#of(Supplier)}, to be turned private in 2.5.
 	 */
-	@Deprecated
-	public Lazy(Supplier<? extends T> supplier) {
+	private Lazy(Supplier<? extends T> supplier) {
 		this(supplier, null, false);
 	}