From 872ba7353602e1df1fd88c98652ae02b3a9a1ccf Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 2 Nov 2023 09:58:28 +0100 Subject: [PATCH] Polishing. Use version-agnostic Hibernate presence check. See #3212 --- .../data/jpa/repository/query/QueryEnhancerFactory.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryEnhancerFactory.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryEnhancerFactory.java index a78ef7469..0b736d8ed 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryEnhancerFactory.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryEnhancerFactory.java @@ -35,10 +35,7 @@ public final class QueryEnhancerFactory { private static final boolean jSqlParserPresent = ClassUtils.isPresent("net.sf.jsqlparser.parser.JSqlParser", QueryEnhancerFactory.class.getClassLoader()); - private static final boolean hibernatePresent = ClassUtils.isPresent("org.hibernate.query.TypedParameterValue", - QueryEnhancerFactory.class.getClassLoader()); - - private static final boolean hibernate5Present = ClassUtils.isPresent("org.hibernate.jpa.TypedParameterValue", + private static final boolean hibernatePresent = ClassUtils.isPresent("org.hibernate.Hibernate", QueryEnhancerFactory.class.getClassLoader()); static { @@ -47,7 +44,7 @@ public final class QueryEnhancerFactory { LOG.info("JSqlParser is in classpath; If applicable, JSqlParser will be used"); } - if (hibernatePresent || hibernate5Present) { + if (hibernatePresent) { LOG.info("Hibernate is in classpath; If applicable, HQL parser will be used."); } } @@ -74,7 +71,7 @@ public final class QueryEnhancerFactory { return new DefaultQueryEnhancer(query); } - return (hibernatePresent || hibernate5Present) ? JpaQueryEnhancer.forHql(query) : JpaQueryEnhancer.forJpql(query); + return hibernatePresent ? JpaQueryEnhancer.forHql(query) : JpaQueryEnhancer.forJpql(query); } }