HSEARCH-5219 Upgrade to Hibernate ORM 6.6.0.Final

hibernate · Aug 8, 2024 · b561fe1 · b561fe1
1 parent ce59131
commit b561fe1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 55 deletions.
diff --git a/build/config/pom.xml b/build/config/pom.xml
@@ -232,10 +232,6 @@
                                 <argument>^org\.hibernate\.type\.spi\.TypeConfiguration$</argument>
                                 <argument>^org\.hibernate\.query\.spi\.ScrollableResultsImplementor$</argument>
                                 <argument>^org\.hibernate\.query\.spi\.QueryParameterBindingTypeResolver$</argument>
-                                <argument>^org\.hibernate\.query\.spi\.QueryParameter$</argument>
-                                <argument>^org\.hibernate\.query\.QueryParameter$</argument>
-                                <argument>^org\.hibernate\.query\.spi\.QueryParameterBinding$</argument>
-                                <argument>^org\.hibernate\.query\.spi\.QueryParameterBindings$</argument>
                                 <argument>^org\.hibernate\.query\.sqm\.spi\.SqmCreationContext$</argument>
                             </arguments>
                             <!--

diff --git a/build/parents/build/pom.xml b/build/parents/build/pom.xml
@@ -93,7 +93,7 @@
             NOTE: when Hibernate ORM updates Byte Buddy, make sure to check Jenkinsfile to see if
             `net.bytebuddy.experimental` property can be removed.
          -->
-        <version.org.hibernate.orm>6.6.0.CR2</version.org.hibernate.orm>
+        <version.org.hibernate.orm>6.6.0.Final</version.org.hibernate.orm>
 
         <javadoc.org.hibernate.orm.url>https://docs.jboss.org/hibernate/orm/${parsed-version.org.hibernate.orm.majorVersion}.${parsed-version.org.hibernate.orm.minorVersion}/javadocs/</javadoc.org.hibernate.orm.url>
         <documentation.org.hibernate.orm.url>https://docs.jboss.org/hibernate/orm/${parsed-version.org.hibernate.orm.majorVersion}.${parsed-version.org.hibernate.orm.minorVersion}/userguide/html_single/Hibernate_User_Guide.html</documentation.org.hibernate.orm.url>

diff --git a/...ava/org/hibernate/search/mapper/orm/search/query/impl/HibernateOrmSearchQueryAdapter.java b/...ava/org/hibernate/search/mapper/orm/search/query/impl/HibernateOrmSearchQueryAdapter.java
@@ -8,7 +8,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import java.util.function.BiConsumer;
 import java.util.function.Function;
 
 import jakarta.persistence.LockModeType;
@@ -20,9 +19,7 @@
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
 import org.hibernate.ScrollMode;
-import org.hibernate.cache.spi.QueryKey;
 import org.hibernate.engine.spi.SessionImplementor;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.graph.GraphSemantic;
 import org.hibernate.graph.RootGraph;
 import org.hibernate.graph.spi.AppliedGraph;
@@ -225,13 +222,13 @@ public ParameterMetadataImplementor getParameterMetadata() {
 	@Override
 	public QueryParameterBindings getParameterBindings() {
 		// parameters not supported in Hibernate Search queries
-		return NO_PARAM_BINDINGS;
+		return QueryParameterBindings.empty();
 	}
 
 	@Override
 	public QueryParameterBindings getQueryParameterBindings() {
 		// parameters not supported in Hibernate Search queries
-		return NO_PARAM_BINDINGS;
+		return QueryParameterBindings.empty();
 	}
 
 	@Override
@@ -334,49 +331,4 @@ private static boolean isGraphApplied(MutableQueryOptions queryOptions) {
 		final AppliedGraph appliedGraph = queryOptions.getAppliedGraph();
 		return appliedGraph != null && appliedGraph.getSemantic() != null;
 	}
-
-	/*
-	 * Suggested alternative to the deprecated QueryParameterBindings.NO_PARAM_BINDINGS is org.hibernate.query.internal.QueryParameterBindingsImpl#EMPTY,
-	 * which is in an internal package, and we don't want to rely on internal classes here if we can.
-	 */
-	private static final QueryParameterBindings NO_PARAM_BINDINGS = new QueryParameterBindings() {
-		@Override
-		public boolean isBound(QueryParameterImplementor<?> parameter) {
-			return false;
-		}
-
-		@Override
-		public <P> QueryParameterBinding<P> getBinding(QueryParameterImplementor<P> parameter) {
-			return null;
-		}
-
-		@Override
-		public QueryParameterBinding<?> getBinding(String name) {
-			return null;
-		}
-
-		@Override
-		public QueryParameterBinding<?> getBinding(int position) {
-			return null;
-		}
-
-		@Override
-		public void visitBindings(BiConsumer<QueryParameterImplementor<?>, QueryParameterBinding<?>> action) {
-			//do nothing
-		}
-
-		@Override
-		public void validate() {
-		}
-
-		@Override
-		public boolean hasAnyMultiValuedBindings() {
-			return false;
-		}
-
-		@Override
-		public QueryKey.ParameterBindingsMemento generateQueryKeyMemento(SharedSessionContractImplementor session) {
-			return NO_PARAMETER_BINDING_MEMENTO;
-		}
-	};
 }