Add integration test for QueryByExample match mode on associations.

Original Pull Request: #3794

Author: christophstrobl

spring-data-jpa/src/main/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilder.java

@@ -36,6 +36,7 @@
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.ExampleMatcher;
+import org.springframework.data.domain.ExampleMatcher.MatchMode;
 import org.springframework.data.domain.ExampleMatcher.PropertyValueTransformer;
 import org.springframework.data.jpa.repository.query.EscapeCharacter;
 import org.springframework.data.support.ExampleMatcherAccessor;
@@ -105,9 +106,8 @@ public static <T> Predicate getPredicate(Root<T> root, CriteriaBuilder cb, Examp
 		ExampleMatcher matcher = example.getMatcher();
 
 		List<Predicate> predicates = getPredicates("", cb, root, root.getModel(), example.getProbe(),
-				example.getProbeType(), matcher, new ExampleMatcherAccessor(matcher),
-				new PathNode("root", null, example.getProbe()),
-				escapeCharacter);
+				example.getProbeType(), matcher.getMatchMode(), new ExampleMatcherAccessor(matcher),
+				new PathNode("root", null, example.getProbe()), escapeCharacter);
 
 		if (predicates.isEmpty()) {
 			return null;
@@ -124,7 +124,7 @@ public static <T> Predicate getPredicate(Root<T> root, CriteriaBuilder cb, Examp
 
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	static List<Predicate> getPredicates(String path, CriteriaBuilder cb, Path<?> from, ManagedType<?> type, Object value,
-			Class<?> probeType, ExampleMatcher matcher, ExampleMatcherAccessor exampleAccessor, PathNode currentNode,
+			Class<?> probeType, MatchMode matchMode, ExampleMatcherAccessor exampleAccessor, PathNode currentNode,
 			EscapeCharacter escapeCharacter) {
 
 		List<Predicate> predicates = new ArrayList<>();
@@ -161,7 +161,7 @@ static List<Predicate> getPredicates(String path, CriteriaBuilder cb, Path<?> fr
 
 				predicates
 						.addAll(getPredicates(currentPath, cb, from.get(attribute.getName()), (ManagedType<?>) attribute.getType(),
-								attributeValue, probeType, matcher, exampleAccessor, currentNode, escapeCharacter));
+								attributeValue, probeType, matchMode, exampleAccessor, currentNode, escapeCharacter));
 				continue;
 			}
 
@@ -174,9 +174,9 @@ static List<Predicate> getPredicates(String path, CriteriaBuilder cb, Path<?> fr
 									ClassUtils.getShortName(probeType), node));
 				}
 
-				JoinType joinType = matcher.isAllMatching() ? JoinType.INNER : JoinType.LEFT;
+				JoinType joinType = matchMode.equals(MatchMode.ALL) ? JoinType.INNER : JoinType.LEFT;
 				predicates.addAll(getPredicates(currentPath, cb, ((From<?, ?>) from).join(attribute.getName(), joinType),
-						(ManagedType<?>) attribute.getType(), attributeValue, probeType, matcher, exampleAccessor, node,
+						(ManagedType<?>) attribute.getType(), attributeValue, probeType, matchMode, exampleAccessor, node,
 						escapeCharacter));
 
 				continue;

spring-data-jpa/src/test/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilderUnitTests.java

@@ -277,7 +277,7 @@ void likePatternsGetEscapedEnding() {
 		verify(cb, times(1)).like(any(Expression.class), eq("%f\\\\o\\_o"), eq('\\'));
 	}
 
-	@ParameterizedTest(name = "Matching {0} on association should join using JoinType.{1} ") // DATAJPA-3763
+	@ParameterizedTest(name = "Matching {0} on association should join using JoinType.{1} ") // GH-3763
 	@CsvSource({ "ALL, INNER", "ANY, LEFT" })
 	void matchingAssociationShouldUseTheCorrectJoinType(MatchMode matchMode, JoinType expectedJoinType) {
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/QueryByExampleIntegrationTests.java

@@ -15,37 +15,44 @@
  */
 package org.springframework.data.jpa.repository;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.Predicate;
 import jakarta.persistence.criteria.Root;
 
+import java.util.List;
+
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
+import org.springframework.data.domain.ExampleMatcher;
 import org.springframework.data.jpa.convert.QueryByExamplePredicateBuilder;
 import org.springframework.data.jpa.domain.sample.Role;
+import org.springframework.data.jpa.domain.sample.User;
 import org.springframework.data.jpa.repository.sample.RoleRepository;
+import org.springframework.data.jpa.repository.sample.UserRepository;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author Greg Turnquist
+ * @author Christoph Strobl
  * @since 3.0
  */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration({ "classpath:hibernate.xml", "classpath:config/namespace-application-context.xml" })
 @Transactional
 class QueryByExampleIntegrationTests {
 
-	@Autowired RoleRepository repository;
+	@Autowired RoleRepository roleRepository;
+	@Autowired UserRepository userRepository;
 	@Autowired EntityManager em;
 
 	private Role drummer;
@@ -55,14 +62,14 @@ class QueryByExampleIntegrationTests {
 	@BeforeEach
 	void setUp() {
 
-		drummer = repository.save(new Role("drummer"));
-		guitarist = repository.save(new Role("guitarist"));
-		singer = repository.save(new Role("singer"));
+		drummer = roleRepository.save(new Role("drummer"));
+		guitarist = roleRepository.save(new Role("guitarist"));
+		singer = roleRepository.save(new Role("singer"));
 	}
 
 	@AfterEach
 	void clearUp() {
-		repository.deleteAll();
+		roleRepository.deleteAll();
 	}
 
 	@Test // GH-2283
@@ -81,6 +88,39 @@ void queryByExampleWithNoPredicatesShouldHaveNoWhereClause() {
 
 		// then
 		assertThat(predicate).isNull();
-		assertThat(repository.findAll(example)).containsExactlyInAnyOrder(drummer, guitarist, singer);
+		assertThat(roleRepository.findAll(example)).containsExactlyInAnyOrder(drummer, guitarist, singer);
+	}
+
+	@Test // GH-3763
+	void usesAnyMatchOnJoins() {
+
+		User manager = new User("mighty", "super user", "[email protected]");
+
+		userRepository.save(manager);
+
+		User dave = new User();
+		dave.setFirstname("dave");
+		dave.setLastname("matthews");
+		dave.setEmailAddress("[email protected]");
+		dave.addRole(singer);
+
+		User carter = new User();
+		carter.setFirstname("carter");
+		carter.setLastname("beaufort");
+		carter.setEmailAddress("[email protected]");
+		carter.addRole(drummer);
+		carter.addRole(singer);
+		carter.setManager(manager);
+
+		userRepository.saveAllAndFlush(List.of(dave, carter));
+
+		User probe = new User();
+		probe.setLastname(dave.getLastname());
+		probe.setManager(manager);
+
+		Example<User> example = Example.of(probe,
+				ExampleMatcher.matchingAny().withIgnorePaths("id", "createdAt", "age", "active", "emailAddress",
+						"secondaryEmailAddress", "colleagues", "address", "binaryData", "attributes", "dateOfBirth"));
+		assertThat(userRepository.findAll(example)).containsExactly(dave, carter);
 	}
 }