Delete unused DbAction.Merge and related methods.

Author: ctailor2

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

@@ -171,18 +171,6 @@ <T> void executeDeleteAll(DbAction.DeleteAll<T> delete) {
 		accessStrategy.deleteAll(delete.getPropertyPath());
 	}
 
-	<T> void executeMerge(DbAction.Merge<T> merge) {
-
-		// temporary implementation
-		if (!accessStrategy.update(merge.getEntity(), merge.getEntityType())) {
-
-			Object id = accessStrategy.insert(merge.getEntity(), merge.getEntityType(), getParentKeys(merge, converter), false);
-			add(new DbActionExecutionResult(merge, id));
-		} else {
-			add(new DbActionExecutionResult());
-		}
-	}
-
 	<T> void executeAcquireLock(DbAction.AcquireLockRoot<T> acquireLock) {
 		accessStrategy.acquireLockById(acquireLock.getId(), LockMode.PESSIMISTIC_WRITE, acquireLock.getEntityType());
 	}

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

@@ -177,48 +177,6 @@ public String toString() {
 		}
 	}
 
-	/**
-	 * Represents a merge statement for a single entity that is not the root of an aggregate.
-	 *
-	 * @param <T> type of the entity for which this represents a database interaction.
-	 */
-	final class Merge<T> implements WithDependingOn<T>, WithPropertyPath<T> {
-
-		private final T entity;
-		private final PersistentPropertyPath<RelationalPersistentProperty> propertyPath;
-		private final WithEntity<?> dependingOn;
-
-		private final Map<PersistentPropertyPath<RelationalPersistentProperty>, Object> qualifiers = Collections.emptyMap();
-
-		public Merge(T entity, PersistentPropertyPath<RelationalPersistentProperty> propertyPath,
-				WithEntity<?> dependingOn) {
-			this.entity = entity;
-			this.propertyPath = propertyPath;
-			this.dependingOn = dependingOn;
-		}
-
-		public T getEntity() {
-			return this.entity;
-		}
-
-		public PersistentPropertyPath<RelationalPersistentProperty> getPropertyPath() {
-			return this.propertyPath;
-		}
-
-		public DbAction.WithEntity<?> getDependingOn() {
-			return this.dependingOn;
-		}
-
-		public Map<PersistentPropertyPath<RelationalPersistentProperty>, Object> getQualifiers() {
-			return this.qualifiers;
-		}
-
-		public String toString() {
-			return "DbAction.Merge(entity=" + this.getEntity() + ", propertyPath=" + this.getPropertyPath() + ", dependingOn="
-					+ this.getDependingOn() + ", qualifiers=" + this.getQualifiers() + ")";
-		}
-	}
-
 	/**
 	 * Represents a delete statement for all entities that that a reachable via a give path from the aggregate root.
 	 *