DATAJDBC-480 - Removed various deprecated symbols.

Removal of public API that was deprecated in version 1.1 or older.

Original pull request: #204.

Author: schauder

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

@@ -17,15 +17,13 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mapping.PersistentPropertyPath;
 import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
-import org.springframework.data.relational.core.sql.SqlIdentifier;
 import org.springframework.data.relational.domain.Identifier;
 
 /**
@@ -46,15 +44,6 @@ public CascadingDataAccessStrategy(List<DataAccessStrategy> strategies) {
 		this.strategies = new ArrayList<>(strategies);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.jdbc.core.DataAccessStrategy#insert(java.lang.Object, java.lang.Class, java.util.Map)
-	 */
-	@Override
-	public <T> Object insert(T instance, Class<T> domainType, Map<SqlIdentifier, Object> additionalParameters) {
-		return collect(das -> das.insert(instance, domainType, additionalParameters));
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jdbc.core.DataAccessStrategy#insert(java.lang.Object, java.lang.Class, org.springframework.data.jdbc.core.ParentKeys)
@@ -173,15 +162,6 @@ public Iterable<Object> findAllByPath(Identifier identifier,
 		return collect(das -> das.findAllByPath(identifier, path));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.jdbc.core.DataAccessStrategy#findAllByProperty(java.lang.Object, org.springframework.data.relational.core.mapping.RelationalPersistentProperty)
-	 */
-	@Override
-	public <T> Iterable<T> findAllByProperty(Object rootId, RelationalPersistentProperty property) {
-		return collect(das -> das.findAllByProperty(rootId, property));
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jdbc.core.DataAccessStrategy#existsById(java.lang.Object, java.lang.Class)

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

@@ -23,7 +23,6 @@
 import org.springframework.data.jdbc.core.JdbcAggregateOperations;
 import org.springframework.data.mapping.PersistentPropertyPath;
 import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
-import org.springframework.data.relational.core.sql.SqlIdentifier;
 import org.springframework.data.relational.domain.Identifier;
 import org.springframework.lang.Nullable;
 
@@ -38,21 +37,6 @@
  */
 public interface DataAccessStrategy extends RelationResolver {
 
-	/**
-	 * Inserts a the data of a single entity. Referenced entities don't get handled.
-	 *
-	 * @param instance the instance to be stored. Must not be {@code null}.
-	 * @param domainType the type of the instance. Must not be {@code null}.
-	 * @param additionalParameters name-value pairs of additional parameters. Especially ids of parent entities that need
-	 *          to get referenced are contained in this map. Must not be {@code null}.
-	 * @param <T> the type of the instance.
-	 * @return the id generated by the database if any.
-	 * @deprecated since 1.1, use {@link #insert(Object, Class, Identifier)} instead.
-	 */
-	@Deprecated
-	@Nullable
-	<T> Object insert(T instance, Class<T> domainType, Map<SqlIdentifier, Object> additionalParameters);
-
 	/**
 	 * Inserts a the data of a single entity. Referenced entities don't get handled.
 	 *
@@ -66,9 +50,7 @@ public interface DataAccessStrategy extends RelationResolver {
 	 * @since 1.1
 	 */
 	@Nullable
-	default <T> Object insert(T instance, Class<T> domainType, Identifier identifier) {
-		return insert(instance, domainType, identifier.toMap());
-	}
+	<T> Object insert(T instance, Class<T> domainType, Identifier identifier);
 
 	/**
 	 * Updates the data of a single entity in the database. Referenced entities don't get handled.
@@ -192,22 +174,8 @@ default <T> Object insert(T instance, Class<T> domainType, Identifier identifier
 	 * @see org.springframework.data.jdbc.core.RelationResolver#findAllByPath(org.springframework.data.relational.domain.Identifier, org.springframework.data.mapping.PersistentPropertyPath)
 	 */
 	@Override
-	default Iterable<Object> findAllByPath(Identifier identifier,
-			PersistentPropertyPath<? extends RelationalPersistentProperty> path) {
-
-		Object rootId = identifier.toMap().get(path.getRequiredLeafProperty().getReverseColumnName());
-		return findAllByProperty(rootId, path.getRequiredLeafProperty());
-	}
-
-	/**
-	 * Finds all entities reachable via {@literal property} from the instance identified by {@literal rootId}.
-	 *
-	 * @param rootId Id of the root object on which the {@literal propertyPath} is based.
-	 * @param property Leading from the root object to the entities to be found.
-	 * @deprecated Use #findAllByPath instead.
-	 */
-	@Deprecated
-	<T> Iterable<T> findAllByProperty(Object rootId, RelationalPersistentProperty property);
+	Iterable<Object> findAllByPath(Identifier identifier,
+			PersistentPropertyPath<? extends RelationalPersistentProperty> path);
 
 	/**
 	 * returns if a row with the given id exists for the given type.

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

@@ -95,16 +95,6 @@ public DefaultDataAccessStrategy(SqlGeneratorSource sqlGeneratorSource, Relation
 		this.operations = operations;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.jdbc.core.DataAccessStrategy#insert(java.lang.Object, java.lang.Class, java.util.Map)
-	 */
-	@Override
-	@Nullable
-	public <T> Object insert(T instance, Class<T> domainType, Map<SqlIdentifier, Object> additionalParameters) {
-		return insert(instance, domainType, Identifier.from(additionalParameters));
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jdbc.core.DataAccessStrategy#insert(java.lang.Object, java.lang.Class, java.util.Map)
@@ -346,21 +336,6 @@ private SqlParameterSource createParameterSource(Identifier identifier, Identifi
 		return parameterSource;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.jdbc.core.DataAccessStrategy#findAllByProperty(java.lang.Object, org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty)
-	 */
-	@Override
-	@SuppressWarnings("unchecked")
-	public Iterable<Object> findAllByProperty(Object rootId, RelationalPersistentProperty property) {
-
-		Assert.notNull(rootId, "rootId must not be null.");
-
-		Class<?> rootType = property.getOwner().getType();
-		return findAllByPath(Identifier.of(property.getReverseColumnName(), rootId, rootType),
-				context.getPersistentPropertyPath(property.getName(), rootType));
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jdbc.core.DataAccessStrategy#existsById(java.lang.Object, java.lang.Class)

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

@@ -15,13 +15,10 @@
  */
 package org.springframework.data.jdbc.core.convert;
 
-import java.util.Map;
-
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mapping.PersistentPropertyPath;
 import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
-import org.springframework.data.relational.core.sql.SqlIdentifier;
 import org.springframework.data.relational.domain.Identifier;
 import org.springframework.util.Assert;
 
@@ -38,15 +35,6 @@ public class DelegatingDataAccessStrategy implements DataAccessStrategy {
 
 	private DataAccessStrategy delegate;
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.jdbc.core.DataAccessStrategy#insert(java.lang.Object, java.lang.Class, java.util.Map)
-	 */
-	@Override
-	public <T> Object insert(T instance, Class<T> domainType, Map<SqlIdentifier, Object> additionalParameters) {
-		return delegate.insert(instance, domainType, additionalParameters);
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jdbc.core.DataAccessStrategy#insert(java.lang.Object, java.lang.Class, org.springframework.data.jdbc.core.ParentKeys)
@@ -169,18 +157,6 @@ public Iterable<Object> findAllByPath(Identifier identifier,
 		return delegate.findAllByPath(identifier, path);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.jdbc.core.DataAccessStrategy#findAllByProperty(java.lang.Object, org.springframework.data.relational.core.mapping.RelationalPersistentProperty)
-	 */
-	@Override
-	public <T> Iterable<T> findAllByProperty(Object rootId, RelationalPersistentProperty property) {
-
-		Assert.notNull(delegate, "Delegate is null");
-
-		return delegate.findAllByProperty(rootId, property);
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jdbc.core.DataAccessStrategy#existsById(java.lang.Object, java.lang.Class)