From 6816f721beb50aac5316604e00f0a5fb5ba88f5f Mon Sep 17 00:00:00 2001 From: Gavin King Date: Sat, 21 Dec 2024 10:11:42 +0100 Subject: [PATCH] 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 d49b2bafc1..144620da69 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 @@ package org.hibernate.community.dialect.function; 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 cc400ebe30..981c0130d7 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 @@ package org.hibernate.community.dialect.function; 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 090f765f96..2decb90df3 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 java.util.Map; 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 d7248bb13b..53bbd24d2d 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.dialect.Dialect; 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 70fc952f55..5ed8f6576b 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 @@ package org.hibernate.dialect.function; 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 2d64bbf59d..db8aa9ca3e 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 java.util.List; 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 872c911259..12876ff922 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 070288470a..830ea97293 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 java.util.List; 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 32414e9518..b96ac79dd4 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.List; 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 150abeb180..f6509dddd7 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 b8074d2426..c21944fe25 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 @@ package org.hibernate.dialect.function; 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 335911110d..b4a1a18407 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.dialect.Dialect; 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 84e248bb1a..88f4515785 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 c3494c49fe..fd76e9b3c5 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 @@ package org.hibernate.dialect.function; 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 e5560bf929..e7a1acc6b4 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 @@ package org.hibernate.dialect.function; 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 7fc5c9205c..94299983bc 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 @@ package org.hibernate.dialect.function; 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 00910f996f..3f79746eb5 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 @@ package org.hibernate.dialect.function; 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 e47c6d8207..67a249d536 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 @@ package org.hibernate.dialect.function; 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 40a5c97a2c..0f84b7fdf0 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 @@ package org.hibernate.dialect.function; 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 e33755231f..7393c50f80 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 3a14a5a2fe..aab2081c65 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 java.util.List; 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 af2f66ebd4..55a42f06ad 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 @@ package org.hibernate.dialect.function; 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 7a7b9dd1be..5a6a784e4a 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.ArrayList; 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 4ca0f5df45..5918b63683 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 e234946560..e778db71f3 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 @@ package org.hibernate.dialect.function; 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 bb6276b603..eba6bf8fdc 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 java.util.List; 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 098fd91291..a823d2b569 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.ArrayList; 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 a9732373d7..ef5e5851d9 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 @@ package org.hibernate.dialect.function; 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 59920bee6a..99bd073a8e 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 @@ package org.hibernate.dialect.function; 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 ef5b9cd9bb..b1436d5c2c 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 @@ package org.hibernate.dialect.function; 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 d63e5ab297..f174bc67f7 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.Collections; 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 23cf5a5ada..b0f9196338 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 6444552d4f..1c73daaf77 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 a8d7ae3670..6d49a3cbb6 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 @@ package org.hibernate.dialect.function; 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 976f895bd7..8ffc43855e 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 @@ package org.hibernate.dialect.function; 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 fc81fa4e17..11c5a4ad5b 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.SelectableMapping; 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 676c196922..6045748fc3 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 4d2fd21b2b..e13bdd4017 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 @@ package org.hibernate.dialect.function; 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 f743d4c32b..7da7064bda 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 java.util.List; 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 3ce1e9798f..b05bd5785f 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 @@ package org.hibernate.dialect.function; 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 bd20540f59..68b2dadc64 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 @@ package org.hibernate.dialect.function; 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 ed6eacb325..abe716b96a 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 @@ package org.hibernate.dialect.function; 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 a17374dda6..9a5497b565 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 @@ package org.hibernate.dialect.function; 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 11fbdc0fe9..baf357a3d3 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 @@ package org.hibernate.dialect.function; 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 aba439a249..eb7019f556 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 @@ package org.hibernate.dialect.function; 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 65ea0c0141..eb13c50961 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 641a50461a..c9729e8059 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 @@ package org.hibernate.dialect.function; 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 75b096bbe2..c33c8478a4 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 @@ package org.hibernate.dialect.function; 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 e75086422c..a7e95ccf37 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.List; 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 742be53f9d..6cac5bed50 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 @@ package org.hibernate.dialect.function; 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 ee03c58f9e..fa51b5f855 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 @@ package org.hibernate.dialect.function; 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 6874f846c3..52a9d1488e 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 @@ package org.hibernate.dialect.function; 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 f5f9407ae4..d1f0dd9e85 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 java.util.function.Supplier; 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 d1688580f7..c465b20d26 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 @@ package org.hibernate.dialect.function; 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 f78cd9bc8b..f988a79065 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.Collections; 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 017fd56a5e..5ce4fbd51f 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 @@ package org.hibernate.dialect.function; 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 6e409201da..1d2e9314ea 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 @@ package org.hibernate.dialect.function.array; 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 989c65419c..5195a79a41 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 @@ package org.hibernate.dialect.function.array; 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 45d31b1dda..d66d9315dc 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 @@ package org.hibernate.dialect.function.array; 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 8e7617bc4e..4185315608 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 java.util.List; 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 841849513a..6871aa6e28 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 java.util.List; 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 a83b168da4..6794494e22 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 java.util.List; 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 71e4c8e3ac..d43ad40311 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 @@ package org.hibernate.dialect.function.array; 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 63369bc58e..6c613d9f10 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 @@ package org.hibernate.dialect.function.array; 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 4dff3ad7e9..15a099ac44 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 @@ package org.hibernate.dialect.function.array; 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 b81ba52aa1..e98f05b3cf 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 @@ package org.hibernate.dialect.function.array; 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 020705ce7f..840eff3ae1 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 @@ package org.hibernate.dialect.function.array; 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 e52020754b..54fa476bfd 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 @@ package org.hibernate.dialect.function.array; 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 226af1836f..38b4aff727 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 @@ package org.hibernate.dialect.function.array; 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 a04538fe0d..16d3429908 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 @@ package org.hibernate.dialect.function.array; 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 f364c1718f..e4c41d3f2e 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 @@ package org.hibernate.dialect.function.array; 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 007938fe02..59da1e4873 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 @@ package org.hibernate.dialect.function.array; 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 24c8425b77..f3a7beaf5f 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 java.util.function.Supplier; 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 321504fce7..486c1dfa8b 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 java.util.function.Supplier; 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 9f226ca9ff..c6a1ea52aa 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 @@ package org.hibernate.dialect.function.array; 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 b4d1a6a735..c4beb0c99c 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.engine.jdbc.Size; 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 0944a7bf75..29b1ee8150 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 java.util.function.Supplier; 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 feaeb84b30..4c0d7e55a7 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 java.util.List; 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 8a60bff964..4e022c1a29 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 @@ package org.hibernate.dialect.function.array; 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 28d44f9f1b..724fb93e7f 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 @@ package org.hibernate.dialect.function.array; 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 24be083e37..c5306f9ca8 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 @@ package org.hibernate.dialect.function.array; 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 628cfe15f3..57b8a75f44 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 @@ package org.hibernate.dialect.function.array; 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 e71815f006..eefa7e6cd9 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 @@ package org.hibernate.dialect.function.array; 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 720ca76615..93c3216319 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 @@ package org.hibernate.dialect.function.array; 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 d8b7e32d1b..14ea342250 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 @@ package org.hibernate.dialect.function.array; 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 987cb9ce3d..13750e8856 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 @@ package org.hibernate.dialect.function.array; 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 02008fed9f..2fc6c121bc 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 @@ package org.hibernate.dialect.function.array; 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 e46cf5526c..71f0cd442b 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 @@ package org.hibernate.dialect.function.array; 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 1c71ce9010..35f9b596f0 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 @@ package org.hibernate.dialect.function.array; 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 114edfedbe..4201b27654 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 @@ package org.hibernate.dialect.function.array; 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 171c269145..4a7df08054 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 @@ package org.hibernate.dialect.function.array; 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 c761170b83..e2f69846af 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 @@ package org.hibernate.dialect.function.array; 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 67073a1266..6b67510de6 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 @@ package org.hibernate.dialect.function.array; 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 5ff5a60b82..77d3b33d0c 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 @@ package org.hibernate.dialect.function.array; 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 8d24e63688..736d58a1a0 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 @@ package org.hibernate.dialect.function.array; 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 ff6422bc91..2f42642a4b 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.dialect.Dialect; 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 71ff6e0cd4..c7bef50e03 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 @@ package org.hibernate.dialect.function.array; 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 922d6d25c9..3dc18d7c37 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 @@ package org.hibernate.dialect.function.array; 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 4a4ec142b0..3d2c91b99b 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 @@ package org.hibernate.dialect.function.array; 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 b4898c2daf..257a687892 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 @@ package org.hibernate.dialect.function.array; 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 e8ef525c3b..efc583f35a 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 java.util.List; 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 4678ba67b9..49a4dbea3a 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 @@ package org.hibernate.dialect.function.array; 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 85d6120550..3ff970db98 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 @@ package org.hibernate.dialect.function.array; 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 44b76b1323..3beb0011a3 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 @@ package org.hibernate.dialect.function.array; 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 11a835e328..dc1557f550 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 @@ package org.hibernate.dialect.function.array; 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 65ca8e53dd..ed68e68765 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 @@ package org.hibernate.dialect.function.array; 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 82c65d27ae..e1e1100e0d 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 @@ package org.hibernate.dialect.function.array; 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 cc0ca1dea9..1459d82189 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 @@ package org.hibernate.dialect.function.array; 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 d48428135d..e1b9d2a647 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 @@ package org.hibernate.dialect.function.array; 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 15e5f658c2..f767deefc7 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 @@ package org.hibernate.dialect.function.array; 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 5edd7c85e9..5e579fd114 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 @@ package org.hibernate.dialect.function.array; 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 1d2caef883..3692539125 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 @@ package org.hibernate.dialect.function.array; 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 4fbca51767..d017466f68 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 @@ package org.hibernate.dialect.function.array; 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 5e69b13de8..3ae926edee 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 @@ package org.hibernate.dialect.function.array; 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 15e72dc58a..233f0989ad 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 @@ package org.hibernate.dialect.function.array; 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 cf87901d31..1e1e126209 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 java.util.List; 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 5462041435..bb70dc7f0e 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 @@ package org.hibernate.dialect.function.array; 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 a35c014c23..c9d4fb3198 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 @@ package org.hibernate.dialect.function.array; 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 d222afc524..284284fc9e 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 @@ package org.hibernate.dialect.function.array; 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 8d0dde8dda..b5f0f0eff2 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 @@ package org.hibernate.dialect.function.array; 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 77fe4ec32f..e151a0deae 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 @@ package org.hibernate.dialect.function.array; 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 0aff08a94d..ea7bced441 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 @@ package org.hibernate.dialect.function.array; 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 1f272558b1..27f57ff9bf 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.List; 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 5756aaf194..0347ba814a 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 java.util.List; 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 512059172a..74508755b5 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 java.util.List; 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 a900f6b25c..8570c81f9d 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 java.util.List; 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 a90db6cb36..d917facd1d 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 java.util.List; 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 a1267fdddf..7411cf19e1 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 @@ package org.hibernate.dialect.function.json; 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 52f69b2f7a..6aae2f858f 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 @@ package org.hibernate.dialect.function.json; 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 249d7eac9e..54dde1a4b3 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 @@ package org.hibernate.dialect.function.json; 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 d37fead1cc..4e621dd529 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 2f1f9986fb..c550056f82 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 @@ package org.hibernate.dialect.function.json; 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 0d66bfb030..315d868761 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.JdbcMappingContainer; 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 c1add5bbae..b33b75ee06 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 java.util.List; 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 a74eb72b7d..fe661c3251 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 java.util.List; 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 379ac10e50..e603846c3b 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 @@ package org.hibernate.dialect.function.json; 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 78c8372341..74c2ffff3b 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 202a844f54..1ad913ac43 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 @@ package org.hibernate.dialect.function.json; 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 3a60ffea5d..b8313a106d 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.ArrayList; 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 2fb7f3114d..7258434c2a 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.dialect.Dialect; 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 7d75302a88..a6beffed19 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.Collections; 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 9f7e20501b..518c133ad1 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 @@ package org.hibernate.dialect.function.json; 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 ca1bc08da4..1dd6c83a82 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.Iterator; 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 fb2e0025fc..72243bf6cc 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 @@ package org.hibernate.dialect.function.json; 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 5101655f2e..19646ffaea 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 @@ package org.hibernate.dialect.function.json; 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 0665aa7df8..0ad2ede42b 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.Iterator; 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 449751c277..64f2bea640 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.Iterator; 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 7e5a8b64e0..cf872ddb78 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 @@ package org.hibernate.dialect.function.json; 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 31ea28be99..b4f78449cd 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 @@ package org.hibernate.dialect.function.json; 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 fb8c03c1f8..8aa647851e 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 @@ package org.hibernate.dialect.function.json; 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 83849d7ab1..befe07291a 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 d1ccd0f2ae..2411908cc6 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 c00a154aa6..5710659633 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 @@ package org.hibernate.dialect.function.json; 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 daa669c18c..fc00aea599 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 @@ package org.hibernate.dialect.function.json; 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 cb76a1a690..8a204ef8e8 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 e4c74788a0..071ff705fc 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 8c9f95551d..879f822c8a 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 @@ package org.hibernate.dialect.function.json; 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 5a4240dbd3..eba34fc4f0 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 8f59190685..ad4ef1e4f9 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 9cb55cc795..69c7eb961a 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 java.util.List; 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 bfd38c1080..c0ef84f192 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 @@ package org.hibernate.dialect.function.json; 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 987c2c1059..1818e786c3 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.checkerframework.checker.nullness.qual.Nullable; 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 dbb1045aef..52ac449566 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 @@ package org.hibernate.dialect.function.json; 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 50d677a310..edb29a5b3e 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 @@ package org.hibernate.dialect.function.json; 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 2aae5e7923..8ff72e7857 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 @@ package org.hibernate.dialect.function.json; 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 4e505a5602..fd06e279cf 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 java.util.List; 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 75f9db2a51..5323fbaf4b 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 java.util.List; 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 b6dabfea32..f44ee9a045 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 @@ package org.hibernate.dialect.function.json; 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 872a28ee4f..a0002bf8fd 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 @@ package org.hibernate.dialect.function.json; 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 f60debdae6..3f90291449 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 @@ package org.hibernate.dialect.function.json; 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 49dc738153..502fa52ac6 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 @@ package org.hibernate.dialect.function.json; 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 88758f0667..bb2f6a013b 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 @@ package org.hibernate.dialect.function.json; 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 7448e42ec4..c01a07a2b5 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 java.util.List; 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 57df67b8ad..896c348559 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 @@ package org.hibernate.dialect.function.json; 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 1a5c987eb6..675ce6fa0b 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 java.util.List; 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 29c1051d50..46fe494a6c 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 java.util.Map; 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 3935f8a92b..9a9135f4e4 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 java.util.List; 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 d066a97124..d3177615b2 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 @@ package org.hibernate.dialect.function.json; 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 4f47ee875d..6c8e3e1c93 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 48ede18e2f..e0c7c85ecc 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 @@ package org.hibernate.dialect.function.json; 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 1df0d6c267..43984f13f0 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 java.util.Map; 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 b1ce489798..aaf146067f 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 java.util.List; 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 651ec2f28e..8eb7637189 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 java.util.List; 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 03728540f9..220da2dabb 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 java.util.List; 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 bdedd46ef5..f47e6aa5b3 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 java.util.Map; 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 6cd3e0daa4..f684628fd3 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 @@ package org.hibernate.dialect.function.json; 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 5ceb03b547..e85dfae21a 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 @@ package org.hibernate.dialect.function.json; 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 4c0d1334f5..9e5f9c6a19 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 @@ package org.hibernate.dialect.function.json; 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 d29a69a3e1..d155ceb600 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 @@ package org.hibernate.dialect.function.json; 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 f54f553f72..98d7bdd712 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 @@ package org.hibernate.dialect.function.json; 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 eb145a1f23..b13dc65464 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 @@ package org.hibernate.dialect.function.json; 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 71b5a5024a..fb7b1bf173 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 40b349f683..96a2c9ded6 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 @@ package org.hibernate.dialect.function.json; 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 74d3494ef0..6d9d834024 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 @@ package org.hibernate.dialect.function.json; 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 b1f745bf61..9a882d1846 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 @@ package org.hibernate.dialect.function.json; 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 4a6bab1183..f51b361f85 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 @@ package org.hibernate.dialect.function.json; 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 ac2aef859a..cb8e94e6c7 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 @@ package org.hibernate.dialect.function.json; 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 e243469122..6d97b78dc0 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 e742830936..631113eb55 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 @@ package org.hibernate.dialect.function.xml; 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 a293a0a7c5..51385f6415 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 @@ package org.hibernate.dialect.function.xml; 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 167b8071d2..f45e073561 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 @@ package org.hibernate.dialect.function.xml; 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 34250555fc..177c0d013b 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 @@ package org.hibernate.dialect.function.xml; 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 8210a4cd9f..4ecd3af213 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 @@ package org.hibernate.dialect.function.xml; 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 b3931a5da9..2ece2c4e5c 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 @@ package org.hibernate.dialect.function.xml; 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 733b634686..cfc0fc02ad 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 @@ package org.hibernate.dialect.function.xml; 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 938d4393bc..01e191228a 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.List; 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 150a7aaa59..f7e5f977e3 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 @@ package org.hibernate.dialect.function.xml; 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 44dcca1898..5568eb018c 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 @@ package org.hibernate.dialect.function.xml; 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 2cbbecf8f8..258bd8c9a5 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 @@ package org.hibernate.dialect.function.xml; 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 742582db2d..44975a6ad0 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 @@ package org.hibernate.dialect.function.xml; 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 e56e705849..0e00061e62 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 @@ package org.hibernate.dialect.function.xml; 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 82f332fadd..41c9691390 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 @@ package org.hibernate.dialect.function.xml; 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 0b2c35d8da..c280e34ad5 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.Collections; 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 2e0ef74b83..4096ad19ae 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 @@ package org.hibernate.dialect.function.xml; 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 83f7332fe0..f4fb281ffb 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.List; 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 080c34e991..5408f3d5d3 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 @@ package org.hibernate.dialect.function.xml; 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 32a1142890..786784b3cf 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 @@ package org.hibernate.dialect.function.xml; 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 813c1a8cac..b4e20e2674 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 @@ package org.hibernate.dialect.function.xml; 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 a53a0f47f5..b618195a4f 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 @@ package org.hibernate.dialect.function.xml; 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 3595390812..a9d9fc6b63 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 java.util.List; 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 f91916e93f..e9a6ac0fed 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 java.util.Objects; 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 @@ import org.hibernate.query.sqm.SqmExpressible; * @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 9ae39e17b7..ede1ee3bb7 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 759bd242c5..944fe4aaef 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 117bd93201..2d490ba7e4 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 @@ package org.hibernate.metamodel.model.domain.internal; 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 e57accc3d2..4d7683a10f 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.UnsupportedMappingException; 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 09cfb628b7..1b9a68cf2f 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 @@ package org.hibernate.metamodel.model.domain.internal; 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 2eb3fca9d0..d322253c64 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 @@ import org.hibernate.Incubating; 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 4c76445f8f..2dd1fa6037 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.DomainType; 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 0fec7138a9..50d8afc949 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 @@ package org.hibernate.query.sqm.function; 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 0b7dfbea14..3c223048cc 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 55eac8ef12..bb512c64f2 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 @@ package org.hibernate.query.sqm.function; 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 2ee63693b3..af874d0844 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 bb5afbb536..92b7fa0467 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 63bd3b3c22..f5fe737b83 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 ecdee92031..493ba48489 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 ecc21666d8..8ae818c54b 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 java.util.List; 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 d0ef77eede..7ae8234ed8 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.JdbcMapping; 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 ced252e756..5e416033f9 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 java.util.List; 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 99dde026c2..f5a1326351 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 @@ package org.hibernate.query.sqm.function; 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 87bf489179..0c7bbaeb35 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 java.util.function.Supplier; 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 c41a9e4ef1..8f52ba799f 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.ArrayList; 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 b30dc3882b..edaab1ed45 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 @@ package org.hibernate.query.sqm.function; 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 e22e828662..29a19565e1 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 java.util.List; 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 926b9ec812..ddd3136f82 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 33d639f7d1..ba9a2a9c7b 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.BindableType; 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 3ddc1c933d..7002b9de4b 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 @@ package org.hibernate.query.sqm.produce.function; 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 6fe0c0f562..0ea8a665a8 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.Internal; 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 fea924ee63..b390356235 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.EntityNameUse; 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 20ff1f4b32..cc8301ecc4 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 @@ package org.hibernate.query.sqm.tree.domain; 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 798222c1c6..2637972163 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 java.util.List; 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 14c564ff30..d4620ed2cb 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 java.util.Map; 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 4dfbe60119..9a9e0f9613 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 824e076b87..d3988ed00f 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 07a900be38..a848a25b0f 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 jakarta.persistence.criteria.Predicate; 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 a72c7c8eae..92b7b0785d 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 d39f8704a1..2cc09575f1 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.List; 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 0acaaef3ff..3f2b16d7db 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.List; 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 1122ae5d3a..695a87b247 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.List; 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 e5e06077f0..6bdb0ccf25 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 1baf9bdb9f..8e7daf2104 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.Arrays; 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 12e8ce9d11..9ed7aacd39 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.metamodel.mapping.SqlTypedMapping; 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 650690225c..efe2bc22d8 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.mapping.BasicValuedMapping; 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 2f30c97b3c..f49146a203 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.dialect.function.TrimFunction; 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 26c4ba4509..44f1f75803 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 java.util.List; 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 c7f6480c47..f787f3adec 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.PluralAttributeMapping; 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 df34a304bb..9bd2ac76c1 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 @@ package org.hibernate.spatial.dialect.oracle; 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 39381559ff..e624d3b182 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 @@ package org.hibernate.spatial.dialect.oracle; 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 174df1fc49..68da9f3658 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 @@ package org.hibernate.spatial.dialect.oracle; 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 013a097f2a..465ffd1738 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 @@ package org.hibernate.spatial.dialect.oracle; 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 574f47e11f..7e8538b928 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 @@ package org.hibernate.spatial.dialect.oracle; 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 7084bfc126..aa3d7c848c 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 @@ package org.hibernate.spatial.dialect.oracle; 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 bb69420433..871fe29967 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 @@ package org.hibernate.spatial.dialect.postgis; 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 e48d897e84..53b2a5de0c 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 @@ package org.hibernate.spatial.dialect.sqlserver; 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;