Polishing.

Improve named query detection and query extraction for Eclipselink.

See #3939

Author: mp911de

spring-data-jpa/src/main/java/org/springframework/data/jpa/provider/PersistenceProvider.java

@@ -35,7 +35,10 @@
 import java.util.stream.Stream;
 
 import org.eclipse.persistence.config.QueryHints;
+import org.eclipse.persistence.internal.queries.DatabaseQueryMechanism;
+import org.eclipse.persistence.internal.queries.JPQLCallQueryMechanism;
 import org.eclipse.persistence.jpa.JpaQuery;
+import org.eclipse.persistence.queries.DatabaseQuery;
 import org.eclipse.persistence.queries.ScrollableCursor;
 import org.hibernate.ScrollMode;
 import org.hibernate.ScrollableResults;
@@ -50,6 +53,7 @@
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ConcurrentReferenceHashMap;
+import org.springframework.util.StringUtils;
 
 /**
  * Enumeration representing persistence providers to be used.
@@ -137,11 +141,37 @@ public long getResultCount(Query resultQuery, LongSupplier countSupplier) {
 
 		@Override
 		public String extractQueryString(Object query) {
-			return ((JpaQuery<?>) query).getDatabaseQuery().getJPQLString();
+
+			if (query instanceof JpaQuery<?> jpaQuery) {
+
+				DatabaseQuery databaseQuery = jpaQuery.getDatabaseQuery();
+
+				if (StringUtils.hasText(databaseQuery.getJPQLString())) {
+					return databaseQuery.getJPQLString();
+				}
+
+				if (StringUtils.hasText(databaseQuery.getSQLString())) {
+					return databaseQuery.getSQLString();
+				}
+			}
+
+			return "";
 		}
 
 		@Override
 		public boolean isNativeQuery(Object query) {
+
+			if (query instanceof JpaQuery<?> jpaQuery) {
+
+				DatabaseQueryMechanism call = jpaQuery.getDatabaseQuery().getQueryMechanism();
+
+				if (call instanceof JPQLCallQueryMechanism) {
+					return false;
+				}
+
+				return true;
+			}
+
 			return false;
 		}
 

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

@@ -210,6 +210,7 @@ public Expression<?> visitIsBooleanPredicate(HqlParser.IsBooleanPredicateContext
 
 	@Override
 	public Expression<?> visitStringPatternMatching(HqlParser.StringPatternMatchingContext ctx) {
+
 		Expression<String> condition = visitRequired(ctx.expression(0));
 		Expression<String> match = visitRequired(ctx.expression(1));
 		Expression<Character> escape = ctx.ESCAPE() != null ? charLiteralOf(ctx.ESCAPE()) : null;
@@ -224,8 +225,10 @@ public Expression<?> visitStringPatternMatching(HqlParser.StringPatternMatchingC
 						? cb.notLike(condition, match) //
 						: cb.notLike(condition, match, escape);
 			}
-		} else {
+		} else if (ctx.ILIKE() != null && cb instanceof HibernateCriteriaBuilder) {
+
 			HibernateCriteriaBuilder hcb = (HibernateCriteriaBuilder) cb;
+
 			if (ctx.NOT() == null) {
 				return escape == null //
 						? hcb.ilike(condition, match) //
@@ -235,6 +238,8 @@ public Expression<?> visitStringPatternMatching(HqlParser.StringPatternMatchingC
 						? hcb.notIlike(condition, match) //
 						: hcb.notIlike(condition, match, escape);
 			}
+		} else {
+			throw new UnsupportedOperationException("Unsupported string pattern: " + ctx.getText());
 		}
 	}
 

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

@@ -90,17 +90,20 @@ private NamedQuery(JpaQueryMethod method, EntityManager em, JpaQueryConfiguratio
 			throw QueryCreationException.create(method, CANNOT_EXTRACT_QUERY);
 		}
 
+		boolean nativeQuery = method.isNativeQuery() || extractor.isNativeQuery(namedQuery);
+		String queryString = extractor.extractQueryString(namedQuery);
+
 		if (parameters.hasPageableParameter()) {
+
 			LOG.warn(String.format(
 					"Query method %s is backed by a NamedQuery but contains a Pageable parameter; Sorting delivered via this Pageable will not be applied; Use @%s(value=…) instead to apply sorting.",
-					method, method.isNativeQuery() ? "NativeQuery" : "Query"));
+					method, nativeQuery ? "NativeQuery" : "Query"));
 		}
 
-		String queryString = extractor.extractQueryString(namedQuery);
-
+		// || namedQuery.toString().contains("NativeQuery")
 		DeclaredQuery declaredQuery;
 		if (StringUtils.hasText(queryString)) {
-			if (method.isNativeQuery() || namedQuery.toString().contains("NativeQuery")) {
+			if (nativeQuery) {
 				declaredQuery = DeclaredQuery.nativeQuery(queryString);
 			} else {
 				declaredQuery = DeclaredQuery.jpqlQuery(queryString);