Remove deprecated code.

Original pull request #1869

Author: schauder

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateOperations.java

@@ -265,22 +265,6 @@ public interface JdbcAggregateOperations {
 	 */
 	<T> void delete(T aggregateRoot);
 
-	/**
-	 * Delete an aggregate identified by its aggregate root.
-	 *
-	 * @param aggregateRoot to delete. Must not be {@code null}.
-	 * @param domainType the type of the aggregate root. Must not be {@code null}.
-	 * @param <T> the type of the aggregate root.
-	 * @throws org.springframework.dao.OptimisticLockingFailureException when {@literal T} has a version attribute and the
-	 *           version attribute of the provided entity does not match the version attribute in the database, or when
-	 *           there is no aggregate root with matching id. In other cases a NOOP delete is silently ignored.
-	 * @deprecated since 3.0 use {@link #delete(Object)} instead
-	 */
-	@Deprecated(since = "3.0")
-	default <T> void delete(T aggregateRoot, Class<T> domainType) {
-		delete(aggregateRoot);
-	}
-
 	/**
 	 * Delete all aggregates of a given type.
 	 *
@@ -295,21 +279,4 @@ default <T> void delete(T aggregateRoot, Class<T> domainType) {
 	 * @param <T> the type of the aggregate roots.
 	 */
 	<T> void deleteAll(Iterable<? extends T> aggregateRoots);
-
-	/**
-	 * Delete all aggregates identified by their aggregate roots.
-	 *
-	 * @param aggregateRoots to delete. Must not be {@code null}.
-	 * @param domainType type of the aggregate roots to be deleted. Must not be {@code null}.
-	 * @param <T> the type of the aggregate roots.
-	 * @throws org.springframework.dao.OptimisticLockingFailureException when {@literal T} has a version attribute and for
-	 *           at least on entity the version attribute of the entity does not match the version attribute in the
-	 *           database, or when there is no aggregate root with matching id. In other cases a NOOP delete is silently
-	 *           ignored.
-	 * @deprecated since 3.0 use {@link #deleteAll(Iterable)} instead.
-	 */
-	@Deprecated(since = "3.0")
-	default <T> void deleteAll(Iterable<? extends T> aggregateRoots, Class<T> domainType) {
-		deleteAll(aggregateRoots);
-	}
 }

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverter.java

@@ -19,7 +19,6 @@
 import java.sql.SQLException;
 
 import org.springframework.data.relational.core.mapping.AggregatePath;
-import org.springframework.data.relational.core.mapping.PersistentPropertyPathExtension;
 import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
 import org.springframework.data.relational.domain.RowDocument;
 import org.springframework.jdbc.core.RowMapper;
