Resolved merge conflicts

Author: DiegoKrupitza

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

@@ -29,7 +29,6 @@
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.provider.PersistenceProvider;
 import org.springframework.data.jpa.repository.EntityGraph;
-import org.springframework.data.jpa.repository.query.DefaultQueryEnhancer;
 import org.springframework.data.jpa.repository.query.EscapeCharacter;
 import org.springframework.data.jpa.repository.query.QueryUtils;
 import org.springframework.data.jpa.repository.support.QueryHints.NoHints;
@@ -61,6 +60,7 @@
  * @author Jesse Wouters
  * @author Greg Turnquist
  * @author Yanming Zhou
+ * @author Ernst-Jan van der Laan
  */
 @Repository
 @Transactional(readOnly = true)
@@ -206,13 +206,22 @@ 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()) {
+
+			List<T> entities = new ArrayList<>();
+			// generate entity (proxies) without accessing the database.
+			ids.forEach(id -> entities.add(getReferenceById(id)));
+			deleteAllInBatch(entities);
+		} else {
 
-		Query query = em.createQuery(queryString);
-		query.setParameter("ids", ids);
+			String queryString = String.format(DELETE_ALL_QUERY_BY_ID_STRING, entityInformation.getEntityName(),
+					entityInformation.getIdAttribute().getName());
 
-		query.executeUpdate();
+			Query query = em.createQuery(queryString);
+			query.setParameter("ids", ids);
+
+			query.executeUpdate();
+		}
 	}
 
 	/*
@@ -298,7 +307,6 @@ public Optional<T> findById(ID id) {
 	 * Returns {@link QueryHints} with the query hints based on the current {@link CrudMethodMetadata} and potential
 	 * {@link EntityGraph} information.
 	 *
-	 * @return
 	 */
 	protected QueryHints getQueryHints() {
 		return metadata == null ? NoHints.INSTANCE : DefaultQueryHints.of(entityInformation, metadata);
@@ -403,7 +411,7 @@ public List<T> findAllById(Iterable<ID> ids) {
 
 		if (entityInformation.hasCompositeId()) {
 
-			List<T> results = new ArrayList<T>();
+			List<T> results = new ArrayList<>();
 
 			for (ID id : ids) {
 				findById(id).ifPresent(results::add);
@@ -414,7 +422,7 @@ public List<T> findAllById(Iterable<ID> ids) {
 
 		Collection<ID> idCollection = Streamable.of(ids).toList();
 
-		ByIdsSpecification<T> specification = new ByIdsSpecification<T>(entityInformation);
+		ByIdsSpecification<T> specification = new ByIdsSpecification<>(entityInformation);
 		TypedQuery<T> query = getQuery(specification, Sort.unsorted());
 
 		return query.setParameter(specification.parameter, idCollection).getResultList();
@@ -437,7 +445,7 @@ public List<T> findAll(Sort sort) {
 	public Page<T> findAll(Pageable pageable) {
 
 		if (isUnpaged(pageable)) {
-			return new PageImpl<T>(findAll());
+			return new PageImpl<>(findAll());
 		}
 
 		return findAll((Specification<T>) null, pageable);
@@ -474,7 +482,7 @@ public List<T> findAll(@Nullable Specification<T> spec) {
 	public Page<T> findAll(@Nullable Specification<T> spec, Pageable pageable) {
 
 		TypedQuery<T> query = getQuery(spec, pageable);
-		return isUnpaged(pageable) ? new PageImpl<T>(query.getResultList())
+		return isUnpaged(pageable) ? new PageImpl<>(query.getResultList())
 				: readPage(query, getDomainClass(), pageable, spec);
 	}
 
@@ -496,7 +504,7 @@ public <S extends T> Optional<S> findOne(Example<S> example) {
 
 		try {
 			return Optional
-					.of(getQuery(new ExampleSpecification<S>(example, escapeCharacter), example.getProbeType(), Sort.unsorted())
+					.of(getQuery(new ExampleSpecification<>(example, escapeCharacter), example.getProbeType(), Sort.unsorted())
 							.getSingleResult());
 		} catch (NoResultException e) {
 			return Optional.empty();
@@ -510,7 +518,7 @@ public <S extends T> Optional<S> findOne(Example<S> example) {
 	@Override
 	public <S extends T> long count(Example<S> example) {
 		return executeCountQuery(
-				getCountQuery(new ExampleSpecification<S>(example, escapeCharacter), example.getProbeType()));
+				getCountQuery(new ExampleSpecification<>(example, escapeCharacter), example.getProbeType()));
 	}
 
 	/*
@@ -534,7 +542,7 @@ public <S extends T> boolean exists(Example<S> example) {
 	 */
 	@Override
 	public <S extends T> List<S> findAll(Example<S> example) {
-		return getQuery(new ExampleSpecification<S>(example, escapeCharacter), example.getProbeType(), Sort.unsorted())
+		return getQuery(new ExampleSpecification<>(example, escapeCharacter), example.getProbeType(), Sort.unsorted())
 				.getResultList();
 	}
 
@@ -544,8 +552,7 @@ public <S extends T> List<S> findAll(Example<S> example) {
 	 */
 	@Override
 	public <S extends T> List<S> findAll(Example<S> example, Sort sort) {
-		return getQuery(new ExampleSpecification<S>(example, escapeCharacter), example.getProbeType(), sort)
-				.getResultList();
+		return getQuery(new ExampleSpecification<>(example, escapeCharacter), example.getProbeType(), sort).getResultList();
 	}
 
 	/*
@@ -646,7 +653,7 @@ public <S extends T> List<S> saveAll(Iterable<S> entities) {
 
 		Assert.notNull(entities, "Entities must not be null!");
 
-		List<S> result = new ArrayList<S>();
+		List<S> result = new ArrayList<>();
 
 		for (S entity : entities) {
 			result.add(save(entity));
@@ -686,7 +693,6 @@ public void flush() {
 	 * @param query must not be {@literal null}.
 	 * @param spec can be {@literal null}.
 	 * @param pageable must not be {@literal null}.
-	 * @return
 	 * @deprecated use {@link #readPage(TypedQuery, Class, Pageable, Specification)} instead
 	 */
 	@Deprecated
@@ -702,7 +708,6 @@ protected Page<T> readPage(TypedQuery<T> query, Pageable pageable, @Nullable Spe
 	 * @param domainClass must not be {@literal null}.
 	 * @param spec can be {@literal null}.
 	 * @param pageable can be {@literal null}.
-	 * @return
 	 */
 	protected <S extends T> Page<S> readPage(TypedQuery<S> query, final Class<S> domainClass, Pageable pageable,
 			@Nullable Specification<S> spec) {
@@ -721,7 +726,6 @@ protected <S extends T> Page<S> readPage(TypedQuery<S> query, final Class<S> dom
 	 *
 	 * @param spec can be {@literal null}.
 	 * @param pageable must not be {@literal null}.
-	 * @return
 	 */
 	protected TypedQuery<T> getQuery(@Nullable Specification<T> spec, Pageable pageable) {
 
@@ -735,7 +739,6 @@ protected TypedQuery<T> getQuery(@Nullable Specification<T> spec, Pageable pagea
 	 * @param spec can be {@literal null}.
 	 * @param domainClass must not be {@literal null}.
 	 * @param pageable must not be {@literal null}.
-	 * @return
 	 */
 	protected <S extends T> TypedQuery<S> getQuery(@Nullable Specification<S> spec, Class<S> domainClass,
 			Pageable pageable) {
@@ -749,7 +752,6 @@ protected <S extends T> TypedQuery<S> getQuery(@Nullable Specification<S> spec,
 	 *
 	 * @param spec can be {@literal null}.
 	 * @param sort must not be {@literal null}.
-	 * @return
 	 */
 	protected TypedQuery<T> getQuery(@Nullable Specification<T> spec, Sort sort) {
 		return getQuery(spec, getDomainClass(), sort);
@@ -761,7 +763,6 @@ protected TypedQuery<T> getQuery(@Nullable Specification<T> spec, Sort sort) {
 	 * @param spec can be {@literal null}.
 	 * @param domainClass must not be {@literal null}.
 	 * @param sort must not be {@literal null}.
-	 * @return
 	 */
 	protected <S extends T> TypedQuery<S> getQuery(@Nullable Specification<S> spec, Class<S> domainClass, Sort sort) {
 
@@ -782,7 +783,6 @@ protected <S extends T> TypedQuery<S> getQuery(@Nullable Specification<S> spec,
 	 * Creates a new count query for the given {@link Specification}.
 	 *
 	 * @param spec can be {@literal null}.
-	 * @return
 	 * @deprecated override {@link #getCountQuery(Specification, Class)} instead
 	 */
 	@Deprecated
@@ -795,7 +795,6 @@ protected TypedQuery<Long> getCountQuery(@Nullable Specification<T> spec) {
 	 *
 	 * @param spec can be {@literal null}.
 	 * @param domainClass must not be {@literal null}.
-	 * @return
 	 */
 	protected <S extends T> TypedQuery<Long> getCountQuery(@Nullable Specification<S> spec, Class<S> domainClass) {
 
@@ -811,7 +810,7 @@ protected <S extends T> TypedQuery<Long> getCountQuery(@Nullable Specification<S
 		}
 
 		// Remove all Orders the Specifications might have applied
-		query.orderBy(Collections.<Order> emptyList());
+		query.orderBy(Collections.emptyList());
 
 		return em.createQuery(query);
 	}
@@ -822,7 +821,6 @@ protected <S extends T> TypedQuery<Long> getCountQuery(@Nullable Specification<S
 	 * @param spec can be {@literal null}.
 	 * @param domainClass must not be {@literal null}.
 	 * @param query must not be {@literal null}.
-	 * @return
 	 */
 	private <S, U extends T> Root<U> applySpecificationToCriteria(@Nullable Specification<U> spec, Class<U> domainClass,
 			CriteriaQuery<S> query) {
@@ -868,7 +866,6 @@ private void applyQueryHints(Query query) {
 	 * Executes a count query and transparently sums up all values returned.
 	 *
 	 * @param query must not be {@literal null}.
-	 * @return
 	 */
 	private static long executeCountQuery(TypedQuery<Long> query) {
 
@@ -941,8 +938,8 @@ private static class ExampleSpecification<T> implements Specification<T> {
 		/**
 		 * Creates new {@link ExampleSpecification}.
 		 *
-		 * @param example
-		 * @param escapeCharacter
+		 * @param example the example to base the specification of. Must not be {@literal null}.
+		 * @param escapeCharacter the escape character to use for like expressions. Must not be {@literal null}.
 		 */
 		ExampleSpecification(Example<T> example, EscapeCharacter escapeCharacter) {
 

src/test/java/org/springframework/data/jpa/domain/support/AuditingBeanFactoryPostProcessorUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2021 the original author or authors.
+ * Copyright 2008-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@ DefaultListableBeanFactory getBeanFactory() {
 	}
 
 	@Test
-	void beanConfigurerAspectShouldBeConfiguredAfterPostProcessing() throws Exception {
+	void beanConfigurerAspectShouldBeConfiguredAfterPostProcessing() {
 
 		processor.postProcessBeanFactory(beanFactory);
 

src/test/java/org/springframework/data/jpa/domain/support/AuditingNamespaceUnitTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2021 the original author or authors.
+ * Copyright 2008-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ String getConfigFile() {
 	}
 
 	@Test
-	void registersBeanDefinitions() throws Exception {
+	void registersBeanDefinitions() {
 
 		BeanDefinition definition = beanFactory.getBeanDefinition(AuditingEntityListener.class.getName());
 		PropertyValue propertyValue = definition.getPropertyValues().getPropertyValue("auditingHandler");

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2021 the original author or authors.
+ * Copyright 2008-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -106,7 +106,7 @@ void bindsNativeQueryResultsToProjectionByName() {}
 	 * Ignores the test. Reconsider once https://bugs.eclipse.org/bugs/show_bug.cgi?id=533240 is fixed.
 	 */
 	@Override
-	void findByEmptyArrayOfIntegers() throws Exception {}
+	void findByEmptyArrayOfIntegers() {}
 
 	/**
 	 * Ignores the test. Reconsider once https://bugs.eclipse.org/bugs/show_bug.cgi?id=533240 is fixed.
@@ -119,13 +119,13 @@ void findByAgeWithEmptyArrayOfIntegersOrFirstName() {
 	 * Ignores the test. Reconsider once https://bugs.eclipse.org/bugs/show_bug.cgi?id=533240 is fixed.
 	 */
 	@Override
-	void findByEmptyCollectionOfIntegers() throws Exception {}
+	void findByEmptyCollectionOfIntegers() {}
 
 	/**
 	 * Ignores the test. Reconsider once https://bugs.eclipse.org/bugs/show_bug.cgi?id=533240 is fixed.
 	 */
 	@Override
-	void findByEmptyCollectionOfStrings() throws Exception {}
+	void findByEmptyCollectionOfStrings() {}
 
 	/**
 	 * Ignores the test for EclipseLink.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2021 the original author or authors.
+ * Copyright 2011-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ class EclipseLinkUserRepositoryFinderTests extends UserRepositoryFinderTests {
 
 	@Disabled
 	@Override
-	void executesNotInQueryCorrectly() throws Exception {}
+	void executesNotInQueryCorrectly() {}
 
 	@Disabled
 	@Override

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2021 the original author or authors.
+ * Copyright 2008-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,10 +40,9 @@ public class ORMInfrastructureTests {
 	/**
 	 * Tests, that the context got initialized and injected correctly.
 	 *
-	 * @throws Exception
 	 */
 	@Test
-	void contextInitialized() throws Exception {
+	void contextInitialized() {
 
 		assertThat(context).isNotNull();
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,5 +23,5 @@ class OpenJpaParentRepositoryIntegrationTests extends ParentRepositoryIntegratio
 
 	@Override
 	@Disabled
-	void testWithJoin() throws Exception {}
+	void testWithJoin() {}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2021 the original author or authors.
+ * Copyright 2011-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,5 +29,5 @@ class OpenJpaUserRepositoryFinderTests extends UserRepositoryFinderTests {
 
 	@Disabled
 	@Override
-	void findsByLastnameIgnoringCaseLike() throws Exception {}
+	void findsByLastnameIgnoringCaseLike() {}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2021 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -84,7 +84,7 @@ public Predicate toPredicate(Root<Parent> root, CriteriaQuery<?> query, Criteria
 	}
 
 	@Test // DATAJPA-287
-	void testWithJoin() throws Exception {
+	void testWithJoin() {
 		Page<Parent> page = repository.findAll(new Specification<Parent>() {
 			@Override
 			public Predicate toPredicate(Root<Parent> root, CriteriaQuery<?> query, CriteriaBuilder cb) {