Polishing.

Enable EclipseLink integration tests for UserRepositoryTests. Disable tests that fail because of non-spec compliance, update test to pass structured query parsing.

Improve exception message for failures if the CriteriaBuilder does not support ILIKE.

Move tests to according test classes.

See #4112

Author: mp911de

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlOrderExpressionVisitor.java

@@ -41,6 +41,7 @@
 
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.TerminalNode;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
@@ -50,6 +51,8 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.JpaSort;
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * Parses the content of {@link JpaSort#unsafe(String...)} as an HQL {@literal sortExpression} and renders that into a
@@ -62,6 +65,9 @@
 @SuppressWarnings({ "unchecked", "rawtypes", "ConstantValue", "NullAway" })
 class HqlOrderExpressionVisitor extends HqlBaseVisitor<Expression<?>> {
 
+	private static final boolean HIBERNATE_PRESENT = ClassUtils.isPresent(
+			"org.hibernate.query.criteria.HibernateCriteriaBuilder", HqlOrderExpressionVisitor.class.getClassLoader());
+
 	private static final DateTimeFormatter DATE_TIME = new DateTimeFormatterBuilder().parseCaseInsensitive()
 			.append(ISO_LOCAL_DATE).optionalStart().appendLiteral(' ').optionalEnd().optionalStart().appendLiteral('T')
 			.optionalEnd().append(ISO_LOCAL_TIME).optionalStart().appendLiteral(' ').optionalEnd().optionalStart()
@@ -225,22 +231,53 @@ public Expression<?> visitStringPatternMatching(HqlParser.StringPatternMatchingC
 						? cb.notLike(condition, match) //
 						: cb.notLike(condition, match, escape);
 			}
-		} else if (ctx.ILIKE() != null && cb instanceof HibernateCriteriaBuilder) {
+		} else if (ctx.ILIKE() != null) {
+
+			if (HIBERNATE_PRESENT) {
+				if (cb instanceof HibernateCriteriaBuilder hcb) {
+
+					if (ctx.NOT() == null) {
+						return escape == null //
+								? hcb.ilike(condition, match) //
+								: hcb.ilike(condition, match, escape);
+					} else {
+						return escape == null //
+								? hcb.notIlike(condition, match) //
+								: hcb.notIlike(condition, match, escape);
+					}
+				}
+			}
 
-			HibernateCriteriaBuilder hcb = (HibernateCriteriaBuilder) cb;
+			throw new UnsupportedOperationException(
+					"ILIKE pattern [%s] not supported by %s ".formatted(renderContext(ctx), cb));
+		} else {
+			throw new UnsupportedOperationException("Unsupported string matching pattern: " + renderContext(ctx).trim());
+		}
+	}
 
