Provide a complete implementation for the deprecated DataAccessStrategy#insert method signature.

Author: ctailor2

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

@@ -47,6 +47,11 @@ public CascadingDataAccessStrategy(List<DataAccessStrategy> strategies) {
 		this.strategies = new ArrayList<>(strategies);
 	}
 
+	@Override
+	public <T> Object insert(T instance, Class<T> domainType, Identifier identifier) {
+		return collect(das -> das.insert(instance, domainType, identifier));
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jdbc.core.DataAccessStrategy#insert(java.lang.Object, java.lang.Class, org.springframework.data.jdbc.core.ParentKeys)

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

@@ -57,9 +57,7 @@ public interface DataAccessStrategy extends RelationResolver {
 	 */
 	@Nullable
 	@Deprecated
-	default <T> Object insert(T instance, Class<T> domainType, Identifier identifier) {
-		return insert(instance, domainType, identifier, IdValueSource.GENERATED);
-	}
+	<T> Object insert(T instance, Class<T> domainType, Identifier identifier);
 
 	/**
 	 * Inserts the data of a single entity. Referenced entities don't get handled.

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

@@ -94,6 +94,13 @@ public DefaultDataAccessStrategy(SqlGeneratorSource sqlGeneratorSource, Relation
 		this.insertStrategyFactory = insertStrategyFactory;
 	}
 
+	@Override
+	public <T> Object insert(T instance, Class<T> domainType, Identifier identifier) {
+
+		RelationalPersistentEntity<?> persistentEntity = context.getRequiredPersistentEntity(domainType);
+		return insert(instance, domainType, identifier, IdValueSource.forInstance(instance, persistentEntity));
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jdbc.core.DataAccessStrategy#insert(java.lang.Object, java.lang.Class, java.util.Map)

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

@@ -40,6 +40,11 @@ public class DelegatingDataAccessStrategy implements DataAccessStrategy {
 
 	private DataAccessStrategy delegate;
 
+	@Override
+	public <T> Object insert(T instance, Class<T> domainType, Identifier identifier) {
+		return delegate.insert(instance, domainType, identifier);
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jdbc.core.DataAccessStrategy#insert(java.lang.Object, java.lang.Class, org.springframework.data.jdbc.core.ParentKeys)

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java

@@ -147,6 +147,15 @@ public void setNamespaceStrategy(NamespaceStrategy namespaceStrategy) {
 		this.namespaceStrategy = namespaceStrategy;
 	}
 
+	@Override
+	public <T> Object insert(T instance, Class<T> domainType, Identifier identifier) {
+
+		MyBatisContext myBatisContext = new MyBatisContext(identifier, instance, domainType);
+		sqlSession().insert(namespace(domainType) + ".insert", myBatisContext);
+
+		return myBatisContext.getId();
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.jdbc.core.DataAccessStrategy#insert(java.lang.Object, java.lang.Class, Identifier, boolean)

spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/IdValueSource.java

@@ -15,6 +15,9 @@
  */
 package org.springframework.data.relational.core.conversion;
 
+import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
+import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
+
 /**
  * Enumeration describing the source of a value for an id property.
  *
@@ -36,5 +39,27 @@ public enum IdValueSource {
 	/**
 	 * There is no id property, and therefore no id value source.
 	 */
-	NONE
+	NONE;
+
+	/**
+	 * Returns the appropriate {@link IdValueSource} for the instance: {@link IdValueSource#NONE} when the entity has no
+	 * id property, {@link IdValueSource#PROVIDED} when the value of the id property is not null and when it is a
+	 * primitive type, not zero, and {@link IdValueSource#GENERATED} otherwise.
+	 */
+	public static <T> IdValueSource forInstance(Object instance, RelationalPersistentEntity<T> persistentEntity) {
+
+		Object idValue = persistentEntity.getIdentifierAccessor(instance).getIdentifier();
+		RelationalPersistentProperty idProperty = persistentEntity.getIdProperty();
+		if (idProperty == null) {
+			return IdValueSource.NONE;
+		}
+		boolean idPropertyValueIsSet = idValue != null && //
+				(idProperty.getType() != int.class || !idValue.equals(0)) //
+				&& (idProperty.getType() != long.class || !idValue.equals(0L));
+		if (idPropertyValueIsSet) {
+			return IdValueSource.PROVIDED;
+		} else {
+			return IdValueSource.GENERATED;
+		}
+	}
 }

spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/WritingContext.java

@@ -55,7 +55,7 @@ class WritingContext {
 		this.root = root;
 		this.entity = aggregateChange.getEntity();
 		this.entityType = aggregateChange.getEntityType();
-		this.rootIdValueSource = idValueSource(root, context.getRequiredPersistentEntity(aggregateChange.getEntityType()));
+		this.rootIdValueSource = IdValueSource.forInstance(root, context.getRequiredPersistentEntity(aggregateChange.getEntityType()));
 		this.paths = context.findPersistentPropertyPaths(entityType, (p) -> p.isEntity() && !p.isEmbedded());
 	}
 
@@ -145,7 +145,7 @@ private List<? extends DbAction<?>> insertAll(PersistentPropertyPath<RelationalP
 			} else {
 				instance = node.getValue();
 			}
-			IdValueSource idValueSource = idValueSource(instance, persistentEntity);
+			IdValueSource idValueSource = IdValueSource.forInstance(instance, persistentEntity);
 			DbAction.Insert<Object> insert = new DbAction.Insert<>(instance, path, parentAction, qualifiers, idValueSource);
 			inserts.add(insert);
 			previousActions.put(node, insert);
@@ -303,28 +303,5 @@ private List<PathNode> createNodes(PersistentPropertyPath<RelationalPersistentPr
 
 		return nodes;
 	}
-	
-	/**
-	 * Returns the appropriate {@link IdValueSource} for the instance: {@link IdValueSource#NONE} when the entity has no
-	 * id property, {@link IdValueSource#PROVIDED} when the value of the id property is not null and when it is a
-	 * primitive type, not zero, and {@link IdValueSource#GENERATED} otherwise.
-	 */
-	private static <S> IdValueSource idValueSource(Object instance,
-												   RelationalPersistentEntity<S> persistentEntity) {
-		
-		Object idValue = persistentEntity.getIdentifierAccessor(instance).getIdentifier();
-		RelationalPersistentProperty idProperty = persistentEntity.getIdProperty();
-		if (idProperty == null) {
-			return IdValueSource.NONE;
-		}
-		boolean idPropertyValueIsSet = idValue != null && //
-				(idProperty.getType() != int.class || !idValue.equals(0)) //
-				&& (idProperty.getType() != long.class || !idValue.equals(0L));
-		if (idPropertyValueIsSet) {
-			return IdValueSource.PROVIDED;
-		} else {
-			return IdValueSource.GENERATED;
-		}
-	}
 
 }