[#646] Upgrade to ORM 5.4.31.Final

After this upgrade we are also compatible with ORM 5.5

Author: DavideD

build.gradle

@@ -50,10 +50,10 @@ version = projectVersion
 // allows overriding the build using a parameter, which can be
 // useful to monitor compatibility for upcoming versions on CI:
 //
-// ./gradlew clean build -PhibernateOrmVersion=5.4.30-SNAPSHOT
+// ./gradlew clean build -PhibernateOrmVersion=5.4.32-SNAPSHOT
 ext {
     if ( !project.hasProperty('hibernateOrmVersion') ) {
-        hibernateOrmVersion = '5.4.30.Final'
+        hibernateOrmVersion = '5.4.31.Final'
     }
     // For ORM, we need a parsed version (to get the family, ...)
 

hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveQueryImpl.java

@@ -15,7 +15,6 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.graph.GraphSemantic;
 import org.hibernate.graph.RootGraph;
-import org.hibernate.query.ParameterMetadata;
 import org.hibernate.query.criteria.internal.compile.ExplicitParameterInfo;
 import org.hibernate.query.criteria.internal.compile.InterpretedParameterMetadata;
 import org.hibernate.query.internal.QueryImpl;
@@ -59,11 +58,10 @@ private static QueryType queryType(String queryString) {
 				? QueryType.INSERT_UPDATE_DELETE
 				: QueryType.SELECT;
 	}
-
 	public ReactiveQueryImpl(SharedSessionContractImplementor producer,
-							 ParameterMetadata parameterMetadata,
+							 HQLQueryPlan hqlQueryPlan,
 							 String queryString) {
-		super( producer, parameterMetadata, queryString );
+		super( producer, hqlQueryPlan, queryString );
 		this.type = queryType( queryString );
 	}
 

hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveSessionImpl.java

@@ -68,8 +68,6 @@
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.proxy.LazyInitializer;
 import org.hibernate.query.ParameterMetadata;
-import org.hibernate.query.Query;
-import org.hibernate.query.internal.ParameterMetadataImpl;
 import org.hibernate.reactive.common.InternalStateAssertions;
 import org.hibernate.reactive.common.ResultSetMapping;
 import org.hibernate.reactive.engine.ReactiveActionQueue;
@@ -345,8 +343,7 @@ public <R> ReactiveQueryImpl<R> createReactiveQuery(String queryString) {
 		delayedAfterCompletion();
 
 		try {
-			ParameterMetadataImpl paramMetadata = getQueryPlan( queryString, false ).getParameterMetadata();
-			ReactiveQueryImpl<R> query = new ReactiveQueryImpl<>( this, paramMetadata, queryString );
+			ReactiveQueryImpl<R> query = new ReactiveQueryImpl<>( this, getQueryPlan( queryString, false ), queryString );
 			applyQuerySettingsAndHints( query );
 			query.setComment( queryString );
 			return query;
@@ -362,7 +359,7 @@ public <R> ReactiveQuery<R> createReactiveQuery(String queryString, Class<R> res
 		try {
 			// do the translation
 			final ReactiveQueryImpl<R> query = createReactiveQuery( queryString );
-			resultClassChecking( resultType, query.unwrap( Query.class ) );
+			resultClassChecking( resultType, query );
 			return query;
 		}
 		catch (RuntimeException e) {
@@ -529,8 +526,7 @@ private static String comment(NamedQueryDefinition queryDefinition) {
 
 	private <T> ReactiveQuery<T> createReactiveQuery(NamedQueryDefinition queryDefinition) {
 		String queryString = queryDefinition.getQueryString();
-		ParameterMetadataImpl paramMetadata = getQueryPlan( queryString, false ).getParameterMetadata();
-		ReactiveQueryImpl<T> query = new ReactiveQueryImpl<>( this, paramMetadata, queryString );
+		ReactiveQueryImpl<T> query = new ReactiveQueryImpl<>( this, getQueryPlan( queryString, false ), queryString );
 		applyQuerySettingsAndHints( query );
 		query.setHibernateFlushMode( queryDefinition.getFlushMode() );
 		query.setComment( comment( queryDefinition ) );

hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveStatelessSessionImpl.java

@@ -35,8 +35,6 @@
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.proxy.LazyInitializer;
 import org.hibernate.query.ParameterMetadata;
-import org.hibernate.query.Query;
-import org.hibernate.query.internal.ParameterMetadataImpl;
 import org.hibernate.reactive.common.ResultSetMapping;
 import org.hibernate.reactive.engine.impl.ReactivePersistenceContextAdapter;
 import org.hibernate.reactive.loader.custom.impl.ReactiveCustomLoader;
@@ -300,10 +298,8 @@ public <R> ReactiveQueryImpl<R> createReactiveQuery(String queryString) {
         checkOpen();
 
         try {
-            ParameterMetadataImpl paramMetadata =
-                    getQueryPlan( queryString, false ).getParameterMetadata();
             ReactiveQueryImpl<R> query =
-                    new ReactiveQueryImpl<>( this, paramMetadata, queryString );
+                    new ReactiveQueryImpl<>( this, getQueryPlan( queryString, false ), queryString );
             applyQuerySettingsAndHints( query );
             query.setComment( queryString );
             return query;
@@ -319,7 +315,7 @@ public <R> ReactiveQuery<R> createReactiveQuery(String queryString, Class<R> res
         try {
             // do the translation
             final ReactiveQueryImpl<R> query = createReactiveQuery( queryString );
-            resultClassChecking( resultType, query.unwrap( Query.class ) );
+            resultClassChecking( resultType, query );
             return query;
         }
         catch (RuntimeException e) {