HHH-19442 move NameableQuery down to ProcedureCallImplementor

Author: gavinking

hibernate-core/src/main/java/org/hibernate/procedure/ProcedureCall.java

@@ -16,10 +16,8 @@
 
 import org.hibernate.MappingException;
 import org.hibernate.query.SynchronizeableQuery;
-import org.hibernate.procedure.spi.NamedCallableQueryMemento;
 import org.hibernate.query.CommonQueryContract;
 import org.hibernate.query.procedure.ProcedureParameter;
-import org.hibernate.query.named.NameableQuery;
 import org.hibernate.type.BasicTypeReference;
 
 /**
@@ -56,7 +54,7 @@
  * @author Steve Ebersole
  */
 public interface ProcedureCall
-		extends CommonQueryContract, SynchronizeableQuery, StoredProcedureQuery, NameableQuery, AutoCloseable {
+		extends CommonQueryContract, SynchronizeableQuery, StoredProcedureQuery, AutoCloseable {
 	/**
 	 * The hint key (for use with JPA's "hint system") indicating the function's return JDBC type code
 	 * (aka, {@link java.sql.Types} code)
@@ -246,9 +244,6 @@ default void close() {
 	@Override
 	ProcedureCall addSynchronizedEntityClass(@SuppressWarnings("rawtypes") Class entityClass) throws MappingException;
 
-	@Override
-	NamedCallableQueryMemento toMemento(String name);
-
 	@Override
 	ProcedureCall setHint(String hintName, Object value);
 

hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureCallImplementor.java

@@ -9,6 +9,7 @@
 import java.util.List;
 
 import org.hibernate.procedure.ProcedureCall;
+import org.hibernate.query.named.NameableQuery;
 import org.hibernate.query.spi.ProcedureParameterMetadataImplementor;
 import org.hibernate.query.spi.QueryImplementor;
 import org.hibernate.type.BasicTypeReference;
@@ -23,7 +24,7 @@
 /**
  * @author Steve Ebersole
  */
-public interface ProcedureCallImplementor<R> extends ProcedureCall, QueryImplementor<R> {
+public interface ProcedureCallImplementor<R> extends ProcedureCall, NameableQuery, QueryImplementor<R> {
 	@Override
 	default List<R> getResultList() {
 		return list();
@@ -93,4 +94,6 @@ default List<R> getResultList() {
 	@Override
 	ProcedureCallImplementor<R> registerStoredProcedureParameter(String parameterName, Class<?> type, ParameterMode mode);
 
+	@Override
+	NamedCallableQueryMemento toMemento(String name);
 }