fix: support compound IdClass ID's when calling deleteAllByIdInBatch

Convert ID's to entities and pass them to deleteAllInBatch.

Issue: spring-projects#2414

Author: ejl888

src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java

@@ -15,31 +15,6 @@
  */
 package org.springframework.data.jpa.repository.support;
 
-import static org.springframework.data.jpa.repository.query.QueryUtils.*;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Function;
-
-import javax.persistence.EntityManager;
-import javax.persistence.LockModeType;
-import javax.persistence.NoResultException;
-import javax.persistence.Parameter;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.ParameterExpression;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.Page;
@@ -62,6 +37,35 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 
+import javax.persistence.EntityManager;
+import javax.persistence.LockModeType;
+import javax.persistence.NoResultException;
+import javax.persistence.Parameter;
+import javax.persistence.Query;
+import javax.persistence.TypedQuery;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Order;
+import javax.persistence.criteria.ParameterExpression;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+
+import static org.springframework.data.jpa.repository.query.QueryUtils.COUNT_QUERY_STRING;
+import static org.springframework.data.jpa.repository.query.QueryUtils.DELETE_ALL_QUERY_BY_ID_STRING;
+import static org.springframework.data.jpa.repository.query.QueryUtils.DELETE_ALL_QUERY_STRING;
+import static org.springframework.data.jpa.repository.query.QueryUtils.applyAndBind;
+import static org.springframework.data.jpa.repository.query.QueryUtils.getQueryString;
+import static org.springframework.data.jpa.repository.query.QueryUtils.toOrders;
+
 /**
  * Default implementation of the {@link org.springframework.data.repository.CrudRepository} interface. This will offer
  * you a more sophisticated interface than the plain {@link EntityManager} .
@@ -226,13 +230,21 @@ public void deleteAllByIdInBatch(Iterable<ID> ids) {
 			return;
 		}
 
-		String queryString = String.format(DELETE_ALL_QUERY_BY_ID_STRING, entityInformation.getEntityName(),
-				entityInformation.getIdAttribute().getName());
+		if (entityInformation.hasCompositeId()) {
+			// XXX Hibernate just creates an empty Entity here when doing the getById. Others might do a real select
+			// that would introduce a big performance penalty. See JavaDoc for getById.
+			List<T> entities = new ArrayList<>();
+			ids.forEach(id -> entities.add(getById(id)));
+			deleteAllInBatch(entities);
+		} else {
+			String queryString = String.format(DELETE_ALL_QUERY_BY_ID_STRING, entityInformation.getEntityName(),
+					entityInformation.getIdAttribute().getName());
 
-		Query query = em.createQuery(queryString);
-		query.setParameter("ids", ids);
+			Query query = em.createQuery(queryString);
+			query.setParameter("ids", ids);
 
-		query.executeUpdate();
+			query.executeUpdate();
+		}
 	}
 
 	/*

src/test/java/org/springframework/data/jpa/repository/RepositoryWithCompositeKeyTests.java

@@ -19,6 +19,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -41,6 +42,8 @@
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.persistence.EntityManager;
+
 /**
  * Tests some usage variants of composite keys with spring data jpa.
  *
@@ -55,6 +58,7 @@ public class RepositoryWithCompositeKeyTests {
 
 	@Autowired EmployeeRepositoryWithIdClass employeeRepositoryWithIdClass;
 	@Autowired EmployeeRepositoryWithEmbeddedId employeeRepositoryWithEmbeddedId;
+	@Autowired EntityManager em;
 
 	/**
 	 * @see <a href="download.oracle.com/otn-pub/jcp/persistence-2_1-fr-eval-spec/JavaPersistence.pdf">Final JPA 2.0
@@ -126,6 +130,28 @@ void shouldSupportFindAllWithPageableAndEntityWithIdClass() throws Exception {
 		assertThat(page.getTotalElements()).isEqualTo(1L);
 	}
 
+	@Test
+	void shouldSupportDeleteAllByIdInBatchWithIdClass() throws Exception {
+
+		IdClassExampleDepartment dep = new IdClassExampleDepartment();
+		dep.setName("TestDepartment");
+		dep.setDepartmentId(-1);
+
+		IdClassExampleEmployee emp = new IdClassExampleEmployee();
+		emp.setDepartment(dep);
+		emp = employeeRepositoryWithIdClass.save(emp);
+
+		IdClassExampleEmployeePK key = new IdClassExampleEmployeePK(emp.getEmpId(), dep.getDepartmentId());
+		assertThat(employeeRepositoryWithIdClass.findById(key)).isNotEmpty();
+
+		employeeRepositoryWithIdClass.deleteAllByIdInBatch(Arrays.asList(key));
+
+		em.flush();
+		em.clear();
+
+		assertThat(employeeRepositoryWithIdClass.findById(key)).isEmpty();
+	}
+
 	@Test // DATAJPA-497
 	void sortByEmbeddedPkFieldInCompositePkWithEmbeddedIdInQueryDsl() {