pull getParameterMetadata() up to CommonQueryContract

and add getParameters() to ParameterMetadata

(this is going to be useful in Hibernate Reactive)

Author: gavinking

hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java

@@ -5,6 +5,7 @@
 package org.hibernate.procedure.internal;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -27,6 +28,7 @@
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptySet;
+import static java.util.Collections.unmodifiableList;
 
 /**
  * Specialized ParameterMetadataImplementor for callable queries implementing
@@ -80,6 +82,11 @@ public void visitParameters(Consumer<QueryParameter<?>> consumer) {
 		}
 	}
 
+	@Override
+	public Collection<QueryParameter<?>> getParameters() {
+		return unmodifiableList( parameters );
+	}
+
 	@Override
 	public boolean hasNamedParameters() {
 		return parameterStrategy == ParameterStrategy.NAMED;

hibernate-core/src/main/java/org/hibernate/query/CommonQueryContract.java

@@ -192,6 +192,14 @@ public interface CommonQueryContract {
 	 */
 	CommonQueryContract setHint(String hintName, Object value);
 
+	/**
+	 * Get the {@link ParameterMetadata} object representing the parameters
+	 * of this query, and providing access to the {@link QueryParameter}s.
+	 *
+	 * @since 7.0
+	 */
+	ParameterMetadata getParameterMetadata();
+
 	/**
 	 * Bind the given argument to a named query parameter.
 	 * <p>

hibernate-core/src/main/java/org/hibernate/query/ParameterMetadata.java

@@ -4,6 +4,7 @@
  */
 package org.hibernate.query;
 
+import java.util.Collection;
 import java.util.Set;
 import java.util.function.Consumer;
 import jakarta.persistence.Parameter;
@@ -21,6 +22,14 @@ public interface ParameterMetadata {
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
 	// General purpose
 
+	/**
+	 * The {@link QueryParameter}s representing the parameters of the query,
+	 * in no particular well-defined order.
+	 *
+	 * @since 7.0
+	 */
+	Collection<QueryParameter<?>> getParameters();
+
 	/**
 	 * The total number of registered parameters.
 	 */

hibernate-core/src/main/java/org/hibernate/query/Query.java

@@ -422,13 +422,6 @@ default Query<R> applyLoadGraph(@SuppressWarnings("rawtypes") RootGraph graph) {
 	 */
 	QueryOptions getQueryOptions();
 
-	/**
-	 * Access to information about query parameters.
-	 *
-	 * @return information about query parameters.
-	 */
-	ParameterMetadata getParameterMetadata();
-
 	/**
 	 * Bind the given argument to a named query parameter.
 	 * <p>

hibernate-core/src/main/java/org/hibernate/query/internal/ParameterMetadataImpl.java

@@ -5,6 +5,7 @@
 package org.hibernate.query.internal;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -31,6 +32,7 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import static java.util.Collections.emptySet;
+import static java.util.Collections.unmodifiableSet;
 import static org.hibernate.internal.util.collections.CollectionHelper.isEmpty;
 
 /**
@@ -155,6 +157,11 @@ private static void verifyOrdinalParamLabels(Set<Integer> labels) {
 		}
 	}
 
+	@Override
+	public Collection<QueryParameter<?>> getParameters() {
+		return unmodifiableSet( queryParameters.keySet() );
+	}
+
 	@Override
 	public QueryParameterBindings createBindings(SessionFactoryImplementor sessionFactory) {
 		return queryParameterBindingsTemplate == null
@@ -197,7 +204,7 @@ public void visitParameters(Consumer<QueryParameter<?>> consumer) {
 
 	@Override
 	public Set<QueryParameterImplementor<?>> getRegistrations() {
-		return Collections.unmodifiableSet( queryParameters.keySet() );
+		return unmodifiableSet( queryParameters.keySet() );
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/query/spi/AbstractCommonQueryContract.java

@@ -564,7 +564,8 @@ public int getFirstResult() {
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// Parameter handling
 
-	protected abstract ParameterMetadataImplementor getParameterMetadata();
+	@Override
+	public abstract ParameterMetadataImplementor getParameterMetadata();
 
 	@SuppressWarnings({"unchecked", "rawtypes"})
 	public Set<Parameter<?>> getParameters() {