From 33fda06402d1c7097f8392404dc09f43a18b0707 Mon Sep 17 00:00:00 2001 From: Gavin King Date: Tue, 9 Dec 2025 18:28:01 +0100 Subject: [PATCH] move two @Internal interfaces into org.hibernate.query.internal and fix a wrong @since annotation --- .../org/hibernate/query/internal/QueryArguments.java | 2 -- .../internal/QueryInterpretationCacheStandardImpl.java | 1 - .../query/internal/QueryParameterBindingImpl.java | 2 +- .../QueryParameterBindingValidator.java | 6 ++---- .../{spi => internal}/SimpleHqlInterpretationImpl.java | 10 +++------- .../hibernate/query/spi/SqlOmittingQueryOptions.java | 2 +- 6 files changed, 7 insertions(+), 16 deletions(-) rename hibernate-core/src/main/java/org/hibernate/query/{spi => internal}/QueryParameterBindingValidator.java (97%) rename hibernate-core/src/main/java/org/hibernate/query/{spi => internal}/SimpleHqlInterpretationImpl.java (87%) diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryArguments.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryArguments.java index 872dbfe53959..a73460d87268 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryArguments.java +++ b/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 { diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryInterpretationCacheStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryInterpretationCacheStandardImpl.java index 7c3759472b80..5884213c5fb0 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryInterpretationCacheStandardImpl.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java index 0acc3415c676..86a4cae69fe3 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java +++ b/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; diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingValidator.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingValidator.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingValidator.java rename to hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingValidator.java index 351f874e8711..7de2b06b0e42 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryParameterBindingValidator.java +++ b/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() { } diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/SimpleHqlInterpretationImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/SimpleHqlInterpretationImpl.java similarity index 87% rename from hibernate-core/src/main/java/org/hibernate/query/spi/SimpleHqlInterpretationImpl.java rename to hibernate-core/src/main/java/org/hibernate/query/internal/SimpleHqlInterpretationImpl.java index 9aecd24816db..120bceae71f5 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/spi/SimpleHqlInterpretationImpl.java +++ b/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 implements HqlInterpretation { private final SqmStatement sqmStatement; private final ParameterMetadataImplementor parameterMetadata; diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/SqlOmittingQueryOptions.java b/hibernate-core/src/main/java/org/hibernate/query/spi/SqlOmittingQueryOptions.java index 14aed357672e..93f2493b6ed4 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/spi/SqlOmittingQueryOptions.java +++ b/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;