@@ -43,19 +42,6 @@ public class EntityRowMapper<T> implements RowMapper<T> {
 	private final JdbcConverter converter;
 	private final @Nullable Identifier identifier;
 
-	/**
-	 * @deprecated use {@link EntityRowMapper#EntityRowMapper(AggregatePath, JdbcConverter, Identifier)} instead
-	 */
-	@Deprecated(since = "3.2", forRemoval = true)
-	@SuppressWarnings("unchecked")
-	public EntityRowMapper(PersistentPropertyPathExtension path, JdbcConverter converter, Identifier identifier) {
-
-		this.entity = (RelationalPersistentEntity<T>) path.getLeafEntity();
-		this.path = path.getAggregatePath();
-		this.converter = converter;
-		this.identifier = identifier;
-	}
-
 	@SuppressWarnings("unchecked")
 	public EntityRowMapper(AggregatePath path, JdbcConverter converter, Identifier identifier) {
 

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/BatchJdbcOperations.java

@@ -41,18 +41,6 @@ public InsertStrategyFactory(NamedParameterJdbcOperations jdbcOperations, Dialec
 		this.dialect = dialect;
 	}
 
-	/**
-	 * Constructor with additional {@link BatchJdbcOperations} constructor.
-	 *
-	 * @deprecated since 3.2, use
-	 *             {@link InsertStrategyFactory#InsertStrategyFactory(NamedParameterJdbcOperations, Dialect)} instead.
-	 */
-	@Deprecated(since = "3.2")
-	public InsertStrategyFactory(NamedParameterJdbcOperations namedParameterJdbcOperations,
-			BatchJdbcOperations batchJdbcOperations, Dialect dialect) {
-		this(namedParameterJdbcOperations, dialect);
-	}
-
 	/**
 	 * @param idValueSource the {@link IdValueSource} for the insert.
 	 * @param idColumn the identifier for the id, if an id is expected to be generated. May be {@code null}.

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/EntityRowMapper.java

@@ -15,15 +15,11 @@
 */
 package org.springframework.data.jdbc.core.convert;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.sql.SQLType;
 
 import org.springframework.data.jdbc.core.mapping.JdbcValue;
 import org.springframework.data.relational.core.conversion.RelationalConverter;
-import org.springframework.data.relational.core.mapping.PersistentPropertyPathExtension;
 import org.springframework.data.relational.core.mapping.RelationalMappingContext;
-import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
 import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
 import org.springframework.data.relational.domain.RowDocument;
 import org.springframework.data.util.TypeInformation;
@@ -65,48 +61,6 @@ default JdbcValue writeJdbcValue(@Nullable Object value, Class<?> type, SQLType
 	 */
 	JdbcValue writeJdbcValue(@Nullable Object value, TypeInformation<?> type, SQLType sqlType);
 
-	/**
-	 * Read the current row from {@link ResultSet} to an {@link RelationalPersistentEntity#getType() entity}.
-	 *
-	 * @param entity the persistent entity type.
-	 * @param resultSet the {@link ResultSet} to read from.
-	 * @param key primary key.
-	 * @param <T>
-	 * @return
-	 * @deprecated since 3.2, use {@link #readAndResolve(Class, RowDocument, Identifier)} instead.
-	 */
-	@Deprecated(since = "3.2")
-	default <T> T mapRow(RelationalPersistentEntity<T> entity, ResultSet resultSet, Object key) {
-		try {
-			return readAndResolve(entity.getType(), RowDocumentResultSetExtractor.toRowDocument(resultSet));
-		} catch (SQLException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	/**
-	 * Read the current row from {@link ResultSet} to an {@link PersistentPropertyPathExtension#getActualType() entity}.
-	 *
-	 * @param path path to the owning property.
-	 * @param resultSet the {@link ResultSet} to read from.
-	 * @param identifier entity identifier.
-	 * @param key primary key.
-	 * @param <T>
-	 * @return
-	 * @deprecated use {@link #readAndResolve(Class, RowDocument, Identifier)} instead.
-	 */
-	@SuppressWarnings("unchecked")
-	@Deprecated(since = "3.2", forRemoval = true)
-	default <T> T mapRow(PersistentPropertyPathExtension path, ResultSet resultSet, Identifier identifier, Object key) {
-
-		try {
-			return (T) readAndResolve(path.getRequiredLeafEntity().getTypeInformation(),
-					RowDocumentResultSetExtractor.toRowDocument(resultSet), identifier);
-		} catch (SQLException e) {
-			throw new RuntimeException(e);
-		}
-	};
-
 	/**
 	 * Read a {@link RowDocument} into the requested {@link Class aggregate type} and resolve references by looking these
 	 * up from {@link RelationResolver}.

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/InsertStrategyFactory.java

@@ -16,7 +16,6 @@
 package org.springframework.data.jdbc.core.convert;
 
 import org.springframework.data.relational.core.mapping.AggregatePath;
-import org.springframework.data.relational.core.mapping.PersistentPropertyPathExtension;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
@@ -38,17 +37,6 @@ public static JdbcIdentifierBuilder empty() {
 		return new JdbcIdentifierBuilder(Identifier.empty());
 	}
 
-	/**
-	 * Creates ParentKeys with backreference for the given path and value of the parents id.
-	 *
-	 * @deprecated Use {@link #forBackReferences(JdbcConverter, AggregatePath, Object)} instead.
-	 */
-	@Deprecated(since = "3.2", forRemoval = true)
-	public static JdbcIdentifierBuilder forBackReferences(JdbcConverter converter, PersistentPropertyPathExtension path,
-			@Nullable Object value) {
-		return forBackReferences(converter, path.getAggregatePath(), value);
-	}
-
 	/**
 	 * Creates ParentKeys with backreference for the given path and value of the parents id.
 	 */
@@ -64,20 +52,6 @@ public static JdbcIdentifierBuilder forBackReferences(JdbcConverter converter, A
 		return new JdbcIdentifierBuilder(identifier);
 	}
 
-	/**
-	 * Adds a qualifier to the identifier to build. A qualifier is a map key or a list index.
-	 *
-	 * @param path path to the map that gets qualified by {@code value}. Must not be {@literal null}.
-	 * @param value map key or list index qualifying the map identified by {@code path}. Must not be {@literal null}.
-	 * @return this builder. Guaranteed to be not {@literal null}.
-	 */
-	@Deprecated
-	public JdbcIdentifierBuilder withQualifier(PersistentPropertyPathExtension path, Object value) {
-
-		return withQualifier(path.getAggregatePath(), value);
-	}
-
-
 	/**
 	 * Adds a qualifier to the identifier to build. A qualifier is a map key or a list index.
 	 *
@@ -90,7 +64,8 @@ public JdbcIdentifierBuilder withQualifier(AggregatePath path, Object value) {
 		Assert.notNull(path, "Path must not be null");
 		Assert.notNull(value, "Value must not be null");
 
-		identifier = identifier.withPart(path.getTableInfo().qualifierColumnInfo().name(), value, path.getTableInfo().qualifierColumnType());
+		identifier = identifier.withPart(path.getTableInfo().qualifierColumnInfo().name(), value,
+				path.getTableInfo().qualifierColumnType());
 
 		return this;
 	}

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/JdbcConverter.java

@@ -61,23 +61,6 @@ public class QueryMapper {
 	private final JdbcConverter converter;
 	private final MappingContext<? extends RelationalPersistentEntity<?>, RelationalPersistentProperty> mappingContext;
 
-	/**
-	 * Creates a new {@link QueryMapper} with the given {@link JdbcConverter}.
-	 *
-	 * @param dialect must not be {@literal null}.
-	 * @param converter must not be {@literal null}.
-	 * @deprecated use {@link QueryMapper(JdbcConverter)} instead.
-	 */
-	@Deprecated(since="3.2")
-	public QueryMapper(Dialect dialect, JdbcConverter converter) {
-
-		Assert.notNull(dialect, "Dialect must not be null");
-		Assert.notNull(converter, "JdbcConverter must not be null");
-
-		this.converter = converter;
-		this.mappingContext = converter.getMappingContext();
-	}
-
 	/**
 	 * Creates a new {@link QueryMapper} with the given {@link JdbcConverter}.
 	 *