[DATAJDBC-493] Add acquire lock before execute delete aggregate root

Author: mhyeon-lee

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

@@ -39,7 +39,9 @@
 import org.springframework.data.relational.core.mapping.RelationalMappingContext;
 import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
 import org.springframework.data.relational.core.mapping.event.*;
+import org.springframework.data.relational.core.sql.LockMode;
 import org.springframework.lang.Nullable;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.Assert;
 
 /**
@@ -50,6 +52,7 @@
  * @author Thomas Lang
  * @author Christoph Strobl
  * @author Milan Milanov
+ * @author Myeonghyeon Lee
  */
 public class JdbcAggregateTemplate implements JdbcAggregateOperations {
 
@@ -352,6 +355,9 @@ private <T> void deleteTree(Object id, @Nullable T entity, Class<T> domainType)
 		entity = triggerBeforeDelete(entity, id, change);
 		change.setEntity(entity);
 
+		// [DATAJDBC-493] Acquire Lock to avoid DeadLock
+		this.acquireLockIfActualTransactionActive(id, domainType);
+
 		executor.execute(change);
 
 		triggerAfterDelete(entity, id, change);
@@ -441,4 +447,10 @@ private <T> T triggerBeforeDelete(@Nullable T aggregateRoot, Object id, MutableA
 
 		return null;
 	}
+
+	private <T> void acquireLockIfActualTransactionActive(Object id, Class<T> domainType) {
+		if (TransactionSynchronizationManager.isActualTransactionActive()) {
+			this.accessStrategy.findByIdWithLock(id, LockMode.PESSIMISTIC_WRITE, domainType);
+		}
+	}
 }

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryConcurrencyIntegrationTests.java

@@ -20,7 +20,6 @@
 import lombok.Getter;
 import lombok.With;
 import org.junit.ClassRule;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +35,6 @@
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.test.annotation.IfProfileValue;
 import org.springframework.test.annotation.ProfileValueSourceConfiguration;
-import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.rules.SpringClassRule;
 import org.springframework.test.context.junit4.rules.SpringMethodRule;
@@ -126,7 +124,6 @@ public void updateConcurrencyWithEmptyReferences() throws Exception {
 	}
 
 	@Test // DATAJDBC-493
-	@Ignore("failing test")
 	public void updateConcurrencyWithDelete() throws Exception {
 
 		DummyEntity entity = createDummyEntity();