From 76e07910c70077cdaee38354bf94c8dac67541bf Mon Sep 17 00:00:00 2001 From: Gavin King Date: Sat, 21 Dec 2024 10:11:42 +0100 Subject: [PATCH 1/3] move @Incubating ReturnableType to same package as its super/subtypes --- .../community/dialect/function/DerbyLpadEmulation.java | 2 +- .../community/dialect/function/DerbyRpadEmulation.java | 2 +- .../function/AggregateWindowEmulationQueryTransformer.java | 2 +- .../java/org/hibernate/dialect/function/AvgFunction.java | 2 +- .../dialect/function/CaseLeastGreatestEmulation.java | 2 +- .../java/org/hibernate/dialect/function/CastFunction.java | 2 +- .../org/hibernate/dialect/function/CastStrEmulation.java | 2 +- .../hibernate/dialect/function/CastingConcatFunction.java | 2 +- .../hibernate/dialect/function/ChrLiteralEmulation.java | 2 +- .../dialect/function/CoalesceIfnullEmulation.java | 2 +- .../org/hibernate/dialect/function/ConcatPipeFunction.java | 2 +- .../java/org/hibernate/dialect/function/CountFunction.java | 2 +- .../org/hibernate/dialect/function/CurrentFunction.java | 2 +- .../org/hibernate/dialect/function/DB2FormatEmulation.java | 2 +- .../hibernate/dialect/function/DB2PositionFunction.java | 2 +- .../hibernate/dialect/function/DB2SubstringFunction.java | 2 +- .../org/hibernate/dialect/function/DateTruncEmulation.java | 2 +- .../dialect/function/DynamicDispatchFunction.java | 2 +- .../org/hibernate/dialect/function/EveryAnyEmulation.java | 2 +- .../org/hibernate/dialect/function/ExtractFunction.java | 2 +- .../org/hibernate/dialect/function/FormatFunction.java | 2 +- .../dialect/function/HypotheticalSetFunction.java | 2 +- .../dialect/function/HypotheticalSetWindowEmulation.java | 2 +- .../dialect/function/InsertSubstringOverlayEmulation.java | 2 +- .../dialect/function/IntegralTimestampaddFunction.java | 2 +- .../dialect/function/InverseDistributionFunction.java | 2 +- .../function/InverseDistributionWindowEmulation.java | 2 +- .../org/hibernate/dialect/function/LengthFunction.java | 2 +- .../org/hibernate/dialect/function/ListaggFunction.java | 2 +- .../dialect/function/ListaggGroupConcatEmulation.java | 2 +- .../dialect/function/ListaggStringAggEmulation.java | 2 +- .../dialect/function/LocatePositionEmulation.java | 2 +- .../hibernate/dialect/function/LpadRpadPadEmulation.java | 2 +- .../dialect/function/MinMaxCaseEveryAnyEmulation.java | 2 +- .../hibernate/dialect/function/ModeStatsModeEmulation.java | 2 +- .../function/NumberSeriesGenerateSeriesFunction.java | 2 +- .../hibernate/dialect/function/NvlCoalesceEmulation.java | 2 +- .../hibernate/dialect/function/OracleTruncFunction.java | 2 +- .../org/hibernate/dialect/function/OrdinalFunction.java | 2 +- .../dialect/function/PostgreSQLMinMaxFunction.java | 2 +- .../dialect/function/PostgreSQLTruncFunction.java | 2 +- .../dialect/function/PostgreSQLTruncRoundFunction.java | 2 +- .../dialect/function/QuantifiedLeastGreatestEmulation.java | 2 +- .../dialect/function/SQLServerEveryAnyEmulation.java | 2 +- .../dialect/function/SQLServerFormatEmulation.java | 2 +- .../java/org/hibernate/dialect/function/SqlColumn.java | 2 +- .../java/org/hibernate/dialect/function/SqlFunction.java | 2 +- .../dialect/function/SqlServerConvertTruncFunction.java | 2 +- .../hibernate/dialect/function/StandardSQLFunction.java | 2 +- .../hibernate/dialect/function/SumReturnTypeResolver.java | 2 +- .../hibernate/dialect/function/SybaseTruncFunction.java | 2 +- .../hibernate/dialect/function/TimestampaddFunction.java | 2 +- .../hibernate/dialect/function/TimestampdiffFunction.java | 2 +- .../hibernate/dialect/function/TransactSQLStrFunction.java | 2 +- .../java/org/hibernate/dialect/function/TrimFunction.java | 2 +- .../java/org/hibernate/dialect/function/TruncFunction.java | 2 +- .../hibernate/dialect/function/array/ArrayAggFunction.java | 2 +- .../dialect/function/array/ArrayConcatElementFunction.java | 2 +- .../dialect/function/array/ArrayConcatFunction.java | 2 +- .../dialect/function/array/ArrayConstructorFunction.java | 2 +- .../function/array/ArrayContainsOperatorFunction.java | 2 +- .../function/array/ArrayContainsUnnestFunction.java | 2 +- .../dialect/function/array/ArrayGetUnnestFunction.java | 2 +- .../function/array/ArrayIncludesOperatorFunction.java | 2 +- .../function/array/ArrayIncludesUnnestFunction.java | 2 +- .../function/array/ArrayIntersectsOperatorFunction.java | 2 +- .../function/array/ArrayIntersectsUnnestFunction.java | 2 +- .../function/array/ArrayRemoveIndexUnnestFunction.java | 2 +- .../dialect/function/array/ArrayReplaceUnnestFunction.java | 2 +- .../dialect/function/array/ArraySetUnnestFunction.java | 2 +- .../dialect/function/array/ArraySliceUnnestFunction.java | 2 +- .../dialect/function/array/ArrayToStringFunction.java | 2 +- .../function/array/ArrayViaArgumentReturnTypeResolver.java | 2 +- .../array/ArrayViaElementArgumentReturnTypeResolver.java | 2 +- .../dialect/function/array/CockroachArrayFillFunction.java | 2 +- .../hibernate/dialect/function/array/DdlTypeHelper.java | 2 +- .../array/ElementViaArrayArgumentReturnTypeResolver.java | 2 +- .../dialect/function/array/H2ArrayContainsFunction.java | 2 +- .../dialect/function/array/H2ArrayFillFunction.java | 2 +- .../dialect/function/array/H2ArrayIncludesFunction.java | 2 +- .../dialect/function/array/H2ArrayIntersectsFunction.java | 2 +- .../dialect/function/array/H2ArrayPositionFunction.java | 2 +- .../dialect/function/array/H2ArrayPositionsFunction.java | 2 +- .../dialect/function/array/H2ArrayRemoveFunction.java | 2 +- .../dialect/function/array/H2ArrayRemoveIndexFunction.java | 2 +- .../dialect/function/array/H2ArrayReplaceFunction.java | 2 +- .../dialect/function/array/H2ArraySetFunction.java | 2 +- .../dialect/function/array/H2ArrayToStringFunction.java | 2 +- .../function/array/HSQLArrayConstructorFunction.java | 2 +- .../dialect/function/array/HSQLArrayFillFunction.java | 2 +- .../dialect/function/array/HSQLArrayPositionFunction.java | 2 +- .../dialect/function/array/HSQLArrayPositionsFunction.java | 2 +- .../dialect/function/array/HSQLArrayRemoveFunction.java | 2 +- .../dialect/function/array/HSQLArraySetFunction.java | 2 +- .../dialect/function/array/HSQLArrayToStringFunction.java | 2 +- .../JsonArrayViaElementArgumentReturnTypeResolver.java | 2 +- .../dialect/function/array/OracleArrayAggEmulation.java | 2 +- .../function/array/OracleArrayConcatElementFunction.java | 2 +- .../dialect/function/array/OracleArrayConcatFunction.java | 2 +- .../function/array/OracleArrayConstructorFunction.java | 2 +- .../function/array/OracleArrayContainsFunction.java | 2 +- .../dialect/function/array/OracleArrayFillFunction.java | 2 +- .../dialect/function/array/OracleArrayGetFunction.java | 2 +- .../function/array/OracleArrayIncludesFunction.java | 2 +- .../function/array/OracleArrayIntersectsFunction.java | 2 +- .../dialect/function/array/OracleArrayLengthFunction.java | 2 +- .../function/array/OracleArrayPositionFunction.java | 2 +- .../function/array/OracleArrayPositionsFunction.java | 2 +- .../dialect/function/array/OracleArrayRemoveFunction.java | 2 +- .../function/array/OracleArrayRemoveIndexFunction.java | 2 +- .../dialect/function/array/OracleArrayReplaceFunction.java | 2 +- .../dialect/function/array/OracleArraySetFunction.java | 2 +- .../dialect/function/array/OracleArraySliceFunction.java | 2 +- .../function/array/OracleArrayToStringFunction.java | 2 +- .../dialect/function/array/OracleArrayTrimFunction.java | 2 +- .../array/PostgreSQLArrayConcatElementFunction.java | 2 +- .../function/array/PostgreSQLArrayConcatFunction.java | 2 +- .../function/array/PostgreSQLArrayConstructorFunction.java | 2 +- .../function/array/PostgreSQLArrayFillFunction.java | 2 +- .../function/array/PostgreSQLArrayPositionFunction.java | 2 +- .../function/array/PostgreSQLArrayPositionsFunction.java | 2 +- .../function/array/PostgreSQLArrayTrimEmulation.java | 2 +- .../function/json/CastTargetReturnTypeResolver.java | 2 +- .../function/json/CockroachDBJsonExistsFunction.java | 2 +- .../function/json/CockroachDBJsonQueryFunction.java | 2 +- .../function/json/CockroachDBJsonRemoveFunction.java | 2 +- .../function/json/CockroachDBJsonValueFunction.java | 2 +- .../dialect/function/json/DB2JsonArrayAggFunction.java | 2 +- .../dialect/function/json/DB2JsonObjectAggFunction.java | 2 +- .../dialect/function/json/DB2JsonValueFunction.java | 2 +- .../dialect/function/json/H2JsonExistsFunction.java | 2 +- .../dialect/function/json/H2JsonQueryFunction.java | 2 +- .../dialect/function/json/H2JsonTableFunction.java | 2 +- .../dialect/function/json/H2JsonValueFunction.java | 2 +- .../dialect/function/json/HANAJsonArrayAggFunction.java | 2 +- .../dialect/function/json/HANAJsonArrayFunction.java | 2 +- .../dialect/function/json/HANAJsonExistsFunction.java | 2 +- .../dialect/function/json/HANAJsonObjectAggFunction.java | 2 +- .../dialect/function/json/HANAJsonObjectFunction.java | 2 +- .../dialect/function/json/HANAJsonValueFunction.java | 2 +- .../dialect/function/json/JsonArrayAggFunction.java | 2 +- .../hibernate/dialect/function/json/JsonArrayFunction.java | 2 +- .../dialect/function/json/JsonExistsFunction.java | 2 +- .../dialect/function/json/JsonObjectAggFunction.java | 2 +- .../dialect/function/json/JsonObjectFunction.java | 2 +- .../hibernate/dialect/function/json/JsonQueryFunction.java | 2 +- .../hibernate/dialect/function/json/JsonValueFunction.java | 2 +- .../dialect/function/json/MariaDBJsonArrayAggFunction.java | 2 +- .../function/json/MariaDBJsonArrayAppendFunction.java | 2 +- .../dialect/function/json/MariaDBJsonArrayFunction.java | 2 +- .../dialect/function/json/MariaDBJsonQueryFunction.java | 2 +- .../dialect/function/json/MariaDBJsonValueFunction.java | 2 +- .../dialect/function/json/MySQLJsonArrayAggFunction.java | 2 +- .../dialect/function/json/MySQLJsonArrayFunction.java | 2 +- .../dialect/function/json/MySQLJsonExistsFunction.java | 2 +- .../dialect/function/json/MySQLJsonObjectAggFunction.java | 2 +- .../dialect/function/json/MySQLJsonObjectFunction.java | 2 +- .../dialect/function/json/MySQLJsonQueryFunction.java | 2 +- .../dialect/function/json/MySQLJsonValueFunction.java | 2 +- .../dialect/function/json/OracleJsonArrayAggFunction.java | 2 +- .../function/json/OracleJsonArrayAppendFunction.java | 2 +- .../dialect/function/json/OracleJsonArrayFunction.java | 2 +- .../function/json/OracleJsonArrayInsertFunction.java | 2 +- .../dialect/function/json/OracleJsonInsertFunction.java | 2 +- .../function/json/OracleJsonMergepatchFunction.java | 2 +- .../dialect/function/json/OracleJsonObjectAggFunction.java | 2 +- .../dialect/function/json/OracleJsonObjectFunction.java | 2 +- .../dialect/function/json/OracleJsonRemoveFunction.java | 2 +- .../dialect/function/json/OracleJsonReplaceFunction.java | 2 +- .../dialect/function/json/OracleJsonSetFunction.java | 2 +- .../dialect/function/json/OracleJsonValueFunction.java | 2 +- .../function/json/PostgreSQLJsonArrayAggFunction.java | 2 +- .../function/json/PostgreSQLJsonArrayAppendFunction.java | 2 +- .../dialect/function/json/PostgreSQLJsonArrayFunction.java | 2 +- .../function/json/PostgreSQLJsonArrayInsertFunction.java | 2 +- .../function/json/PostgreSQLJsonExistsFunction.java | 2 +- .../function/json/PostgreSQLJsonInsertFunction.java | 2 +- .../function/json/PostgreSQLJsonMergepatchFunction.java | 2 +- .../function/json/PostgreSQLJsonObjectAggFunction.java | 2 +- .../function/json/PostgreSQLJsonObjectFunction.java | 2 +- .../dialect/function/json/PostgreSQLJsonQueryFunction.java | 2 +- .../function/json/PostgreSQLJsonRemoveFunction.java | 2 +- .../function/json/PostgreSQLJsonReplaceFunction.java | 2 +- .../dialect/function/json/PostgreSQLJsonSetFunction.java | 2 +- .../dialect/function/json/PostgreSQLJsonValueFunction.java | 2 +- .../function/json/SQLServerJsonArrayAggFunction.java | 2 +- .../function/json/SQLServerJsonArrayAppendFunction.java | 2 +- .../dialect/function/json/SQLServerJsonArrayFunction.java | 2 +- .../function/json/SQLServerJsonArrayInsertFunction.java | 2 +- .../dialect/function/json/SQLServerJsonExistsFunction.java | 2 +- .../dialect/function/json/SQLServerJsonInsertFunction.java | 2 +- .../function/json/SQLServerJsonObjectAggFunction.java | 2 +- .../dialect/function/json/SQLServerJsonObjectFunction.java | 2 +- .../dialect/function/json/SQLServerJsonQueryFunction.java | 2 +- .../dialect/function/json/SQLServerJsonRemoveFunction.java | 2 +- .../function/json/SQLServerJsonReplaceFunction.java | 2 +- .../dialect/function/json/SQLServerJsonSetFunction.java | 2 +- .../dialect/function/json/SQLServerJsonValueFunction.java | 2 +- .../dialect/function/xml/H2XmlConcatFunction.java | 2 +- .../dialect/function/xml/H2XmlElementFunction.java | 2 +- .../dialect/function/xml/H2XmlForestFunction.java | 2 +- .../hibernate/dialect/function/xml/H2XmlPiFunction.java | 2 +- .../dialect/function/xml/LegacyDB2XmlExistsFunction.java | 2 +- .../dialect/function/xml/LegacyDB2XmlQueryFunction.java | 2 +- .../dialect/function/xml/PostgreSQLXmlQueryFunction.java | 2 +- .../dialect/function/xml/SQLServerXmlAggFunction.java | 2 +- .../dialect/function/xml/SQLServerXmlConcatFunction.java | 2 +- .../dialect/function/xml/SQLServerXmlElementFunction.java | 2 +- .../dialect/function/xml/SQLServerXmlExistsFunction.java | 2 +- .../dialect/function/xml/SQLServerXmlForestFunction.java | 2 +- .../dialect/function/xml/SQLServerXmlPiFunction.java | 2 +- .../dialect/function/xml/SQLServerXmlQueryFunction.java | 2 +- .../org/hibernate/dialect/function/xml/XmlAggFunction.java | 2 +- .../hibernate/dialect/function/xml/XmlConcatFunction.java | 2 +- .../hibernate/dialect/function/xml/XmlElementFunction.java | 2 +- .../hibernate/dialect/function/xml/XmlExistsFunction.java | 2 +- .../hibernate/dialect/function/xml/XmlForestFunction.java | 2 +- .../org/hibernate/dialect/function/xml/XmlPiFunction.java | 2 +- .../hibernate/dialect/function/xml/XmlQueryFunction.java | 2 +- .../metamodel/mapping/ordering/ast/FunctionExpression.java | 2 +- .../hibernate/metamodel/model/domain/BasicDomainType.java | 3 +-- .../{query => metamodel/model/domain}/ReturnableType.java | 6 +++--- .../internal/AbstractDiscriminatorSqmPathSource.java | 2 +- .../domain/internal/AnyDiscriminatorSqmPathSource.java | 2 +- .../metamodel/model/domain/internal/ArrayTupleType.java | 2 +- .../model/domain/internal/BasicSqmPathSource.java | 2 +- .../java/org/hibernate/query/ResultListTransformer.java | 7 ++++--- .../org/hibernate/query/derived/AnonymousTupleType.java | 2 +- .../query/sqm/function/AbstractSqmFunctionDescriptor.java | 2 +- .../AbstractSqmSelfRenderingFunctionDescriptor.java | 2 +- .../org/hibernate/query/sqm/function/FunctionRenderer.java | 2 +- .../query/sqm/function/JdbcEscapeFunctionDescriptor.java | 2 +- .../sqm/function/MultipatternSqmFunctionDescriptor.java | 2 +- .../query/sqm/function/NamedSqmFunctionDescriptor.java | 2 +- .../sqm/function/PatternBasedSqmFunctionDescriptor.java | 2 +- .../SelfRenderingAggregateFunctionSqlAstExpression.java | 2 +- .../function/SelfRenderingFunctionSqlAstExpression.java | 2 +- ...nderingOrderedSetAggregateFunctionSqlAstExpression.java | 2 +- .../sqm/function/SelfRenderingSqmAggregateFunction.java | 2 +- .../query/sqm/function/SelfRenderingSqmFunction.java | 2 +- .../SelfRenderingSqmOrderedSetAggregateFunction.java | 2 +- .../query/sqm/function/SelfRenderingSqmWindowFunction.java | 2 +- .../SelfRenderingWindowFunctionSqlAstExpression.java | 2 +- .../query/sqm/function/SqmFunctionDescriptor.java | 2 +- .../query/sqm/internal/SqmCriteriaNodeBuilder.java | 2 +- .../sqm/produce/function/FunctionReturnTypeResolver.java | 2 +- .../function/StandardFunctionReturnTypeResolvers.java | 2 +- .../hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java | 2 +- .../query/sqm/tree/domain/SqmElementAggregateFunction.java | 2 +- .../query/sqm/tree/domain/SqmIndexAggregateFunction.java | 2 +- .../sqm/tree/expression/AbstractSqmJsonPathExpression.java | 2 +- .../hibernate/query/sqm/tree/expression/SqmCastTarget.java | 2 +- .../query/sqm/tree/expression/SqmDurationUnit.java | 2 +- .../hibernate/query/sqm/tree/expression/SqmExpression.java | 2 +- .../query/sqm/tree/expression/SqmExtractUnit.java | 2 +- .../query/sqm/tree/expression/SqmJsonExistsExpression.java | 2 +- .../query/sqm/tree/expression/SqmJsonQueryExpression.java | 2 +- .../query/sqm/tree/expression/SqmJsonValueExpression.java | 2 +- .../hibernate/query/sqm/tree/expression/SqmToDuration.java | 2 +- .../query/sqm/tree/expression/SqmXmlElementExpression.java | 2 +- .../hibernate/sql/ast/spi/AbstractSqlAstTranslator.java | 2 +- .../dynamicparameterized/DynamicParameterizedTypeTest.java | 2 +- .../dialect/function/AnsiTrimEmulationFunctionTest.java | 2 +- .../java/org/hibernate/orm/test/subquery/SubqueryTest.java | 2 +- .../hibernate/envers/function/OrderByFragmentFunction.java | 2 +- .../spatial/dialect/oracle/OracleSpatialFunction.java | 2 +- .../spatial/dialect/oracle/OracleSpatialSQLMMFunction.java | 2 +- .../spatial/dialect/oracle/SDOGetGeometryType.java | 2 +- .../spatial/dialect/oracle/SDOMethodDescriptor.java | 2 +- .../spatial/dialect/oracle/SDORelateFunction.java | 2 +- .../hibernate/spatial/dialect/oracle/STRelateFunction.java | 2 +- .../dialect/postgis/PostgisSqmFunctionDescriptors.java | 2 +- .../dialect/sqlserver/SqlServerSqmFunctionDescriptors.java | 2 +- 273 files changed, 278 insertions(+), 278 deletions(-) rename hibernate-core/src/main/java/org/hibernate/{query => metamodel/model/domain}/ReturnableType.java (59%) diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/DerbyLpadEmulation.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/DerbyLpadEmulation.java index d49b2bafc148..144620da69be 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/DerbyLpadEmulation.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/DerbyLpadEmulation.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/DerbyRpadEmulation.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/DerbyRpadEmulation.java index cc400ebe3099..981c0130d7f2 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/DerbyRpadEmulation.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/function/DerbyRpadEmulation.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/AggregateWindowEmulationQueryTransformer.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/AggregateWindowEmulationQueryTransformer.java index 090f765f9655..2decb90df319 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/AggregateWindowEmulationQueryTransformer.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/AggregateWindowEmulationQueryTransformer.java @@ -13,7 +13,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.spi.NavigablePath; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.sqm.function.SelfRenderingAggregateFunctionSqlAstExpression; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/AvgFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/AvgFunction.java index d7248bb13b45..53bbd24d2dce 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/AvgFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/AvgFunction.java @@ -13,7 +13,7 @@ import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.model.domain.DomainType; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CaseLeastGreatestEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CaseLeastGreatestEmulation.java index 70fc952f5586..5ed8f6576bea 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/CaseLeastGreatestEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/CaseLeastGreatestEmulation.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CastFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CastFunction.java index 2d64bbf59db7..db8aa9ca3e1a 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/CastFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/CastFunction.java @@ -10,7 +10,7 @@ import org.hibernate.dialect.Dialect; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionRenderer; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CastStrEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CastStrEmulation.java index 872c9112594c..12876ff92293 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/CastStrEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/CastStrEmulation.java @@ -4,7 +4,7 @@ */ package org.hibernate.dialect.function; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.AbstractSqmFunctionDescriptor; import org.hibernate.query.sqm.function.SelfRenderingSqmFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CastingConcatFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CastingConcatFunction.java index 070288470ae5..830ea9729344 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/CastingConcatFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/CastingConcatFunction.java @@ -10,7 +10,7 @@ import org.hibernate.dialect.Dialect; import org.hibernate.engine.jdbc.Size; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ChrLiteralEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ChrLiteralEmulation.java index 32414e951834..b96ac79dd482 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ChrLiteralEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ChrLiteralEmulation.java @@ -8,7 +8,7 @@ import java.util.Locale; import org.hibernate.QueryException; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; import org.hibernate.query.sqm.produce.function.ArgumentsValidator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CoalesceIfnullEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CoalesceIfnullEmulation.java index 150abeb1803f..f6509dddd70e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/CoalesceIfnullEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/CoalesceIfnullEmulation.java @@ -4,7 +4,7 @@ */ package org.hibernate.dialect.function; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.AbstractSqmFunctionDescriptor; import org.hibernate.query.sqm.function.SelfRenderingSqmFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ConcatPipeFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ConcatPipeFunction.java index b8074d2426d4..c21944fe258f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ConcatPipeFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ConcatPipeFunction.java @@ -7,7 +7,7 @@ import java.util.Collections; import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CountFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CountFunction.java index 335911110d25..b4a1a184077a 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/CountFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/CountFunction.java @@ -11,7 +11,7 @@ import org.hibernate.metamodel.mapping.EntityIdentifierMapping; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CurrentFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CurrentFunction.java index 84e248bb1a7b..88f451578529 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/CurrentFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/CurrentFunction.java @@ -4,7 +4,7 @@ */ package org.hibernate.dialect.function; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; import org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2FormatEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2FormatEmulation.java index c3494c49fe15..fd76e9b3c52c 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2FormatEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2FormatEmulation.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2PositionFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2PositionFunction.java index e5560bf929d7..e7a1acc6b4d6 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2PositionFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2PositionFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2SubstringFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2SubstringFunction.java index 7fc5c9205c12..94299983bce0 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2SubstringFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/DB2SubstringFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; import org.hibernate.query.sqm.produce.function.FunctionParameterType; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/DateTruncEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/DateTruncEmulation.java index 00910f996f43..3f79746eb539 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/DateTruncEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/DateTruncEmulation.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.common.TemporalUnit; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/DynamicDispatchFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/DynamicDispatchFunction.java index e47c6d820785..67a249d53625 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/DynamicDispatchFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/DynamicDispatchFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.FunctionKind; import org.hibernate.query.sqm.function.SelfRenderingSqmFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/EveryAnyEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/EveryAnyEmulation.java index 40a5c97a2c74..0f84b7fdf07e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/EveryAnyEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/EveryAnyEmulation.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ExtractFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ExtractFunction.java index e33755231f1b..7393c50f80b2 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ExtractFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ExtractFunction.java @@ -5,7 +5,7 @@ package org.hibernate.dialect.function; import org.hibernate.dialect.Dialect; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.SemanticException; import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.spi.QueryEngine; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/FormatFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/FormatFunction.java index 3a14a5a2fe11..aab2081c658b 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/FormatFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/FormatFunction.java @@ -10,7 +10,7 @@ import org.hibernate.dialect.Dialect; import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.MappingModelExpressible; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.function.AbstractSqmFunctionDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/HypotheticalSetFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/HypotheticalSetFunction.java index af2f66ebd480..55a42f06adbd 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/HypotheticalSetFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/HypotheticalSetFunction.java @@ -7,7 +7,7 @@ import java.util.Collections; import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; import org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/HypotheticalSetWindowEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/HypotheticalSetWindowEmulation.java index 7a7b9dd1be48..5a6a784e4ad6 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/HypotheticalSetWindowEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/HypotheticalSetWindowEmulation.java @@ -8,7 +8,7 @@ import java.util.Collections; import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.SelfRenderingFunctionSqlAstExpression; import org.hibernate.query.sqm.function.SelfRenderingOrderedSetAggregateFunctionSqlAstExpression; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/InsertSubstringOverlayEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/InsertSubstringOverlayEmulation.java index 4ca0f5df450c..5918b63683b6 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/InsertSubstringOverlayEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/InsertSubstringOverlayEmulation.java @@ -4,7 +4,7 @@ */ package org.hibernate.dialect.function; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.BinaryArithmeticOperator; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.spi.QueryEngine; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/IntegralTimestampaddFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/IntegralTimestampaddFunction.java index e234946560d9..e778db71f3a7 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/IntegralTimestampaddFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/IntegralTimestampaddFunction.java @@ -6,7 +6,7 @@ import org.hibernate.dialect.Dialect; import org.hibernate.metamodel.mapping.BasicValuedMapping; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.function.SelfRenderingFunctionSqlAstExpression; import org.hibernate.sql.ast.SqlAstTranslator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/InverseDistributionFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/InverseDistributionFunction.java index bb6276b6039f..eba6bf8fdc21 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/InverseDistributionFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/InverseDistributionFunction.java @@ -10,7 +10,7 @@ import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.MappingModelExpressible; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.SemanticException; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/InverseDistributionWindowEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/InverseDistributionWindowEmulation.java index 098fd91291ac..a823d2b569f3 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/InverseDistributionWindowEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/InverseDistributionWindowEmulation.java @@ -8,7 +8,7 @@ import java.util.Collections; import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.SelfRenderingFunctionSqlAstExpression; import org.hibernate.query.sqm.function.SelfRenderingOrderedSetAggregateFunctionSqlAstExpression; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/LengthFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/LengthFunction.java index a9732373d72b..ef5e5851d91f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/LengthFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/LengthFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; import org.hibernate.query.sqm.produce.function.FunctionParameterType; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggFunction.java index 59920bee6a04..99bd073a8e55 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggFunction.java @@ -7,7 +7,7 @@ import java.util.Collections; import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggGroupConcatEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggGroupConcatEmulation.java index ef5b9cd9bb1b..b1436d5c2c2e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggGroupConcatEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggGroupConcatEmulation.java @@ -7,7 +7,7 @@ import java.util.Collections; import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggStringAggEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggStringAggEmulation.java index d63e5ab297a5..f174bc67f7ab 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggStringAggEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ListaggStringAggEmulation.java @@ -8,7 +8,7 @@ import java.util.List; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.CastType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/LocatePositionEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/LocatePositionEmulation.java index 23cf5a5ada72..b0f919633860 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/LocatePositionEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/LocatePositionEmulation.java @@ -4,7 +4,7 @@ */ package org.hibernate.dialect.function; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.AbstractSqmFunctionDescriptor; import org.hibernate.query.sqm.function.SelfRenderingSqmFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/LpadRpadPadEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/LpadRpadPadEmulation.java index 6444552d4f58..1c73daaf773d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/LpadRpadPadEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/LpadRpadPadEmulation.java @@ -4,7 +4,7 @@ */ package org.hibernate.dialect.function; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.TrimSpec; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.AbstractSqmFunctionDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/MinMaxCaseEveryAnyEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/MinMaxCaseEveryAnyEmulation.java index a8d7ae36705c..6d49a3cbb60a 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/MinMaxCaseEveryAnyEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/MinMaxCaseEveryAnyEmulation.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ModeStatsModeEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ModeStatsModeEmulation.java index 976f895bd7c0..8ffc43855e66 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ModeStatsModeEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ModeStatsModeEmulation.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/NumberSeriesGenerateSeriesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/NumberSeriesGenerateSeriesFunction.java index fc81fa4e1792..11c5a4ad5b6d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/NumberSeriesGenerateSeriesFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/NumberSeriesGenerateSeriesFunction.java @@ -15,7 +15,7 @@ import org.hibernate.metamodel.mapping.SelectablePath; import org.hibernate.metamodel.mapping.SqlTypedMapping; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.sqm.BinaryArithmeticOperator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/NvlCoalesceEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/NvlCoalesceEmulation.java index 676c19692278..6045748fc326 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/NvlCoalesceEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/NvlCoalesceEmulation.java @@ -4,7 +4,7 @@ */ package org.hibernate.dialect.function; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.AbstractSqmFunctionDescriptor; import org.hibernate.query.sqm.function.SelfRenderingSqmFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/OracleTruncFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/OracleTruncFunction.java index 4d2fd21b2b74..e13bdd401755 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/OracleTruncFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/OracleTruncFunction.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.function.FunctionRenderer; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/OrdinalFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/OrdinalFunction.java index f743d4c32b8b..7da7064bda02 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/OrdinalFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/OrdinalFunction.java @@ -8,7 +8,7 @@ import org.hibernate.QueryException; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; import org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLMinMaxFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLMinMaxFunction.java index 3ce1e9798f0e..b05bd5785fd4 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLMinMaxFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLMinMaxFunction.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncFunction.java index bd20540f59c8..68b2dadc64e1 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncFunction.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.SelfRenderingSqmFunction; import org.hibernate.query.sqm.tree.SqmTypedNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncRoundFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncRoundFunction.java index ed6eacb32524..abe716b96a9d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncRoundFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/PostgreSQLTruncRoundFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.AbstractSqmFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionRenderer; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/QuantifiedLeastGreatestEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/QuantifiedLeastGreatestEmulation.java index a17374dda699..9a5497b56549 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/QuantifiedLeastGreatestEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/QuantifiedLeastGreatestEmulation.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerEveryAnyEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerEveryAnyEmulation.java index 11fbdc0fe928..baf357a3d394 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerEveryAnyEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerEveryAnyEmulation.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerFormatEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerFormatEmulation.java index aba439a2492b..eb7019f55684 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerFormatEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerFormatEmulation.java @@ -7,7 +7,7 @@ import java.util.List; import jakarta.persistence.TemporalType; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlColumn.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlColumn.java index 65ea0c014152..eb13c5096180 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlColumn.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlColumn.java @@ -4,7 +4,7 @@ */ package org.hibernate.dialect.function; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.hql.HqlInterpretationException; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlFunction.java index 641a50461a17..c9729e8059fb 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; import org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlServerConvertTruncFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlServerConvertTruncFunction.java index 75b096bbe2ab..c33c8478a442 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlServerConvertTruncFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SqlServerConvertTruncFunction.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.SelfRenderingSqmFunction; import org.hibernate.query.sqm.tree.SqmTypedNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/StandardSQLFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/StandardSQLFunction.java index e75086422c2f..a7e95ccf37e7 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/StandardSQLFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/StandardSQLFunction.java @@ -8,7 +8,7 @@ import java.util.function.Supplier; import org.hibernate.metamodel.mapping.BasicValuedMapping; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.NamedSqmFunctionDescriptor; import org.hibernate.query.sqm.produce.function.FunctionReturnTypeResolver; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SumReturnTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SumReturnTypeResolver.java index 742be53f9da4..6cac5bed508f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SumReturnTypeResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SumReturnTypeResolver.java @@ -6,7 +6,7 @@ import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.produce.function.FunctionReturnTypeResolver; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.query.sqm.tree.SqmTypedNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SybaseTruncFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SybaseTruncFunction.java index ee03c58f9e60..fa51b5f855a6 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SybaseTruncFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SybaseTruncFunction.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.common.TemporalUnit; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampaddFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampaddFunction.java index 6874f846c38c..52a9d1488e52 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampaddFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampaddFunction.java @@ -6,7 +6,7 @@ import jakarta.persistence.TemporalType; import org.hibernate.dialect.Dialect; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.IntervalType; import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampdiffFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampdiffFunction.java index f5f9407ae46c..d1f0dd9e8514 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampdiffFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampdiffFunction.java @@ -10,7 +10,7 @@ import org.hibernate.dialect.Dialect; import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.SelfRenderingFunctionSqlAstExpression; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/TransactSQLStrFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/TransactSQLStrFunction.java index d1688580f726..c465b20d26a8 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/TransactSQLStrFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/TransactSQLStrFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.FunctionRenderer; import org.hibernate.query.sqm.function.SelfRenderingSqmFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/TrimFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/TrimFunction.java index f78cd9bc8b37..f988a7906593 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/TrimFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/TrimFunction.java @@ -8,7 +8,7 @@ import java.util.List; import org.hibernate.dialect.Dialect; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.TrimSpec; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/TruncFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/TruncFunction.java index 017fd56a5e35..5ce4fbd51f2e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/TruncFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/TruncFunction.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.common.TemporalUnit; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayAggFunction.java index 6e409201daeb..1d2e9314ea53 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayAggFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayAggFunction.java @@ -7,7 +7,7 @@ import java.util.Collections; import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConcatElementFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConcatElementFunction.java index 989c65419cb4..5195a79a41d0 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConcatElementFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConcatElementFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; import org.hibernate.sql.ast.SqlAstTranslator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConcatFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConcatFunction.java index 45d31b1dda3b..d66d9315dc81 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConcatFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConcatFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConstructorFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConstructorFunction.java index 8e7617bc4ee3..4185315608c9 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConstructorFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayConstructorFunction.java @@ -8,7 +8,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.internal.TypecheckUtil; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsOperatorFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsOperatorFunction.java index 841849513ade..6871aa6e280b 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsOperatorFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsOperatorFunction.java @@ -8,7 +8,7 @@ import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsUnnestFunction.java index a83b168da48a..6794494e2259 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsUnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayContainsUnnestFunction.java @@ -8,7 +8,7 @@ import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayGetUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayGetUnnestFunction.java index 71e4c8e3acab..d43ad4031191 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayGetUnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayGetUnnestFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesOperatorFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesOperatorFunction.java index 63369bc58e5f..6c613d9f10bf 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesOperatorFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesOperatorFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesUnnestFunction.java index 4dff3ad7e9a4..15a099ac4421 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesUnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIncludesUnnestFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIntersectsOperatorFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIntersectsOperatorFunction.java index b81ba52aa11c..e98f05b3cfdb 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIntersectsOperatorFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIntersectsOperatorFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIntersectsUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIntersectsUnnestFunction.java index 020705ce7f51..840eff3ae10a 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIntersectsUnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayIntersectsUnnestFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayRemoveIndexUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayRemoveIndexUnnestFunction.java index e52020754bee..54fa476bfd10 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayRemoveIndexUnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayRemoveIndexUnnestFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayReplaceUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayReplaceUnnestFunction.java index 226af1836fa1..38b4aff727c9 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayReplaceUnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayReplaceUnnestFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; import org.hibernate.sql.ast.SqlAstTranslator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraySetUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraySetUnnestFunction.java index a04538fe0d3a..16d3429908bc 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraySetUnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraySetUnnestFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraySliceUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraySliceUnnestFunction.java index f364c1718fec..e4c41d3f2e72 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraySliceUnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArraySliceUnnestFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayToStringFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayToStringFunction.java index 007938fe02c5..59da1e487388 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayToStringFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayToStringFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayViaArgumentReturnTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayViaArgumentReturnTypeResolver.java index 24c8425b7709..f3a7beaf5f39 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayViaArgumentReturnTypeResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayViaArgumentReturnTypeResolver.java @@ -10,7 +10,7 @@ import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.metamodel.mapping.MappingModelExpressible; import org.hibernate.metamodel.model.domain.DomainType; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.produce.function.FunctionReturnTypeResolver; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayViaElementArgumentReturnTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayViaElementArgumentReturnTypeResolver.java index 321504fce761..486c1dfa8baa 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayViaElementArgumentReturnTypeResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ArrayViaElementArgumentReturnTypeResolver.java @@ -10,7 +10,7 @@ import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.metamodel.mapping.MappingModelExpressible; import org.hibernate.metamodel.model.domain.DomainType; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.produce.function.FunctionReturnTypeResolver; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.query.sqm.tree.SqmTypedNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/CockroachArrayFillFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/CockroachArrayFillFunction.java index 9f226ca9ffd5..c6a1ea52aa37 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/CockroachArrayFillFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/CockroachArrayFillFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DdlTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DdlTypeHelper.java index b4d1a6a73523..c4beb0c99c3e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DdlTypeHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DdlTypeHelper.java @@ -13,7 +13,7 @@ import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.SqlTypedMapping; import org.hibernate.metamodel.model.domain.DomainType; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.type.BasicType; import org.hibernate.type.descriptor.java.BasicPluralJavaType; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ElementViaArrayArgumentReturnTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ElementViaArrayArgumentReturnTypeResolver.java index 0944a7bf75df..29b1ee815088 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ElementViaArrayArgumentReturnTypeResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/ElementViaArrayArgumentReturnTypeResolver.java @@ -10,7 +10,7 @@ import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.metamodel.mapping.MappingModelExpressible; import org.hibernate.metamodel.model.domain.DomainType; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.produce.function.FunctionReturnTypeResolver; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayContainsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayContainsFunction.java index feaeb84b304e..4c0d7e55a7f6 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayContainsFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayContainsFunction.java @@ -8,7 +8,7 @@ import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayFillFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayFillFunction.java index 8a60bff964cb..4e022c1a298d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayFillFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayFillFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayIncludesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayIncludesFunction.java index 28d44f9f1bc2..724fb93e7ffa 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayIncludesFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayIncludesFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayIntersectsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayIntersectsFunction.java index 24be083e37a3..c5306f9ca848 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayIntersectsFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayIntersectsFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayPositionFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayPositionFunction.java index 628cfe15f3a7..57b8a75f44dc 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayPositionFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayPositionFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayPositionsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayPositionsFunction.java index e71815f00692..eefa7e6cd90f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayPositionsFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayPositionsFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayRemoveFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayRemoveFunction.java index 720ca7661579..93c3216319f6 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayRemoveFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayRemoveFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayRemoveIndexFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayRemoveIndexFunction.java index d8b7e32d1b5f..14ea34225094 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayRemoveIndexFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayRemoveIndexFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayReplaceFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayReplaceFunction.java index 987cb9ce3d2a..13750e88560a 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayReplaceFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayReplaceFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArraySetFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArraySetFunction.java index 02008fed9f5f..2fc6c121bcab 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArraySetFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArraySetFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayToStringFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayToStringFunction.java index e46cf5526c64..71f0cd442b01 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayToStringFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2ArrayToStringFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayConstructorFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayConstructorFunction.java index 1c71ce901068..35f9b596f06e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayConstructorFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayConstructorFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayFillFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayFillFunction.java index 114edfedbe7e..4201b2765485 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayFillFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayFillFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayPositionFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayPositionFunction.java index 171c26914587..4a7df08054e9 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayPositionFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayPositionFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayPositionsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayPositionsFunction.java index c761170b8338..e2f69846af10 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayPositionsFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayPositionsFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayRemoveFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayRemoveFunction.java index 67073a12663a..6b67510de62b 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayRemoveFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayRemoveFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArraySetFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArraySetFunction.java index 5ff5a60b8253..77d3b33d0c3c 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArraySetFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArraySetFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayToStringFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayToStringFunction.java index 8d24e636885f..736d58a1a046 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayToStringFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HSQLArrayToStringFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/JsonArrayViaElementArgumentReturnTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/JsonArrayViaElementArgumentReturnTypeResolver.java index ff6422bc91db..2f42642a4bea 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/JsonArrayViaElementArgumentReturnTypeResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/JsonArrayViaElementArgumentReturnTypeResolver.java @@ -12,7 +12,7 @@ import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.metamodel.mapping.MappingModelExpressible; import org.hibernate.metamodel.model.domain.DomainType; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.produce.function.FunctionReturnTypeResolver; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.query.sqm.tree.SqmTypedNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayAggEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayAggEmulation.java index 71ff6e0cd4ef..c7bef50e0328 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayAggEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayAggEmulation.java @@ -7,7 +7,7 @@ import java.util.Collections; import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.SemanticException; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConcatElementFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConcatElementFunction.java index 922d6d25c964..3dc18d7c3747 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConcatElementFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConcatElementFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConcatFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConcatFunction.java index 4a4ec142b03a..3d2c91b99bf8 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConcatFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConcatFunction.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConstructorFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConstructorFunction.java index b4898c2dafd2..257a687892b6 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConstructorFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayConstructorFunction.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.metamodel.model.domain.DomainType; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.SemanticException; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayContainsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayContainsFunction.java index e8ef525c3bca..efc583f35a7e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayContainsFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayContainsFunction.java @@ -8,7 +8,7 @@ import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayFillFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayFillFunction.java index 4678ba67b942..49a4dbea3a8a 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayFillFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayFillFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayGetFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayGetFunction.java index 85d61205508a..3ff970db98f7 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayGetFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayGetFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayIncludesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayIncludesFunction.java index 44b76b132322..3beb0011a32b 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayIncludesFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayIncludesFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayIntersectsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayIntersectsFunction.java index 11a835e328a0..dc1557f550a6 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayIntersectsFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayIntersectsFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayLengthFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayLengthFunction.java index 65ca8e53ddb7..ed68e687655f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayLengthFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayLengthFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; import org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayPositionFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayPositionFunction.java index 82c65d27ae97..e1e1100e0dce 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayPositionFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayPositionFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayPositionsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayPositionsFunction.java index cc0ca1dea96b..1459d82189b1 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayPositionsFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayPositionsFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayRemoveFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayRemoveFunction.java index d48428135d82..e1b9d2a647c4 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayRemoveFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayRemoveFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayRemoveIndexFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayRemoveIndexFunction.java index 15e5f658c2f9..f767deefc709 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayRemoveIndexFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayRemoveIndexFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayReplaceFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayReplaceFunction.java index 5edd7c85e959..5e579fd11413 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayReplaceFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayReplaceFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArraySetFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArraySetFunction.java index 1d2caef88357..3692539125fb 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArraySetFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArraySetFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArraySliceFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArraySliceFunction.java index 4fbca51767be..d017466f689a 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArraySliceFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArraySliceFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayToStringFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayToStringFunction.java index 5e69b13de88a..3ae926edee7f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayToStringFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayToStringFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayTrimFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayTrimFunction.java index 15e72dc58a1b..233f0989ad91 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayTrimFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleArrayTrimFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConcatElementFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConcatElementFunction.java index cf87901d314d..1e1e126209b9 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConcatElementFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConcatElementFunction.java @@ -9,7 +9,7 @@ import org.hibernate.engine.jdbc.Size; import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.SqlTypedMapping; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConcatFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConcatFunction.java index 546204143500..bb70dc7f0e8b 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConcatFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConcatFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConstructorFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConstructorFunction.java index a35c014c234c..c9d4fb319896 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConstructorFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayConstructorFunction.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.metamodel.model.domain.DomainType; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayFillFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayFillFunction.java index d222afc5246d..284284fc9e5f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayFillFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayFillFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayPositionFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayPositionFunction.java index 8d0dde8dda73..b5f0f0eff2b1 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayPositionFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayPositionFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayPositionsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayPositionsFunction.java index 77fe4ec32f11..e151a0deae90 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayPositionsFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayPositionsFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayTrimEmulation.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayTrimEmulation.java index 0aff08a94dd1..ea7bced4411f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayTrimEmulation.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLArrayTrimEmulation.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.metamodel.model.domain.DomainType; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CastTargetReturnTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CastTargetReturnTypeResolver.java index 1f272558b177..27f57ff9bf45 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CastTargetReturnTypeResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CastTargetReturnTypeResolver.java @@ -8,7 +8,7 @@ import java.util.function.Supplier; import org.hibernate.metamodel.mapping.BasicValuedMapping; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.produce.function.FunctionReturnTypeResolver; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.query.sqm.tree.SqmTypedNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonExistsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonExistsFunction.java index 5756aaf194cc..0347ba814a5e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonExistsFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonExistsFunction.java @@ -9,7 +9,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.hibernate.QueryException; import org.hibernate.dialect.Dialect; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonQueryFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonQueryFunction.java index 512059172a81..74508755b574 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonQueryFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonQueryFunction.java @@ -9,7 +9,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.hibernate.QueryException; import org.hibernate.dialect.Dialect; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonRemoveFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonRemoveFunction.java index a900f6b25c05..8570c81f9d54 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonRemoveFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonRemoveFunction.java @@ -8,7 +8,7 @@ import org.hibernate.QueryException; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonValueFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonValueFunction.java index a90db6cb367a..d917facd1d21 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonValueFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonValueFunction.java @@ -8,7 +8,7 @@ import org.hibernate.QueryException; import org.hibernate.dialect.Dialect; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/DB2JsonArrayAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/DB2JsonArrayAggFunction.java index a1267fdddfc5..7411cf19e194 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/DB2JsonArrayAggFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/DB2JsonArrayAggFunction.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.QueryException; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/DB2JsonObjectAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/DB2JsonObjectAggFunction.java index 52f69b2f7ac5..6aae2f858f03 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/DB2JsonObjectAggFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/DB2JsonObjectAggFunction.java @@ -6,7 +6,7 @@ import org.hibernate.QueryException; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/DB2JsonValueFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/DB2JsonValueFunction.java index 249d7eac9ebc..54dde1a4b374 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/DB2JsonValueFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/DB2JsonValueFunction.java @@ -7,7 +7,7 @@ import org.hibernate.dialect.Dialect; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.type.descriptor.WrapperOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonExistsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonExistsFunction.java index d37fead1ccc9..4e621dd52950 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonExistsFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonExistsFunction.java @@ -5,7 +5,7 @@ package org.hibernate.dialect.function.json; import org.hibernate.QueryException; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.JsonExistsErrorBehavior; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonQueryFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonQueryFunction.java index 2f1f9986fb3b..c550056f820f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonQueryFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonQueryFunction.java @@ -6,7 +6,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.hibernate.QueryException; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.Expression; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonTableFunction.java index 0d66bfb030b8..315d86876135 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonTableFunction.java @@ -13,7 +13,7 @@ import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.mapping.SelectablePath; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.ComparisonOperator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonValueFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonValueFunction.java index c1add5bbae0a..b33b75ee063d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonValueFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonValueFunction.java @@ -9,7 +9,7 @@ import org.hibernate.QueryException; import org.hibernate.internal.util.QuotingHelper; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.Expression; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonArrayAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonArrayAggFunction.java index a74eb72b7d4f..fe661c3251b3 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonArrayAggFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonArrayAggFunction.java @@ -8,7 +8,7 @@ import org.hibernate.QueryException; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonArrayFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonArrayFunction.java index 379ac10e503f..e603846c3bb8 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonArrayFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonArrayFunction.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonExistsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonExistsFunction.java index 78c837234163..74c2ffff3b81 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonExistsFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonExistsFunction.java @@ -4,7 +4,7 @@ */ package org.hibernate.dialect.function.json; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.Expression; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonObjectAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonObjectAggFunction.java index 202a844f545f..1ad913ac43b4 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonObjectAggFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonObjectAggFunction.java @@ -6,7 +6,7 @@ import org.hibernate.QueryException; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonObjectFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonObjectFunction.java index 3a60ffea5de2..b8313a106d05 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonObjectFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonObjectFunction.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.regex.Pattern; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonValueFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonValueFunction.java index 2fb7f3114d7f..7258434c2a17 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonValueFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonValueFunction.java @@ -8,7 +8,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.SqlTypedMapping; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.type.descriptor.WrapperOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonArrayAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonArrayAggFunction.java index 7d75302a8839..a6beffed1999 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonArrayAggFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonArrayAggFunction.java @@ -8,7 +8,7 @@ import java.util.List; import org.hibernate.QueryException; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonArrayFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonArrayFunction.java index 9f7e20501b82..518c133ad11d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonArrayFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonArrayFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; import org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonExistsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonExistsFunction.java index ca1bc08da44d..1dd6c83a8242 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonExistsFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonExistsFunction.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Map; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonObjectAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonObjectAggFunction.java index fb2e0025fc53..72243bf6cc81 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonObjectAggFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonObjectAggFunction.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.QueryException; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonObjectFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonObjectFunction.java index 5101655f2ea0..19646ffaeaa3 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonObjectFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonObjectFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; import org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonQueryFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonQueryFunction.java index 0665aa7df87b..0ad2ede42bce 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonQueryFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonQueryFunction.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Map; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonValueFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonValueFunction.java index 449751c277fe..64f2bea64025 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonValueFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonValueFunction.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Map; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MariaDBJsonArrayAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MariaDBJsonArrayAggFunction.java index 7e5a8b64e074..cf872ddb7860 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MariaDBJsonArrayAggFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MariaDBJsonArrayAggFunction.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.QueryException; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MariaDBJsonArrayAppendFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MariaDBJsonArrayAppendFunction.java index 31ea28be9912..b4f78449cdb0 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MariaDBJsonArrayAppendFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MariaDBJsonArrayAppendFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MariaDBJsonArrayFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MariaDBJsonArrayFunction.java index fb8c03c1f8b0..8aa647851e43 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MariaDBJsonArrayFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MariaDBJsonArrayFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MariaDBJsonQueryFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MariaDBJsonQueryFunction.java index 83849d7ab19d..befe07291ad6 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MariaDBJsonQueryFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MariaDBJsonQueryFunction.java @@ -4,7 +4,7 @@ */ package org.hibernate.dialect.function.json; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.JsonPathPassingClause; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MariaDBJsonValueFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MariaDBJsonValueFunction.java index d1ccd0f2aedb..2411908cc646 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MariaDBJsonValueFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MariaDBJsonValueFunction.java @@ -5,7 +5,7 @@ package org.hibernate.dialect.function.json; import org.hibernate.QueryException; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.JsonPathPassingClause; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonArrayAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonArrayAggFunction.java index c00a154aa66f..57106596331e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonArrayAggFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonArrayAggFunction.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.QueryException; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonArrayFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonArrayFunction.java index daa669c18c10..fc00aea59929 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonArrayFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonArrayFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonExistsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonExistsFunction.java index cb76a1a6906a..8a204ef8e83d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonExistsFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonExistsFunction.java @@ -4,7 +4,7 @@ */ package org.hibernate.dialect.function.json; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.JsonPathPassingClause; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonObjectAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonObjectAggFunction.java index e4c74788a0eb..071ff705fcbd 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonObjectAggFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonObjectAggFunction.java @@ -5,7 +5,7 @@ package org.hibernate.dialect.function.json; import org.hibernate.QueryException; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonObjectFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonObjectFunction.java index 8c9f95551d07..879f822c8a5b 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonObjectFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonObjectFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonQueryFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonQueryFunction.java index 5a4240dbd31e..eba34fc4f099 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonQueryFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonQueryFunction.java @@ -4,7 +4,7 @@ */ package org.hibernate.dialect.function.json; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.JsonPathPassingClause; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonValueFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonValueFunction.java index 8f5919068573..ad4ef1e4f9bd 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonValueFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonValueFunction.java @@ -4,7 +4,7 @@ */ package org.hibernate.dialect.function.json; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.JsonPathPassingClause; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonArrayAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonArrayAggFunction.java index 9cb55cc79591..69c7eb961abb 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonArrayAggFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonArrayAggFunction.java @@ -8,7 +8,7 @@ import org.hibernate.dialect.function.CastFunction; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.CastTarget; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonArrayAppendFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonArrayAppendFunction.java index bfd38c1080ac..c0ef84f192c3 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonArrayAppendFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonArrayAppendFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonArrayFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonArrayFunction.java index 987c2c105908..1818e786c360 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonArrayFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonArrayFunction.java @@ -10,7 +10,7 @@ import org.hibernate.dialect.function.CastFunction; import org.hibernate.engine.jdbc.Size; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonArrayInsertFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonArrayInsertFunction.java index dbb1045aefa1..52ac44956619 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonArrayInsertFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonArrayInsertFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonInsertFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonInsertFunction.java index 50d677a31080..edb29a5b3ea1 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonInsertFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonInsertFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonMergepatchFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonMergepatchFunction.java index 2aae5e7923d1..8ff72e7857e3 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonMergepatchFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonMergepatchFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonObjectAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonObjectAggFunction.java index 4e505a560222..fd06e279cf52 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonObjectAggFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonObjectAggFunction.java @@ -8,7 +8,7 @@ import org.hibernate.dialect.function.CastFunction; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.CastTarget; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonObjectFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonObjectFunction.java index 75f9db2a5123..5323fbaf4ba6 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonObjectFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonObjectFunction.java @@ -8,7 +8,7 @@ import org.hibernate.dialect.function.CastFunction; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonRemoveFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonRemoveFunction.java index b6dabfea3203..f44ee9a04513 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonRemoveFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonRemoveFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonReplaceFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonReplaceFunction.java index 872a28ee4f89..a0002bf8fd4f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonReplaceFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonReplaceFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonSetFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonSetFunction.java index f60debdae681..3f90291449f7 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonSetFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonSetFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonValueFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonValueFunction.java index 49dc7381531f..502fa52ac6b1 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonValueFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonValueFunction.java @@ -7,7 +7,7 @@ import org.hibernate.dialect.Dialect; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.type.SqlTypes; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonArrayAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonArrayAggFunction.java index 88758f0667ac..bb2f6a013b6c 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonArrayAggFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonArrayAggFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonArrayAppendFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonArrayAppendFunction.java index 7448e42ec442..c01a07a2b52c 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonArrayAppendFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonArrayAppendFunction.java @@ -8,7 +8,7 @@ import org.hibernate.QueryException; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonArrayFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonArrayFunction.java index 57df67b8adf1..896c348559d6 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonArrayFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonArrayFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonArrayInsertFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonArrayInsertFunction.java index 1a5c987eb6a3..675ce6fa0be0 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonArrayInsertFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonArrayInsertFunction.java @@ -8,7 +8,7 @@ import org.hibernate.QueryException; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonExistsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonExistsFunction.java index 29c1051d5014..46fe494a6ce7 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonExistsFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonExistsFunction.java @@ -8,7 +8,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.hibernate.QueryException; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.Expression; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonInsertFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonInsertFunction.java index 3935f8a92bf4..9a9135f4e448 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonInsertFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonInsertFunction.java @@ -8,7 +8,7 @@ import org.hibernate.QueryException; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonMergepatchFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonMergepatchFunction.java index d066a97124bf..d3177615b23f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonMergepatchFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonMergepatchFunction.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonObjectAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonObjectAggFunction.java index 4f47ee875d7d..6c8e3e1c93d2 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonObjectAggFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonObjectAggFunction.java @@ -5,7 +5,7 @@ package org.hibernate.dialect.function.json; import org.hibernate.QueryException; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonObjectFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonObjectFunction.java index 48ede18e2f6c..e0c7c85ecc68 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonObjectFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonObjectFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonQueryFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonQueryFunction.java index 1df0d6c26779..43984f13f0d4 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonQueryFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonQueryFunction.java @@ -8,7 +8,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.hibernate.QueryException; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonRemoveFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonRemoveFunction.java index b1ce489798e8..aaf146067f0f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonRemoveFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonRemoveFunction.java @@ -8,7 +8,7 @@ import org.hibernate.QueryException; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonReplaceFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonReplaceFunction.java index 651ec2f28eaf..8eb76371893f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonReplaceFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonReplaceFunction.java @@ -8,7 +8,7 @@ import org.hibernate.QueryException; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonSetFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonSetFunction.java index 03728540f979..220da2dabbf4 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonSetFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonSetFunction.java @@ -8,7 +8,7 @@ import org.hibernate.QueryException; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonValueFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonValueFunction.java index bdedd46ef503..f47e6aa5b3c3 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonValueFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonValueFunction.java @@ -8,7 +8,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.hibernate.QueryException; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonArrayAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonArrayAggFunction.java index 6cd3e0daa40d..f684628fd3a8 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonArrayAggFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonArrayAggFunction.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.QueryException; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonArrayAppendFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonArrayAppendFunction.java index 5ceb03b547bb..e85dfae21a02 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonArrayAppendFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonArrayAppendFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonArrayFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonArrayFunction.java index 4c0d1334f5f1..9e5f9c6a19ab 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonArrayFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonArrayFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonArrayInsertFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonArrayInsertFunction.java index d29a69a3e1d0..d155ceb6000a 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonArrayInsertFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonArrayInsertFunction.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.QueryException; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonExistsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonExistsFunction.java index f54f553f7256..98d7bdd712b0 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonExistsFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonExistsFunction.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.QueryException; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.JsonExistsErrorBehavior; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonInsertFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonInsertFunction.java index eb145a1f2371..b13dc65464ce 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonInsertFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonInsertFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonObjectAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonObjectAggFunction.java index 71b5a5024a13..fb7b1bf1730f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonObjectAggFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonObjectAggFunction.java @@ -5,7 +5,7 @@ package org.hibernate.dialect.function.json; import org.hibernate.QueryException; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonObjectFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonObjectFunction.java index 40b349f683b1..96a2c9ded605 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonObjectFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonObjectFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonQueryFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonQueryFunction.java index 74d3494ef0fc..6d9d83402479 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonQueryFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonQueryFunction.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.QueryException; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.JsonPathPassingClause; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonRemoveFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonRemoveFunction.java index b1f745bf61a6..9a882d18462f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonRemoveFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonRemoveFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonReplaceFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonReplaceFunction.java index 4a6bab1183cb..f51b361f854a 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonReplaceFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonReplaceFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonSetFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonSetFunction.java index ac2aef859a6f..cb8e94e6c7da 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonSetFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonSetFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonValueFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonValueFunction.java index e243469122e6..6d97b78dc031 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonValueFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonValueFunction.java @@ -5,7 +5,7 @@ package org.hibernate.dialect.function.json; import org.hibernate.QueryException; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.JsonPathPassingClause; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/H2XmlConcatFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/H2XmlConcatFunction.java index e74283093658..631113eb55fe 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/H2XmlConcatFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/H2XmlConcatFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/H2XmlElementFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/H2XmlElementFunction.java index a293a0a7c588..51385f641520 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/H2XmlElementFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/H2XmlElementFunction.java @@ -6,7 +6,7 @@ import java.util.Map; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.Expression; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/H2XmlForestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/H2XmlForestFunction.java index 167b8071d2f6..f45e07356126 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/H2XmlForestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/H2XmlForestFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/H2XmlPiFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/H2XmlPiFunction.java index 34250555fca1..177c0d013bbe 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/H2XmlPiFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/H2XmlPiFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/LegacyDB2XmlExistsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/LegacyDB2XmlExistsFunction.java index 8210a4cd9fc3..4ecd3af213ba 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/LegacyDB2XmlExistsFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/LegacyDB2XmlExistsFunction.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.dialect.function.json.ExpressionTypeHelper; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/LegacyDB2XmlQueryFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/LegacyDB2XmlQueryFunction.java index b3931a5da9ed..2ece2c4e5c46 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/LegacyDB2XmlQueryFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/LegacyDB2XmlQueryFunction.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.dialect.function.json.ExpressionTypeHelper; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/PostgreSQLXmlQueryFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/PostgreSQLXmlQueryFunction.java index 733b634686bf..cfc0fc02add5 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/PostgreSQLXmlQueryFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/PostgreSQLXmlQueryFunction.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.dialect.function.json.ExpressionTypeHelper; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlAggFunction.java index 938d4393bcf7..01e191228a74 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlAggFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlAggFunction.java @@ -9,7 +9,7 @@ import java.util.Set; import org.hibernate.dialect.function.json.ExpressionTypeHelper; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.SelfRenderingFunctionSqlAstExpression; import org.hibernate.query.sqm.function.SelfRenderingOrderedSetAggregateFunctionSqlAstExpression; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlConcatFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlConcatFunction.java index 150a7aaa5974..f7e5f977e3fc 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlConcatFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlConcatFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlElementFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlElementFunction.java index 44dcca18980c..5568eb018c6f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlElementFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlElementFunction.java @@ -6,7 +6,7 @@ import java.util.Map; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.Expression; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlExistsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlExistsFunction.java index 2cbbecf8f8b4..258bd8c9a508 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlExistsFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlExistsFunction.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.dialect.function.json.ExpressionTypeHelper; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlForestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlForestFunction.java index 742582db2d21..44975a6ad0d7 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlForestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlForestFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlPiFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlPiFunction.java index e56e70584914..0e00061e62dc 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlPiFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlPiFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlQueryFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlQueryFunction.java index 82f332fadde6..41c9691390f5 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlQueryFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlQueryFunction.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.dialect.function.json.ExpressionTypeHelper; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlAggFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlAggFunction.java index 0b2c35d8da83..c280e34ad5b1 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlAggFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlAggFunction.java @@ -8,7 +8,7 @@ import java.util.List; import org.hibernate.dialect.function.json.ExpressionTypeHelper; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlConcatFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlConcatFunction.java index 2e0ef74b83bf..4096ad19ae1c 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlConcatFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlConcatFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlElementFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlElementFunction.java index 83f7332fe03d..f4fb281ffbe7 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlElementFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlElementFunction.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.dialect.XmlHelper; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlExistsFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlExistsFunction.java index 080c34e99117..5408f3d5d3df 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlExistsFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlExistsFunction.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.dialect.function.json.ExpressionTypeHelper; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlForestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlForestFunction.java index 32a1142890de..786784b3cfc1 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlForestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlForestFunction.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.dialect.XmlHelper; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; import org.hibernate.query.sqm.produce.function.ArgumentsValidator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlPiFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlPiFunction.java index 813c1a8cac7f..b4e20e2674b7 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlPiFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlPiFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlQueryFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlQueryFunction.java index a53a0f47f534..b618195a4fcd 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlQueryFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlQueryFunction.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.dialect.function.json.ExpressionTypeHelper; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.FunctionKind; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FunctionExpression.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FunctionExpression.java index 3595390812af..a9d9fc6b636f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FunctionExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/FunctionExpression.java @@ -11,7 +11,7 @@ import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.mapping.internal.AbstractDomainPath; import org.hibernate.query.NullPrecedence; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.SortDirection; import org.hibernate.query.sqm.function.FunctionRenderer; import org.hibernate.query.sqm.function.SelfRenderingFunctionSqlAstExpression; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BasicDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BasicDomainType.java index f91916e93f8f..e9a6ac0fed73 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BasicDomainType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BasicDomainType.java @@ -8,7 +8,6 @@ import jakarta.persistence.metamodel.BasicType; import org.hibernate.HibernateException; -import org.hibernate.query.ReturnableType; import org.hibernate.query.OutputableType; import org.hibernate.query.sqm.SqmExpressible; @@ -18,7 +17,7 @@ * @author Steve Ebersole */ public interface BasicDomainType - extends SimpleDomainType, BasicType, SqmExpressible, OutputableType, ReturnableType { + extends ReturnableType, BasicType, SqmExpressible, OutputableType { @Override default PersistenceType getPersistenceType() { return PersistenceType.BASIC; diff --git a/hibernate-core/src/main/java/org/hibernate/query/ReturnableType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ReturnableType.java similarity index 59% rename from hibernate-core/src/main/java/org/hibernate/query/ReturnableType.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ReturnableType.java index 9ae39e17b7e7..ede1ee3bb726 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/ReturnableType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ReturnableType.java @@ -2,13 +2,13 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query; +package org.hibernate.metamodel.model.domain; import org.hibernate.Incubating; -import org.hibernate.metamodel.model.domain.SimpleDomainType; /** - * Specialization of DomainType for types that can be used as function returns + * Specialization of {@link SimpleDomainType} for types that can + * be used as function returns. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractDiscriminatorSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractDiscriminatorSqmPathSource.java index 759bd242c5b2..944fe4aaef7a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractDiscriminatorSqmPathSource.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractDiscriminatorSqmPathSource.java @@ -5,7 +5,7 @@ package org.hibernate.metamodel.model.domain.internal; import org.hibernate.metamodel.model.domain.DomainType; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.SqmPathSource; import static jakarta.persistence.metamodel.Bindable.BindableType.SINGULAR_ATTRIBUTE; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPathSource.java index 117bd93201a4..2d490ba7e448 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPathSource.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPathSource.java @@ -6,7 +6,7 @@ import org.hibernate.metamodel.model.domain.DomainType; import org.hibernate.metamodel.model.domain.SimpleDomainType; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.SqmPathSource; import org.hibernate.query.sqm.tree.domain.SqmPath; import org.hibernate.spi.NavigablePath; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ArrayTupleType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ArrayTupleType.java index e57accc3d233..4d7683a10fc3 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ArrayTupleType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ArrayTupleType.java @@ -14,7 +14,7 @@ import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.MappingModelExpressible; import org.hibernate.metamodel.model.domain.TupleType; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.type.descriptor.java.JavaType; import org.hibernate.type.descriptor.java.ObjectArrayJavaType; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BasicSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BasicSqmPathSource.java index 09cfb628b796..1b9a68cf2f54 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BasicSqmPathSource.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BasicSqmPathSource.java @@ -6,7 +6,7 @@ import org.hibernate.metamodel.model.domain.BasicDomainType; import org.hibernate.metamodel.model.domain.DomainType; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.TerminalPathException; import org.hibernate.query.sqm.SqmPathSource; import org.hibernate.query.sqm.tree.domain.SqmBasicValuedSimplePath; diff --git a/hibernate-core/src/main/java/org/hibernate/query/ResultListTransformer.java b/hibernate-core/src/main/java/org/hibernate/query/ResultListTransformer.java index 2eb3fca9d08d..d322253c64da 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/ResultListTransformer.java +++ b/hibernate-core/src/main/java/org/hibernate/query/ResultListTransformer.java @@ -25,12 +25,13 @@ public interface ResultListTransformer { /** * Here we have an opportunity to perform transformation on the - * query result as a whole. This might be useful to convert from + * query result as a whole. This might be useful to convert from * one collection type to another or to remove duplicates from the * result, etc. * - * @param resultList The result list as would otherwise be returned from - * the Query without the intervention of this ResultListTransformer + * @param resultList The result list as would otherwise be returned + * by the {@code Query} without the intervention + * of this {@code ResultListTransformer} * * @return The transformed result. */ diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleType.java b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleType.java index 4c76445f8f1d..2dd1fa603714 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleType.java +++ b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleType.java @@ -20,7 +20,7 @@ import org.hibernate.metamodel.model.domain.PluralPersistentAttribute; import org.hibernate.metamodel.model.domain.SimpleDomainType; import org.hibernate.metamodel.model.domain.TupleType; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.SemanticException; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.SqmPathSource; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/AbstractSqmFunctionDescriptor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/AbstractSqmFunctionDescriptor.java index 0fec7138a9c3..50d8afc949c6 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/AbstractSqmFunctionDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/AbstractSqmFunctionDescriptor.java @@ -7,7 +7,7 @@ import java.util.List; import org.checkerframework.checker.nullness.qual.Nullable; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.produce.function.ArgumentsValidator; import org.hibernate.query.sqm.produce.function.FunctionArgumentTypeResolver; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/AbstractSqmSelfRenderingFunctionDescriptor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/AbstractSqmSelfRenderingFunctionDescriptor.java index 0b7dfbea141d..3c223048cc4a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/AbstractSqmSelfRenderingFunctionDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/AbstractSqmSelfRenderingFunctionDescriptor.java @@ -5,7 +5,7 @@ package org.hibernate.query.sqm.function; import org.checkerframework.checker.nullness.qual.Nullable; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.produce.function.ArgumentsValidator; import org.hibernate.query.sqm.produce.function.FunctionArgumentTypeResolver; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/FunctionRenderer.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/FunctionRenderer.java index 55eac8ef12e9..bb512c64f2df 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/FunctionRenderer.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/FunctionRenderer.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/JdbcEscapeFunctionDescriptor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/JdbcEscapeFunctionDescriptor.java index 2ee63693b31f..af874d084415 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/JdbcEscapeFunctionDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/JdbcEscapeFunctionDescriptor.java @@ -4,7 +4,7 @@ */ package org.hibernate.query.sqm.function; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.tree.SqmTypedNode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/MultipatternSqmFunctionDescriptor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/MultipatternSqmFunctionDescriptor.java index bb5afbb536fb..92b7fa04672d 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/MultipatternSqmFunctionDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/MultipatternSqmFunctionDescriptor.java @@ -4,7 +4,7 @@ */ package org.hibernate.query.sqm.function; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; import org.hibernate.query.sqm.produce.function.FunctionParameterType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/NamedSqmFunctionDescriptor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/NamedSqmFunctionDescriptor.java index 63bd3b3c22b6..f5fe737b8373 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/NamedSqmFunctionDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/NamedSqmFunctionDescriptor.java @@ -5,7 +5,7 @@ package org.hibernate.query.sqm.function; import org.checkerframework.checker.nullness.qual.Nullable; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.produce.function.ArgumentsValidator; import org.hibernate.query.sqm.produce.function.FunctionArgumentTypeResolver; import org.hibernate.query.sqm.produce.function.FunctionReturnTypeResolver; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/PatternBasedSqmFunctionDescriptor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/PatternBasedSqmFunctionDescriptor.java index ecdee9203106..493ba484894e 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/PatternBasedSqmFunctionDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/PatternBasedSqmFunctionDescriptor.java @@ -4,7 +4,7 @@ */ package org.hibernate.query.sqm.function; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.produce.function.ArgumentsValidator; import org.hibernate.query.sqm.produce.function.FunctionArgumentTypeResolver; import org.hibernate.query.sqm.produce.function.FunctionReturnTypeResolver; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingAggregateFunctionSqlAstExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingAggregateFunctionSqlAstExpression.java index ecc21666d85f..8ae818c54b5c 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingAggregateFunctionSqlAstExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingAggregateFunctionSqlAstExpression.java @@ -8,7 +8,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingFunctionSqlAstExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingFunctionSqlAstExpression.java index d0ef77eede72..7ae8234ed80d 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingFunctionSqlAstExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingFunctionSqlAstExpression.java @@ -15,7 +15,7 @@ import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.SqlExpressible; import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.sql.internal.DomainResultProducer; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingOrderedSetAggregateFunctionSqlAstExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingOrderedSetAggregateFunctionSqlAstExpression.java index ced252e75665..5e416033f9e3 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingOrderedSetAggregateFunctionSqlAstExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingOrderedSetAggregateFunctionSqlAstExpression.java @@ -8,7 +8,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmAggregateFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmAggregateFunction.java index 99dde026c2b6..f5a13263511a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmAggregateFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmAggregateFunction.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.produce.function.ArgumentsValidator; import org.hibernate.query.sqm.produce.function.FunctionReturnTypeResolver; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmFunction.java index 87bf489179a0..0c7bbaeb3500 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmFunction.java @@ -11,7 +11,7 @@ import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.metamodel.mapping.MappingModelExpressible; import org.hibernate.metamodel.spi.MappingMetamodelImplementor; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.produce.function.ArgumentsValidator; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmOrderedSetAggregateFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmOrderedSetAggregateFunction.java index c41a9e4ef179..8f52ba799f70 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmOrderedSetAggregateFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmOrderedSetAggregateFunction.java @@ -8,7 +8,7 @@ import java.util.Collections; import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.produce.function.ArgumentsValidator; import org.hibernate.query.sqm.produce.function.FunctionReturnTypeResolver; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmWindowFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmWindowFunction.java index b30dc3882b60..edaab1ed4537 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmWindowFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmWindowFunction.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.produce.function.ArgumentsValidator; import org.hibernate.query.sqm.produce.function.FunctionReturnTypeResolver; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingWindowFunctionSqlAstExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingWindowFunctionSqlAstExpression.java index e22e828662a8..29a19565e1b8 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingWindowFunctionSqlAstExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingWindowFunctionSqlAstExpression.java @@ -8,7 +8,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SqmFunctionDescriptor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SqmFunctionDescriptor.java index 926b9ec812d0..ddd3136f8256 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SqmFunctionDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SqmFunctionDescriptor.java @@ -4,7 +4,7 @@ */ package org.hibernate.query.sqm.function; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.produce.function.ArgumentsValidator; import org.hibernate.query.sqm.tree.SqmTypedNode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java index 33d639f7d108..ba9a2a9c7b51 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java @@ -51,7 +51,7 @@ import org.hibernate.query.ImmutableEntityUpdateQueryHandlingMode; import org.hibernate.query.NullPrecedence; import org.hibernate.query.BindingContext; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.SemanticException; import org.hibernate.query.SortDirection; import org.hibernate.query.criteria.HibernateCriteriaBuilder; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionReturnTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionReturnTypeResolver.java index 3ddc1c933dd4..7002b9de4b20 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionReturnTypeResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/FunctionReturnTypeResolver.java @@ -6,7 +6,7 @@ import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.metamodel.mapping.MappingModelExpressible; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.sql.FakeSqmToSqlAstConverter; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.query.sqm.tree.SqmTypedNode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardFunctionReturnTypeResolvers.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardFunctionReturnTypeResolvers.java index 6fe0c0f56212..0ea8a665a840 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardFunctionReturnTypeResolvers.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/StandardFunctionReturnTypeResolvers.java @@ -12,7 +12,7 @@ import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.query.sqm.tree.SqmTypedNode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java index fea924ee637f..b39035623524 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java @@ -109,7 +109,7 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.query.BindableType; import org.hibernate.query.QueryLogging; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.SemanticException; import org.hibernate.query.SortDirection; import org.hibernate.query.criteria.JpaCteCriteriaAttribute; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmElementAggregateFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmElementAggregateFunction.java index 20ff1f4b32ff..cc8301ecc4ab 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmElementAggregateFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmElementAggregateFunction.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.metamodel.model.domain.PluralPersistentAttribute; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.hql.spi.SqmCreationState; import org.hibernate.query.sqm.SemanticQueryWalker; import org.hibernate.query.sqm.SqmExpressible; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmIndexAggregateFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmIndexAggregateFunction.java index 798222c1c688..263797216301 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmIndexAggregateFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmIndexAggregateFunction.java @@ -8,7 +8,7 @@ import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.model.domain.PluralPersistentAttribute; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.hql.spi.SqmCreationState; import org.hibernate.query.sqm.SemanticQueryWalker; import org.hibernate.query.sqm.SqmExpressible; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmJsonPathExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmJsonPathExpression.java index 14c564ff30b1..d4620ed2cbee 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmJsonPathExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/AbstractSqmJsonPathExpression.java @@ -11,7 +11,7 @@ import org.hibernate.Incubating; import org.hibernate.internal.util.QuotingHelper; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.function.FunctionRenderer; import org.hibernate.query.sqm.function.SelfRenderingSqmFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCastTarget.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCastTarget.java index 4dfbe6011999..9a9e0f961332 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCastTarget.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmCastTarget.java @@ -5,7 +5,7 @@ package org.hibernate.query.sqm.tree.expression; import org.checkerframework.checker.nullness.qual.Nullable; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.criteria.JpaCastTarget; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SemanticQueryWalker; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmDurationUnit.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmDurationUnit.java index 824e076b8798..d3988ed00faf 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmDurationUnit.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmDurationUnit.java @@ -4,7 +4,7 @@ */ package org.hibernate.query.sqm.tree.expression; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SemanticQueryWalker; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpression.java index 07a900be38a8..a848a25b0f9e 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpression.java @@ -13,7 +13,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.hibernate.Internal; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.metamodel.model.domain.DomainType; import org.hibernate.query.criteria.JpaExpression; import org.hibernate.query.spi.QueryEngine; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExtractUnit.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExtractUnit.java index a72c7c8eae2b..92b7b0785d68 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExtractUnit.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExtractUnit.java @@ -4,7 +4,7 @@ */ package org.hibernate.query.sqm.tree.expression; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SemanticQueryWalker; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonExistsExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonExistsExpression.java index d39f8704a1c4..2cc09575f104 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonExistsExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonExistsExpression.java @@ -9,7 +9,7 @@ import java.util.Map; import org.hibernate.Incubating; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.criteria.JpaJsonExistsExpression; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.function.FunctionRenderer; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonQueryExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonQueryExpression.java index 0acaaef3ff61..3f2b16d7dbf5 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonQueryExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonQueryExpression.java @@ -9,7 +9,7 @@ import java.util.Map; import org.hibernate.Incubating; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.criteria.JpaJsonQueryExpression; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.function.FunctionRenderer; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonValueExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonValueExpression.java index 1122ae5d3a3c..695a87b247d9 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonValueExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonValueExpression.java @@ -9,7 +9,7 @@ import java.util.Map; import org.hibernate.Incubating; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.criteria.JpaExpression; import org.hibernate.query.criteria.JpaJsonValueExpression; import org.hibernate.query.sqm.NodeBuilder; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmToDuration.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmToDuration.java index e5e06077f080..6bdb0ccf2562 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmToDuration.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmToDuration.java @@ -4,7 +4,7 @@ */ package org.hibernate.query.sqm.tree.expression; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SemanticQueryWalker; import org.hibernate.query.sqm.tree.SqmCopyContext; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmXmlElementExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmXmlElementExpression.java index 1baf9bdb9ff5..8e7daf2104bc 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmXmlElementExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmXmlElementExpression.java @@ -9,7 +9,7 @@ import java.util.List; import org.hibernate.Incubating; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.criteria.JpaXmlElementExpression; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.function.FunctionRenderer; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java index 12e8ce9d1196..9ed7aacd39a3 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java @@ -57,7 +57,7 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.internal.SqlFragmentPredicate; import org.hibernate.query.IllegalQueryOperationException; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.SortDirection; import org.hibernate.query.common.TemporalUnit; import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/DynamicParameterizedTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/DynamicParameterizedTypeTest.java index 650690225ce4..efe2bc22d82d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/DynamicParameterizedTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/dynamicparameterized/DynamicParameterizedTypeTest.java @@ -10,7 +10,7 @@ import org.hibernate.metamodel.model.domain.BasicDomainType; import org.hibernate.metamodel.model.domain.internal.BasicSqmPathSource; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.produce.function.FunctionReturnTypeResolver; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.query.sqm.tree.SqmTypedNode; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/AnsiTrimEmulationFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/AnsiTrimEmulationFunctionTest.java index 2f30c97b3c3f..f49146a20334 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/AnsiTrimEmulationFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/AnsiTrimEmulationFunctionTest.java @@ -15,7 +15,7 @@ import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.TrimSpec; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subquery/SubqueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subquery/SubqueryTest.java index 26c4ba4509b1..44f1f7580347 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/subquery/SubqueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subquery/SubqueryTest.java @@ -8,7 +8,7 @@ import org.hibernate.boot.MetadataBuilder; import org.hibernate.dialect.H2Dialect; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingFunctionDescriptor; import org.hibernate.query.sqm.function.SqmFunctionDescriptor; import org.hibernate.query.sqm.produce.function.ArgumentsValidator; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/function/OrderByFragmentFunction.java b/hibernate-envers/src/main/java/org/hibernate/envers/function/OrderByFragmentFunction.java index c7f6480c47e5..f787f3adecd6 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/function/OrderByFragmentFunction.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/function/OrderByFragmentFunction.java @@ -11,7 +11,7 @@ import org.hibernate.metamodel.mapping.ValuedModelPart; import org.hibernate.metamodel.mapping.ordering.OrderByFragment; import org.hibernate.persister.collection.CollectionPersister; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.FunctionRenderer; import org.hibernate.spi.NavigablePath; import org.hibernate.query.spi.QueryEngine; diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatialFunction.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatialFunction.java index df34a304bb10..9bd2ac76c11d 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatialFunction.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatialFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.NamedSqmFunctionDescriptor; import org.hibernate.query.sqm.produce.function.ArgumentsValidator; import org.hibernate.query.sqm.produce.function.FunctionReturnTypeResolver; diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatialSQLMMFunction.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatialSQLMMFunction.java index 39381559ffb0..e624d3b18210 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatialSQLMMFunction.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatialSQLMMFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.produce.function.FunctionReturnTypeResolver; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGetGeometryType.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGetGeometryType.java index 174df1fc496a..68da9f365838 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGetGeometryType.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOGetGeometryType.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; import org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers; import org.hibernate.sql.ast.SqlAstTranslator; diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOMethodDescriptor.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOMethodDescriptor.java index 013a097f2aae..465ffd173802 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOMethodDescriptor.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOMethodDescriptor.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.produce.function.ArgumentsValidator; import org.hibernate.query.sqm.produce.function.FunctionReturnTypeResolver; import org.hibernate.sql.ast.SqlAstTranslator; diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDORelateFunction.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDORelateFunction.java index 574f47e11fa8..7e8538b92854 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDORelateFunction.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDORelateFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; import org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/STRelateFunction.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/STRelateFunction.java index 7084bfc1260e..aa3d7c848cc0 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/STRelateFunction.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/STRelateFunction.java @@ -6,7 +6,7 @@ import java.util.List; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.produce.function.StandardArgumentsValidators; import org.hibernate.query.sqm.produce.function.StandardFunctionReturnTypeResolvers; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisSqmFunctionDescriptors.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisSqmFunctionDescriptors.java index bb694204338d..871fe29967fb 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisSqmFunctionDescriptors.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisSqmFunctionDescriptors.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.boot.model.FunctionContributions; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.NamedSqmFunctionDescriptor; import org.hibernate.query.sqm.produce.function.ArgumentTypesValidator; import org.hibernate.query.sqm.produce.function.ArgumentsValidator; diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerSqmFunctionDescriptors.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerSqmFunctionDescriptors.java index e48d897e845e..53b2a5de0c62 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerSqmFunctionDescriptors.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerSqmFunctionDescriptors.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.boot.model.FunctionContributions; -import org.hibernate.query.ReturnableType; +import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.sqm.function.NamedSqmFunctionDescriptor; import org.hibernate.query.sqm.produce.function.ArgumentsValidator; import org.hibernate.query.sqm.produce.function.FunctionReturnTypeResolver; From f263959578f5e88148e816eb7a6a50d5a24e3b1f Mon Sep 17 00:00:00 2001 From: Gavin King Date: Sat, 21 Dec 2024 10:20:15 +0100 Subject: [PATCH 2/3] move the SQM tuple support into the correct package namespace this was placed in a location which it would be part of the public API of the org.hibernate.query package, which is wrong, since it is not API, nor is it even exposed on any SPIs, as far as I can discern cc @beikov --- .../dialect/DB2LegacySqlAstTranslator.java | 2 +- .../dialect/HANALegacySqlAstTranslator.java | 2 +- .../dialect/OracleLegacySqlAstTranslator.java | 2 +- .../dialect/SQLServerLegacySqlAstTranslator.java | 2 +- .../org/hibernate/dialect/DB2SqlAstTranslator.java | 2 +- .../hibernate/dialect/HANASqlAstTranslator.java | 2 +- .../hibernate/dialect/OracleSqlAstTranslator.java | 2 +- .../dialect/SQLServerSqlAstTranslator.java | 2 +- .../function/CteGenerateSeriesFunction.java | 2 +- .../dialect/function/GenerateSeriesFunction.java | 2 +- ...rateSeriesSetReturningFunctionTypeResolver.java | 2 +- .../dialect/function/H2GenerateSeriesFunction.java | 2 +- .../function/HANAGenerateSeriesFunction.java | 2 +- .../NumberSeriesGenerateSeriesFunction.java | 2 +- .../function/SQLServerGenerateSeriesFunction.java | 2 +- .../function/SybaseASEGenerateSeriesFunction.java | 2 +- .../UnnestSetReturningFunctionTypeResolver.java | 2 +- .../dialect/function/array/DB2UnnestFunction.java | 2 +- .../dialect/function/array/H2UnnestFunction.java | 2 +- .../dialect/function/array/HANAUnnestFunction.java | 2 +- .../function/array/OracleUnnestFunction.java | 2 +- .../function/array/PostgreSQLUnnestFunction.java | 2 +- .../function/array/SQLServerUnnestFunction.java | 2 +- .../function/array/SybaseASEUnnestFunction.java | 2 +- .../dialect/function/array/UnnestFunction.java | 2 +- .../json/CockroachDBJsonTableFunction.java | 2 +- .../function/json/DB2JsonTableFunction.java | 2 +- .../dialect/function/json/H2JsonTableFunction.java | 2 +- .../function/json/HANAJsonTableFunction.java | 2 +- .../dialect/function/json/JsonTableFunction.java | 2 +- .../JsonTableSetReturningFunctionTypeResolver.java | 2 +- .../function/json/MySQLJsonTableFunction.java | 2 +- .../function/json/OracleJsonTableFunction.java | 2 +- .../function/json/PostgreSQLJsonTableFunction.java | 2 +- .../function/json/SQLServerJsonTableFunction.java | 2 +- .../dialect/function/xml/DB2XmlTableFunction.java | 2 +- .../dialect/function/xml/HANAXmlTableFunction.java | 2 +- .../function/xml/SQLServerXmlTableFunction.java | 2 +- .../function/xml/SybaseASEXmlTableFunction.java | 2 +- .../dialect/function/xml/XmlTableFunction.java | 2 +- .../XmlTableSetReturningFunctionTypeResolver.java | 2 +- .../domain/internal/MappingMetamodelImpl.java | 4 ++-- .../query/hql/internal/SemanticQueryBuilder.java | 2 +- .../NamedSqmSetReturningFunctionDescriptor.java | 2 +- .../SelfRenderingSqmSetReturningFunction.java | 4 ++-- .../sqm/function/SetReturningFunctionRenderer.java | 2 +- .../function/SetReturningFunctionTypeResolver.java | 2 +- .../SetReturningFunctionTypeResolverBuilder.java | 2 +- .../query/sqm/sql/BaseSqmToSqlAstConverter.java | 6 +++--- .../internal/EntityValuedPathInterpretation.java | 2 +- .../hibernate/query/sqm/tree/cte/SqmCteTable.java | 6 +++--- .../query/sqm/tree/domain/SqmDerivedRoot.java | 2 +- .../sqm/tree/expression/SqmJsonTableFunction.java | 2 +- .../tree/expression/SqmSetReturningFunction.java | 2 +- .../sqm/tree/expression/SqmXmlTableFunction.java | 2 +- .../query/sqm/tree/from/SqmDerivedJoin.java | 2 +- ...AnonymousTupleBasicEntityIdentifierMapping.java | 2 +- .../AnonymousTupleBasicValuedModelPart.java | 2 +- .../AnonymousTupleEmbeddableValuedModelPart.java | 2 +- ...nymousTupleEmbeddedEntityIdentifierMapping.java | 2 +- .../AnonymousTupleEntityValuedModelPart.java | 2 +- ...sTupleNonAggregatedEntityIdentifierMapping.java | 2 +- .../AnonymousTupleSimpleSqmPathSource.java | 2 +- .../AnonymousTupleSqmAssociationPathSource.java | 2 +- .../AnonymousTupleSqmAssociationPathSourceNew.java | 2 +- .../internal}/AnonymousTupleSqmPathSource.java | 2 +- .../internal}/AnonymousTupleSqmPathSourceNew.java | 2 +- .../AnonymousTupleTableGroupProducer.java | 2 +- .../tuple/internal}/AnonymousTupleType.java | 2 +- .../internal}/CteTupleTableGroupProducer.java | 2 +- .../hibernate/query/sqm/tuple/package-info.java | 14 ++++++++++++++ .../org/hibernate/sql/ast/SqlAstTranslator.java | 2 +- .../sql/ast/spi/AbstractSqlAstTranslator.java | 2 +- .../org/hibernate/sql/ast/tree/cte/CteTable.java | 4 ++-- 74 files changed, 94 insertions(+), 80 deletions(-) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleBasicEntityIdentifierMapping.java (98%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleBasicValuedModelPart.java (99%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleEmbeddableValuedModelPart.java (99%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleEmbeddedEntityIdentifierMapping.java (98%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleEntityValuedModelPart.java (99%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleNonAggregatedEntityIdentifierMapping.java (98%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleSimpleSqmPathSource.java (97%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleSqmAssociationPathSource.java (98%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleSqmAssociationPathSourceNew.java (98%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleSqmPathSource.java (98%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleSqmPathSourceNew.java (98%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleTableGroupProducer.java (99%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/AnonymousTupleType.java (99%) rename hibernate-core/src/main/java/org/hibernate/query/{derived => sqm/tuple/internal}/CteTupleTableGroupProducer.java (98%) create mode 100644 hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/package-info.java diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacySqlAstTranslator.java index f06c36371c68..4bfd9aafb01f 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacySqlAstTranslator.java @@ -14,7 +14,7 @@ import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.IllegalQueryOperationException; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.common.FetchClauseType; import org.hibernate.sql.ast.Clause; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacySqlAstTranslator.java index 025bf8f4e8a6..cad55fa233db 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/HANALegacySqlAstTranslator.java @@ -12,7 +12,7 @@ import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.IllegalQueryOperationException; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacySqlAstTranslator.java index 76c279743224..25348d756960 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacySqlAstTranslator.java @@ -17,7 +17,7 @@ import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.IllegalQueryOperationException; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.common.FetchClauseType; import org.hibernate.query.common.FrameExclusion; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacySqlAstTranslator.java index b3011650f534..ca0bb4b74428 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLServerLegacySqlAstTranslator.java @@ -15,7 +15,7 @@ import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.IllegalQueryOperationException; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.common.FetchClauseType; import org.hibernate.sql.ast.Clause; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java index 2ff3696aeeb1..94065dda8125 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java @@ -13,7 +13,7 @@ import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.IllegalQueryOperationException; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.common.FetchClauseType; import org.hibernate.sql.ast.Clause; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/HANASqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/HANASqlAstTranslator.java index 5a935a2513c3..9cedafea3019 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/HANASqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/HANASqlAstTranslator.java @@ -12,7 +12,7 @@ import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.IllegalQueryOperationException; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleSqlAstTranslator.java index 9ad95a4b7645..6a4c267bf153 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleSqlAstTranslator.java @@ -15,7 +15,7 @@ import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.IllegalQueryOperationException; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.common.FetchClauseType; import org.hibernate.query.common.FrameExclusion; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java index 4df00fa2903b..154b4a190c6d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java @@ -14,7 +14,7 @@ import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.IllegalQueryOperationException; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.common.FetchClauseType; import org.hibernate.sql.ast.Clause; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CteGenerateSeriesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CteGenerateSeriesFunction.java index 2f897c6db29a..bff57bf50abc 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/CteGenerateSeriesFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/CteGenerateSeriesFunction.java @@ -9,7 +9,7 @@ import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.metamodel.mapping.SelectableMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.BinaryArithmeticOperator; import org.hibernate.query.sqm.ComparisonOperator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/GenerateSeriesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/GenerateSeriesFunction.java index 53fb212a8da4..9198e8376537 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/GenerateSeriesFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/GenerateSeriesFunction.java @@ -6,7 +6,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.hibernate.metamodel.mapping.CollectionPart; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingSetReturningFunctionDescriptor; import org.hibernate.query.sqm.produce.function.SetReturningFunctionTypeResolver; import org.hibernate.sql.ast.SqlAstTranslator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/GenerateSeriesSetReturningFunctionTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/GenerateSeriesSetReturningFunctionTypeResolver.java index fad4137b1473..39107266e310 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/GenerateSeriesSetReturningFunctionTypeResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/GenerateSeriesSetReturningFunctionTypeResolver.java @@ -14,7 +14,7 @@ import org.hibernate.metamodel.mapping.SqlTypedMapping; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; import org.hibernate.metamodel.model.domain.DomainType; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.produce.function.SetReturningFunctionTypeResolver; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/H2GenerateSeriesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/H2GenerateSeriesFunction.java index 8686fa3ecde1..0f07e60f3787 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/H2GenerateSeriesFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/H2GenerateSeriesFunction.java @@ -12,7 +12,7 @@ import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.metamodel.mapping.SelectableMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/HANAGenerateSeriesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/HANAGenerateSeriesFunction.java index a80ba3297930..1e3d7704cc2d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/HANAGenerateSeriesFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/HANAGenerateSeriesFunction.java @@ -8,7 +8,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.SelectableMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/NumberSeriesGenerateSeriesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/NumberSeriesGenerateSeriesFunction.java index 11c5a4ad5b6d..d5070882852a 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/NumberSeriesGenerateSeriesFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/NumberSeriesGenerateSeriesFunction.java @@ -16,7 +16,7 @@ import org.hibernate.metamodel.mapping.SqlTypedMapping; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; import org.hibernate.metamodel.model.domain.ReturnableType; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.sqm.BinaryArithmeticOperator; import org.hibernate.query.sqm.ComparisonOperator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerGenerateSeriesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerGenerateSeriesFunction.java index b6c347c105e7..c292a1ed46ab 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerGenerateSeriesFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLServerGenerateSeriesFunction.java @@ -12,7 +12,7 @@ import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.metamodel.mapping.SelectableMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SybaseASEGenerateSeriesFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SybaseASEGenerateSeriesFunction.java index e9a257e9e5a6..8c9551462832 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SybaseASEGenerateSeriesFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SybaseASEGenerateSeriesFunction.java @@ -7,7 +7,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.SelectableMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/UnnestSetReturningFunctionTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/UnnestSetReturningFunctionTypeResolver.java index f9c752a4ffa0..a1bf8acf214f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/UnnestSetReturningFunctionTypeResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/UnnestSetReturningFunctionTypeResolver.java @@ -17,7 +17,7 @@ import org.hibernate.metamodel.mapping.SelectablePath; import org.hibernate.metamodel.mapping.SqlTypedMapping; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.produce.function.SetReturningFunctionTypeResolver; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DB2UnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DB2UnnestFunction.java index af2af3130e92..daf39e56bb0f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DB2UnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/DB2UnnestFunction.java @@ -14,7 +14,7 @@ import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.metamodel.mapping.SqlTypedMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2UnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2UnnestFunction.java index b30c6af36a14..60d7c0d1c88f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2UnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/H2UnnestFunction.java @@ -16,7 +16,7 @@ import org.hibernate.metamodel.mapping.SelectablePath; import org.hibernate.metamodel.mapping.SqlTypedMapping; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HANAUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HANAUnnestFunction.java index 753a561b4f72..c8159b99b3ac 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HANAUnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/HANAUnnestFunction.java @@ -24,7 +24,7 @@ import org.hibernate.metamodel.mapping.SqlTypedMapping; import org.hibernate.metamodel.mapping.ValuedModelPart; import org.hibernate.metamodel.mapping.internal.EmbeddedCollectionPart; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleUnnestFunction.java index 3cd41f426937..97043e380533 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleUnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/OracleUnnestFunction.java @@ -7,7 +7,7 @@ import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.metamodel.mapping.SqlTypedMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.Expression; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLUnnestFunction.java index 4bb275393f88..94d6576475f6 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLUnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/PostgreSQLUnnestFunction.java @@ -9,7 +9,7 @@ import org.hibernate.dialect.aggregate.AggregateSupport; import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.mapping.SqlTypedMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.Expression; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SQLServerUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SQLServerUnnestFunction.java index 527dc0472bb5..73eceb90cbc7 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SQLServerUnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SQLServerUnnestFunction.java @@ -8,7 +8,7 @@ import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.metamodel.mapping.SqlTypedMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.Expression; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SybaseASEUnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SybaseASEUnnestFunction.java index d549c3b5f919..e06ea4545844 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SybaseASEUnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/SybaseASEUnnestFunction.java @@ -7,7 +7,7 @@ import org.hibernate.dialect.XmlHelper; import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.mapping.SqlTypedMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.Expression; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/UnnestFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/UnnestFunction.java index 563a1adec37b..bded48321795 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/array/UnnestFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/array/UnnestFunction.java @@ -10,7 +10,7 @@ import org.hibernate.dialect.function.UnnestSetReturningFunctionTypeResolver; import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.mapping.SqlTypedMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingSetReturningFunctionDescriptor; import org.hibernate.query.sqm.produce.function.SetReturningFunctionTypeResolver; import org.hibernate.sql.ast.SqlAstTranslator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonTableFunction.java index e02387af8358..8c884c7e390d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/CockroachDBJsonTableFunction.java @@ -5,7 +5,7 @@ package org.hibernate.dialect.function.json; import org.hibernate.QueryException; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/DB2JsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/DB2JsonTableFunction.java index b952aaaf0eff..52c139e590b1 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/DB2JsonTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/DB2JsonTableFunction.java @@ -7,7 +7,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.hibernate.QueryException; import org.hibernate.dialect.function.CteGenerateSeriesFunction; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonTableFunction.java index 315d86876135..b26fa504ba6e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/H2JsonTableFunction.java @@ -14,7 +14,7 @@ import org.hibernate.metamodel.mapping.SelectablePath; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; import org.hibernate.metamodel.model.domain.ReturnableType; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.sqm.function.FunctionRenderer; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonTableFunction.java index 8bb1b3c85e73..a8c9e50e5946 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/HANAJsonTableFunction.java @@ -16,7 +16,7 @@ import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.metamodel.mapping.ValuedModelPart; import org.hibernate.metamodel.mapping.internal.EmbeddedCollectionPart; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonTableFunction.java index f252e24e616f..39896a229156 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonTableFunction.java @@ -6,7 +6,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.hibernate.dialect.function.array.DdlTypeHelper; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingSetReturningFunctionDescriptor; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonTableSetReturningFunctionTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonTableSetReturningFunctionTypeResolver.java index 713beca99d96..ab01adec021e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonTableSetReturningFunctionTypeResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/JsonTableSetReturningFunctionTypeResolver.java @@ -8,7 +8,7 @@ import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.mapping.SelectablePath; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.sqm.produce.function.SetReturningFunctionTypeResolver; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.query.sqm.tree.SqmTypedNode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonTableFunction.java index f79867cdbf35..3a2ee08e5fa3 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/MySQLJsonTableFunction.java @@ -6,7 +6,7 @@ import org.hibernate.QueryException; import org.hibernate.dialect.function.array.DdlTypeHelper; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.Expression; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonTableFunction.java index 7f4ea449b124..97f0ee785d76 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/OracleJsonTableFunction.java @@ -10,7 +10,7 @@ import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.mapping.SelectablePath; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.sql.Template; import org.hibernate.sql.ast.SqlAstTranslator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonTableFunction.java index 4a7d5b102f32..fc775ac68b9c 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/PostgreSQLJsonTableFunction.java @@ -7,7 +7,7 @@ import org.hibernate.QueryException; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonTableFunction.java index 55f4c12957b3..1963915f165d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/json/SQLServerJsonTableFunction.java @@ -6,7 +6,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.hibernate.QueryException; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.expression.JsonExistsErrorBehavior; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/DB2XmlTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/DB2XmlTableFunction.java index ca0341e899d6..0f9ed0d3304b 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/DB2XmlTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/DB2XmlTableFunction.java @@ -10,7 +10,7 @@ import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.mapping.SelectablePath; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.sql.Template; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/HANAXmlTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/HANAXmlTableFunction.java index 460416cd5d0d..efa77c607753 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/HANAXmlTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/HANAXmlTableFunction.java @@ -21,7 +21,7 @@ import org.hibernate.metamodel.mapping.ValuedModelPart; import org.hibernate.metamodel.mapping.internal.EmbeddedCollectionPart; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlTableFunction.java index f988febac1e6..a0f594a57c6d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SQLServerXmlTableFunction.java @@ -4,7 +4,7 @@ */ package org.hibernate.dialect.function.xml; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SybaseASEXmlTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SybaseASEXmlTableFunction.java index 7629d5d4420f..a59a4b9020e1 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SybaseASEXmlTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/SybaseASEXmlTableFunction.java @@ -11,7 +11,7 @@ import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.mapping.SelectablePath; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.sql.Template; import org.hibernate.sql.ast.SqlAstNodeRenderingMode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlTableFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlTableFunction.java index b6e386541be5..18831a358731 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlTableFunction.java @@ -6,7 +6,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.hibernate.dialect.function.array.DdlTypeHelper; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.function.AbstractSqmSelfRenderingSetReturningFunctionDescriptor; import org.hibernate.query.sqm.function.SelfRenderingSqmSetReturningFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlTableSetReturningFunctionTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlTableSetReturningFunctionTypeResolver.java index 29b8191b9062..efd33f46fd79 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlTableSetReturningFunctionTypeResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/xml/XmlTableSetReturningFunctionTypeResolver.java @@ -8,7 +8,7 @@ import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.mapping.SelectablePath; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.sqm.produce.function.SetReturningFunctionTypeResolver; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.query.sqm.tree.SqmTypedNode; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java index 37fe61f093bd..a39931ee293b 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java @@ -53,8 +53,8 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.spi.PersisterFactory; import org.hibernate.query.BindableType; -import org.hibernate.query.derived.AnonymousTupleSimpleSqmPathSource; -import org.hibernate.query.derived.AnonymousTupleSqmPathSource; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleSimpleSqmPathSource; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleSqmPathSource; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.tree.domain.SqmPath; import org.hibernate.query.sqm.tree.expression.SqmFieldLiteral; diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java index fe3ea457f2ab..1c909ad51648 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java @@ -71,7 +71,7 @@ import org.hibernate.query.criteria.JpaRoot; import org.hibernate.query.criteria.JpaSearchOrder; import org.hibernate.query.criteria.JpaXmlTableColumnNode; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.hql.HqlLogging; import org.hibernate.query.hql.spi.DotIdentifierConsumer; import org.hibernate.query.hql.spi.SemanticPathPart; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/NamedSqmSetReturningFunctionDescriptor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/NamedSqmSetReturningFunctionDescriptor.java index 8eab6bc81325..aa31128d61ff 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/NamedSqmSetReturningFunctionDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/NamedSqmSetReturningFunctionDescriptor.java @@ -8,7 +8,7 @@ import java.util.Locale; import org.hibernate.Incubating; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.sqm.produce.function.ArgumentsValidator; import org.hibernate.query.sqm.produce.function.FunctionArgumentTypeResolver; import org.hibernate.query.sqm.produce.function.SetReturningFunctionTypeResolver; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmSetReturningFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmSetReturningFunction.java index c0c269f8ca0e..099a28364854 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmSetReturningFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SelfRenderingSqmSetReturningFunction.java @@ -13,8 +13,8 @@ import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.MappingModelExpressible; import org.hibernate.metamodel.mapping.SelectableMapping; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.produce.function.ArgumentsValidator; import org.hibernate.query.sqm.produce.function.FunctionArgumentTypeResolver; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SetReturningFunctionRenderer.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SetReturningFunctionRenderer.java index b8583b4570f6..64c83928f023 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SetReturningFunctionRenderer.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/function/SetReturningFunctionRenderer.java @@ -7,7 +7,7 @@ import java.util.List; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.sql.ast.SqlAstTranslator; import org.hibernate.sql.ast.spi.SqlAppender; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/SetReturningFunctionTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/SetReturningFunctionTypeResolver.java index 4c68127ddece..eeb8f2c5d11e 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/SetReturningFunctionTypeResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/SetReturningFunctionTypeResolver.java @@ -7,7 +7,7 @@ import org.hibernate.Incubating; import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.mapping.SqlExpressible; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.sqm.produce.function.internal.SetReturningFunctionTypeResolverBuilder; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.query.sqm.tree.SqmTypedNode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/internal/SetReturningFunctionTypeResolverBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/internal/SetReturningFunctionTypeResolverBuilder.java index 1b3adec848c8..b1ebf9d57cad 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/internal/SetReturningFunctionTypeResolverBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/internal/SetReturningFunctionTypeResolverBuilder.java @@ -10,7 +10,7 @@ import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.mapping.SelectablePath; import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.produce.function.SetReturningFunctionTypeResolver; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java index b39035623524..eda5e0da259a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java @@ -115,9 +115,9 @@ import org.hibernate.query.criteria.JpaCteCriteriaAttribute; import org.hibernate.query.criteria.JpaPath; import org.hibernate.query.criteria.JpaSearchOrder; -import org.hibernate.query.derived.AnonymousTupleEntityValuedModelPart; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleEntityValuedModelPart; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.spi.QueryOptions; import org.hibernate.query.spi.QueryParameterBinding; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EntityValuedPathInterpretation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EntityValuedPathInterpretation.java index 4739648165fa..d31c37c0be60 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EntityValuedPathInterpretation.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EntityValuedPathInterpretation.java @@ -24,7 +24,7 @@ import org.hibernate.metamodel.mapping.internal.EntityCollectionPart; import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping; import org.hibernate.persister.entity.UnionSubclassEntityPersister; -import org.hibernate.query.derived.AnonymousTupleEntityValuedModelPart; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleEntityValuedModelPart; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.query.sqm.tree.domain.SqmEntityValuedSimplePath; import org.hibernate.query.sqm.tree.domain.SqmPath; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteTable.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteTable.java index 44947f9454ba..dbc8af7ae045 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteTable.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/cte/SqmCteTable.java @@ -11,9 +11,9 @@ import org.hibernate.metamodel.model.domain.DomainType; import org.hibernate.query.criteria.JpaCteCriteriaAttribute; import org.hibernate.query.criteria.JpaCteCriteriaType; -import org.hibernate.query.derived.AnonymousTupleSimpleSqmPathSource; -import org.hibernate.query.derived.AnonymousTupleType; -import org.hibernate.query.derived.CteTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleSimpleSqmPathSource; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.CteTupleTableGroupProducer; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.SqmPathSource; import org.hibernate.query.sqm.tree.select.SqmSelectQuery; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmDerivedRoot.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmDerivedRoot.java index 7188003893f2..bde152e69d05 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmDerivedRoot.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmDerivedRoot.java @@ -8,7 +8,7 @@ import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.query.PathException; import org.hibernate.query.criteria.JpaDerivedRoot; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.sqm.SemanticQueryWalker; import org.hibernate.query.sqm.SqmPathSource; import org.hibernate.query.sqm.spi.SqmCreationHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonTableFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonTableFunction.java index f01ac33bbdd4..01b5b95f3de7 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmJsonTableFunction.java @@ -14,7 +14,7 @@ import org.hibernate.query.criteria.JpaJsonTableColumnsNode; import org.hibernate.query.criteria.JpaJsonTableFunction; import org.hibernate.query.criteria.JpaJsonValueNode; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SemanticQueryWalker; import org.hibernate.query.sqm.SqmExpressible; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSetReturningFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSetReturningFunction.java index 15e81f878e6d..d4e98d4d335a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSetReturningFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmSetReturningFunction.java @@ -8,7 +8,7 @@ import org.hibernate.Incubating; import org.hibernate.query.criteria.JpaSetReturningFunction; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SemanticQueryWalker; import org.hibernate.query.sqm.function.SqmSetReturningFunctionDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmXmlTableFunction.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmXmlTableFunction.java index 464b4671017e..2612f56c868b 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmXmlTableFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmXmlTableFunction.java @@ -10,7 +10,7 @@ import org.hibernate.query.criteria.JpaCastTarget; import org.hibernate.query.criteria.JpaXmlTableColumnNode; import org.hibernate.query.criteria.JpaXmlTableFunction; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SemanticQueryWalker; import org.hibernate.query.sqm.SqmExpressible; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmDerivedJoin.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmDerivedJoin.java index 46269fa000c3..9b006cd4d962 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmDerivedJoin.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/from/SqmDerivedJoin.java @@ -10,7 +10,7 @@ import org.hibernate.query.criteria.JpaDerivedJoin; import org.hibernate.query.criteria.JpaExpression; import org.hibernate.query.criteria.JpaPredicate; -import org.hibernate.query.derived.AnonymousTupleType; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType; import org.hibernate.query.sqm.SemanticQueryWalker; import org.hibernate.query.sqm.SqmPathSource; import org.hibernate.query.sqm.spi.SqmCreationHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicEntityIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleBasicEntityIdentifierMapping.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicEntityIdentifierMapping.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleBasicEntityIdentifierMapping.java index 46a69f0cedb3..70b6be6ba3c9 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicEntityIdentifierMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleBasicEntityIdentifierMapping.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import org.hibernate.Incubating; import org.hibernate.engine.spi.IdentifierValue; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleBasicValuedModelPart.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicValuedModelPart.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleBasicValuedModelPart.java index 5953d0c51d00..80e8c26793a6 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicValuedModelPart.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleBasicValuedModelPart.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import java.util.function.BiConsumer; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddableValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEmbeddableValuedModelPart.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddableValuedModelPart.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEmbeddableValuedModelPart.java index 63541d0b0e74..5a35e2e016c6 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddableValuedModelPart.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEmbeddableValuedModelPart.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddedEntityIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEmbeddedEntityIdentifierMapping.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddedEntityIdentifierMapping.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEmbeddedEntityIdentifierMapping.java index 2c50771b7429..578da896c57f 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddedEntityIdentifierMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEmbeddedEntityIdentifierMapping.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import java.util.Set; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEntityValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEntityValuedModelPart.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEntityValuedModelPart.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEntityValuedModelPart.java index 8f9f4b312f11..caf4cefbf2c4 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEntityValuedModelPart.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleEntityValuedModelPart.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import java.util.ArrayList; import java.util.HashSet; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleNonAggregatedEntityIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleNonAggregatedEntityIdentifierMapping.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleNonAggregatedEntityIdentifierMapping.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleNonAggregatedEntityIdentifierMapping.java index c74fc7cedfe7..02bb6d7429d5 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleNonAggregatedEntityIdentifierMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleNonAggregatedEntityIdentifierMapping.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import java.util.Set; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSimpleSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSimpleSqmPathSource.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSimpleSqmPathSource.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSimpleSqmPathSource.java index e56439c7ef48..14c0d3730c57 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSimpleSqmPathSource.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSimpleSqmPathSource.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import org.hibernate.Incubating; import org.hibernate.metamodel.model.domain.DomainType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmAssociationPathSource.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmAssociationPathSource.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmAssociationPathSource.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmAssociationPathSource.java index 3fb770920bd4..97122c47404d 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmAssociationPathSource.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmAssociationPathSource.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import java.lang.reflect.Member; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmAssociationPathSourceNew.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmAssociationPathSourceNew.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmAssociationPathSourceNew.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmAssociationPathSourceNew.java index 6ccac5f2fead..fffcea35927f 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmAssociationPathSourceNew.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmAssociationPathSourceNew.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import java.lang.reflect.Member; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmPathSource.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmPathSource.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmPathSource.java index 1be701481258..08a244b26d53 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmPathSource.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmPathSource.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import org.hibernate.Incubating; import org.hibernate.metamodel.model.domain.BasicDomainType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmPathSourceNew.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmPathSourceNew.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmPathSourceNew.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmPathSourceNew.java index 0056ca0387be..9ac446d82e5e 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmPathSourceNew.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleSqmPathSourceNew.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import org.hibernate.Incubating; import org.hibernate.metamodel.model.domain.BasicDomainType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleTableGroupProducer.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleTableGroupProducer.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleTableGroupProducer.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleTableGroupProducer.java index d024fe6328a1..265566362b8a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleTableGroupProducer.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleTableGroupProducer.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import java.util.ArrayList; import java.util.HashSet; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleType.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleType.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleType.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleType.java index 2dd1fa603714..3dbf8f21b607 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleType.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleType.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import java.util.ArrayList; import java.util.Arrays; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/CteTupleTableGroupProducer.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/CteTupleTableGroupProducer.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/query/derived/CteTupleTableGroupProducer.java rename to hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/CteTupleTableGroupProducer.java index 076f46eea957..963140529e72 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/CteTupleTableGroupProducer.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/CteTupleTableGroupProducer.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.query.derived; +package org.hibernate.query.sqm.tuple.internal; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/package-info.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/package-info.java new file mode 100644 index 000000000000..a084d0a38cfd --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/package-info.java @@ -0,0 +1,14 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ + +/** + * Support for tuples in SQM. + */ +@Incubating +package org.hibernate.query.sqm.tuple; + +import org.hibernate.Incubating; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslator.java index 5f3ba57f3db8..51798ad1ad4e 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/SqlAstTranslator.java @@ -10,7 +10,7 @@ import org.hibernate.Incubating; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.util.collections.Stack; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.spi.QueryOptions; import org.hibernate.sql.ast.tree.SqlAstNode; import org.hibernate.sql.ast.tree.expression.Expression; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java index 9ed7aacd39a3..6aee9a84ee15 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java @@ -60,7 +60,7 @@ import org.hibernate.metamodel.model.domain.ReturnableType; import org.hibernate.query.SortDirection; import org.hibernate.query.common.TemporalUnit; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; import org.hibernate.query.internal.NullPrecedenceHelper; import org.hibernate.query.spi.Limit; import org.hibernate.query.spi.QueryOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTable.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTable.java index f5712cc7091e..f6650ba1a937 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTable.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/cte/CteTable.java @@ -23,8 +23,8 @@ import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.metamodel.mapping.internal.SingleAttributeIdentifierMapping; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.query.derived.AnonymousTupleTableGroupProducer; -import org.hibernate.query.derived.CteTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.AnonymousTupleTableGroupProducer; +import org.hibernate.query.sqm.tuple.internal.CteTupleTableGroupProducer; /** * Describes the table definition for the CTE - its name amd its columns From 31dcef0d06f8f9b71350e524ba6bd29e0d73b664 Mon Sep 17 00:00:00 2001 From: Gavin King Date: Sat, 21 Dec 2024 10:25:16 +0100 Subject: [PATCH 3/3] remove unused interface LiteralConsumer --- .../hibernate/query/hql/LiteralConsumer.java | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 hibernate-core/src/main/java/org/hibernate/query/hql/LiteralConsumer.java diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/LiteralConsumer.java b/hibernate-core/src/main/java/org/hibernate/query/hql/LiteralConsumer.java deleted file mode 100644 index ed2fb0783735..000000000000 --- a/hibernate-core/src/main/java/org/hibernate/query/hql/LiteralConsumer.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * SPDX-License-Identifier: LGPL-2.1-or-later - * Copyright Red Hat Inc. and Hibernate Authors - */ -package org.hibernate.query.hql; - -/** - * Pluggable contract for consuming literals encountered in an HQL query. - * - * todo (6.0) : hook this in. proposed syntax - `{literal [name] [value]}` - * - where [name] is a registration key identifying the consumer to use - * and [value] is the literal value to be consumed. Potentially allow - * multiple tokens after [name] to allow for "hints" to the consumer. - * - * todo (6.0) : use JDK ServiceLoader + explicitly specified - * - * @author Steve Ebersole - */ -public interface LiteralConsumer { -}