-			if (ctx.NOT() == null) {
-				return escape == null //
-						? hcb.ilike(condition, match) //
-						: hcb.ilike(condition, match, escape);
-			} else {
-				return escape == null //
-						? hcb.notIlike(condition, match) //
-						: hcb.notIlike(condition, match, escape);
+	private static String renderContext(ParserRuleContext ctx) {
+
+		if (ctx.children == null) {
+			return "";
+		}
+
+		StringBuilder builder = new StringBuilder();
+		for (ParseTree child : ctx.children) {
+
+			String text = "";
+			if (child instanceof TerminalNode) {
+				text = child.getText();
+			} else if (child instanceof ParserRuleContext) {
+				text = renderContext((ParserRuleContext) child);
 			}
-		} else {
-			throw new UnsupportedOperationException("Unsupported string pattern: " + ctx.getText());
+
+			if (!builder.isEmpty() && StringUtils.hasText(text)) {
+				builder.append(" ");
+			}
+			builder.append(text);
 		}
+
+		return builder.toString();
 	}
 
 	@Override

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ParameterMetadataProvider.java

@@ -72,7 +72,7 @@ public class ParameterMetadataProvider {
 	private int bindMarker;
 
 	/**
-	 * Creates a new {@link ParameterMetadataProvider} from the given {@link CriteriaBuilder} and
+	 * Creates a new {@code ParameterMetadataProvider} from the given {@link CriteriaBuilder} and
 	 * {@link ParametersParameterAccessor}.
 	 *
 	 * @param accessor must not be {@literal null}.
@@ -115,7 +115,7 @@ public ParameterMetadataProvider(JpaParameters parameters, EscapeCharacter escap
 	}
 
 	/**
-	 * Creates a new {@link ParameterMetadataProvider} from the given {@link CriteriaBuilder} an {@link Iterable} of all
+	 * Creates a new {@code ParameterMetadataProvider} from the given {@link CriteriaBuilder} an {@link Iterable} of all
 	 * bindable parameter values, and {@link Parameters}.
 	 *
 	 * @param bindableParameterValues may be {@literal null}.

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

@@ -34,9 +34,9 @@
  * @author Moritz Becker
  * @author Andrey Kovalev
  * @author Krzysztof Krason
+ * @author Mark Paluch
  */
 @ContextConfiguration(value = "classpath:eclipselink.xml")
-@Disabled("hsqldb seems to hang on this test class without leaving a surefire report")
 class EclipseLinkNamespaceUserRepositoryTests extends NamespaceUserRepositoryTests {
 
 	/**
@@ -102,30 +102,6 @@ void returnsNullValueInMap() {}
 	@Test
 	void bindsNativeQueryResultsToProjectionByName() {}
 
-	/**
-	 * Ignores the test. Reconsider once https://bugs.eclipse.org/bugs/show_bug.cgi?id=533240 is fixed.
-	 */
-	@Override
-	void findByEmptyArrayOfIntegers() {}
-
-	/**
-	 * Ignores the test. Reconsider once https://bugs.eclipse.org/bugs/show_bug.cgi?id=533240 is fixed.
-	 */
-	@Override
-	void findByAgeWithEmptyArrayOfIntegersOrFirstName() {}
-
-	/**
-	 * Ignores the test. Reconsider once https://bugs.eclipse.org/bugs/show_bug.cgi?id=533240 is fixed.
-	 */
-	@Override
-	void findByEmptyCollectionOfIntegers() {}
-
-	/**
-	 * Ignores the test. Reconsider once https://bugs.eclipse.org/bugs/show_bug.cgi?id=533240 is fixed.
-	 */
-	@Override
-	void findByEmptyCollectionOfStrings() {}
-
 	/**
 	 * Ignores the test for EclipseLink.
 	 */
@@ -165,4 +141,120 @@ void findByElementVarargInAttributeIgnoreCase() {}
 	@Override
 	@Test // DATAJPA-1303
 	void findByElementCollectionInAttributeIgnoreCaseWithNulls() {}
+
+	@Disabled("Binding collections to IN predicates not supported")
+	@Override
+	@Test
+	void invokesQueryWithVarargsParametersCorrectly() {}
+
+	@Disabled("Named parameters in native SQL queries are not supported in EclipseLink")
+	@Override
+	@Test
+	void insertStatementModifyingQueryWithParamsWorks() {}
+
+	@Disabled("Named parameters in native SQL queries are not supported in EclipseLink")
+	@Override
+	@Test
+	void bindsSpELParameterOnlyUsedInCountQuery() {}
+
+	@Disabled
+	@Override
+	@Test
+	public void correctlyBuildSortClauseWhenSortingByFunctionAliasAndFunctionContainsNamedParameters() {}
+
+	@Disabled
+	@Override
+	@Test
+	public void allowsExecutingPageableMethodWithUnpagedArgument() {}
+
+	@Disabled("No Tuples support in EclipseLink")
+	@Override
+	@Test
+	public void supportsProjectionsWithNativeQueriesAndUnderscoresColumnNameToCamelCaseProperty() {}
+
+	@Disabled
+	@Override
+	@Test
+	public void findByFluentExampleWithSimplePropertyPathsDoesntLoadUnrequestedPaths() {}
+
+	@Disabled("Not spec-compliant")
+	@Override
+	@Test
+	public void findByFluentSpecificationWithInterfaceBasedProjection() {}
+
+	@Disabled("Not spec-compliant")
+	@Override
+	@Test
+	public void findByFluentSpecificationWithDtoProjection() {}
+
+	@Disabled("Named parameters in native SQL queries are not supported in EclipseLink")
+	@Override
+	@Test
+	public void modifyingUpdateNativeQueryWorksWithJSQLParser() {}
+
+	@Disabled("EclipseLink treats id as keyword")
+	@Override
+	@Test
+	public void scrollByPredicateKeysetWithInterfaceProjection() {}
+
+	@Disabled("EclipseLink treats id as keyword")
+	@Override
+	@Test
+	public void executesDerivedExistsQuery() {}
+
+	@Disabled("Not spec-compliant")
+	@Override
+	@Test
+	public void findByFluentSpecificationWithCollectionPropertyPathsDoesntLoadUnrequestedPaths() {}
+
+	@Disabled("Not spec-compliant")
+	@Override
+	@Test
+	public void findByFluentExampleWithComplexPropertyPathsDoesntLoadUnrequestedPaths() {}
+
+	@Disabled("Not spec-compliant")
+	@Override
+	@Test
+	public void findByFluentExampleWithCollectionPropertyPathsDoesntLoadUnrequestedPaths() {}
+
+	@Disabled("Not spec-compliant")
+	@Override
+	@Test
+	public void findByFluentSpecificationWithSimplePropertyPathsDoesntLoadUnrequestedPaths() {}
+
+	@Disabled("Not spec-compliant")
+	@Override
+	@Test
+	public void findByFluentSpecificationWithComplexPropertyPathsDoesntLoadUnrequestedPaths() {}
+
+	@Disabled("Not spec-compliant")
+	@Override
+	@Test
+	public void findByFluentPredicateWithProjectionAndPageRequest() {}
+
+	@Disabled("Not spec-compliant")
+	@Override
+	@Test
+	public void findByFluentPredicateWithProjectionAndAll() {}
+
+	@Disabled("Binding collections to IN predicates not supported")
+	@Override
+	@Test
+	public void findByCollectionWithPageRequest() {}
+
+	@Disabled("Binding collections to IN predicates not supported")
+	@Override
+	@Test
+	public void findByCollectionWithPageable() {}
+
+	@Disabled("EclipseLink does not support records")
+	@Override
+	@Test
+	public void supportsRecordsWithNativeQueries() {}
+
+	@Disabled("Not spec-compliant")
+	@Override
+	@Test
+	public void correctlyBuildSortClauseWhenSortingByFunctionAliasAndFunctionContainsPositionalParameters() {}
+
 }

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

@@ -3304,7 +3304,7 @@ void findAllShouldApplyUnsafeSort() {
 		repository.saveAllAndFlush(List.of(firstUser, secondUser, thirdUser, fourthUser));
 
 		assertThat(
-				repository.findAll(JpaSort.unsafe("case when firstname ilike 'O%' escape '^' then 'A' else firstname end")))
+				repository.findAll(JpaSort.unsafe("case when firstname like 'O%' escape '^' then 'A' else firstname end")))
 				.containsExactly(firstUser, thirdUser, secondUser, fourthUser);
 	}