move two @Internal interfaces into org.hibernate.query.internal

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

@@ -15,8 +15,6 @@
 import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;
 
 /**
- * @since 7.3
- *
  * @author Gavin King
  */
 public class QueryArguments {

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

@@ -18,7 +18,6 @@
 import org.hibernate.query.spi.QueryInterpretationCache;
 import org.hibernate.query.spi.QueryPlan;
 import org.hibernate.query.spi.SelectQueryPlan;
-import org.hibernate.query.spi.SimpleHqlInterpretationImpl;
 import org.hibernate.query.sql.spi.ParameterInterpretation;
 import org.hibernate.query.sqm.internal.DomainParameterXref;
 import org.hibernate.service.ServiceRegistry;

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

@@ -22,7 +22,7 @@
 
 import jakarta.persistence.TemporalType;
 
-import static org.hibernate.query.spi.QueryParameterBindingValidator.validate;
+import static org.hibernate.query.internal.QueryParameterBindingValidator.validate;
 import static org.hibernate.type.descriptor.java.JavaTypeHelper.isTemporal;
 import static org.hibernate.type.internal.BindingTypeHelper.resolveTemporalPrecision;
 

hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingValidator.java → hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingValidator.java

@@ -2,11 +2,10 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.query.spi;
+package org.hibernate.query.internal;
 
 import java.util.Collection;
 
-import org.hibernate.Internal;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.query.QueryArgumentException;
 import org.hibernate.type.BindableType;
@@ -17,8 +16,7 @@
 /**
  * @author Andrea Boriero
  */
-@Internal
-public class QueryParameterBindingValidator {
+class QueryParameterBindingValidator {
 
 	private QueryParameterBindingValidator() {
 	}

hibernate-core/src/main/java/org/hibernate/query/spi/SimpleHqlInterpretationImpl.java → hibernate-core/src/main/java/org/hibernate/query/internal/SimpleHqlInterpretationImpl.java

@@ -2,11 +2,12 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.query.spi;
+package org.hibernate.query.internal;
 
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.hibernate.Internal;
+import org.hibernate.query.spi.HqlInterpretation;
+import org.hibernate.query.spi.ParameterMetadataImplementor;
 import org.hibernate.query.sqm.internal.DomainParameterXref;
 import org.hibernate.query.sqm.tree.SqmStatement;
 import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
@@ -17,13 +18,8 @@
 /**
  * Default implementation if {@link HqlInterpretation}.
  *
- * @apiNote This class is now considered internal implementation
- * and will move to an internal package in a future version.
- * Application programs should never depend directly on this class.
- *
  * @author Steve Ebersole
  */
-@Internal
 public class SimpleHqlInterpretationImpl<R> implements HqlInterpretation<R> {
 	private final SqmStatement<R> sqmStatement;
 	private final ParameterMetadataImplementor parameterMetadata;

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

@@ -16,7 +16,7 @@
  *
  * @author Christian Beikov
  */
-@Internal
+@Internal // used by Hibernate Reactive
 public class SqlOmittingQueryOptions extends DelegatingQueryOptions {
 
 	private final boolean omitLimit;