From 7444b26db4572902844ffb816f356a91a4b6596a Mon Sep 17 00:00:00 2001 From: Gavin Date: Wed, 11 Jan 2023 17:10:20 +0100 Subject: [PATCH] HHH-15948 move org.hibernate.metamodel.model.convert to org.hibernate.type.descriptor.converter --- .../bitset/BitSetConverterImmutableTests.java | 4 +-- .../BitSetConverterMutabilityTests.java | 4 +-- .../basic/bitset/BitSetConverterTests.java | 5 ++-- .../hibernate/boot/model/TypeDefinition.java | 2 +- .../internal/AbstractConverterDescriptor.java | 4 +-- .../boot/model/convert/package-info.java | 2 +- .../convert/spi/ConverterDescriptor.java | 2 +- .../convert/spi/RegisteredConversion.java | 4 +-- .../boot/model/internal/AnnotationBinder.java | 2 +- .../internal/EnumeratedValueResolution.java | 2 +- .../InferredBasicValueResolution.java | 2 +- .../internal/InferredBasicValueResolver.java | 5 ++-- .../internal/NamedBasicTypeResolution.java | 2 +- .../internal/NamedConverterResolution.java | 4 +-- .../process/internal/UserTypeResolution.java | 2 +- .../process/internal/VersionResolution.java | 2 +- .../org/hibernate/mapping/BasicValue.java | 2 +- .../org/hibernate/mapping/SimpleValue.java | 2 +- .../metamodel/mapping/JdbcMapping.java | 2 +- .../metamodel/model/convert/package-info.java | 23 --------------- .../model/convert/spi/package-info.java | 16 ----------- .../internal/AnyDiscriminatorConverter.java | 2 +- .../persister/entity/DiscriminatorType.java | 2 +- ...leteResultBuilderBasicValuedConverted.java | 2 +- .../DynamicResultBuilderBasicConverted.java | 5 ++-- .../DynamicResultBuilderBasicStandard.java | 2 +- ...SelfRenderingFunctionSqlAstExpression.java | 2 +- .../hibernate/query/sqm/internal/SqmUtil.java | 2 +- .../sqm/sql/BaseSqmToSqlAstConverter.java | 4 +-- .../internal/SqmParameterInterpretation.java | 2 +- .../sql/results/graph/basic/BasicFetch.java | 2 +- .../sql/results/graph/basic/BasicResult.java | 2 +- .../graph/basic/BasicResultAssembler.java | 2 +- .../org/hibernate/type/BasicArrayType.java | 2 +- .../java/org/hibernate/type/BasicType.java | 2 +- .../hibernate/type/BasicTypeReference.java | 2 +- .../org/hibernate/type/BasicTypeRegistry.java | 2 +- .../hibernate/type/CharBooleanConverter.java | 2 +- .../hibernate/type/ConvertedBasicType.java | 2 +- .../java/org/hibernate/type/CustomType.java | 2 +- .../java/org/hibernate/type/EnumType.java | 8 +++--- .../type/NumericBooleanConverter.java | 2 +- .../AttributeConverterMutabilityPlanImpl.java | 14 +++------- .../converter}/internal/EnumHelper.java | 2 +- .../internal/JpaAttributeConverterImpl.java | 7 ++--- .../internal/NamedEnumValueConverter.java | 6 ++-- .../internal/OrdinalEnumValueConverter.java | 7 ++--- .../converter}/internal/package-info.java | 4 +-- .../descriptor/converter/package-info.java | 20 +++++++++++-- .../converter}/spi/BasicValueConverter.java | 2 +- .../converter}/spi/EnumValueConverter.java | 2 +- .../converter}/spi/JpaAttributeConverter.java | 2 +- .../converter/spi/package-info.java | 28 +++++++++++++++++++ .../type/internal/ConvertedBasicTypeImpl.java | 2 +- ...ustomMutabilityConvertedBasicTypeImpl.java | 2 +- .../internal/UserTypeJavaTypeWrapper.java | 2 +- .../java/org/hibernate/type/package-info.java | 4 +-- .../usertype/StaticUserTypeSupport.java | 2 +- .../java/org/hibernate/usertype/UserType.java | 2 +- .../basics/EnumResolutionTests.java | 8 +++--- .../orm/test/mapping/SmokeTests.java | 10 +++---- .../BasicJodaTimeConversionTest.java | 2 +- .../converter/ExplicitDateConvertersTest.java | 2 +- .../converter/ExplicitEnumConvertersTest.java | 2 +- .../SimpleConvertAnnotationTest.java | 2 +- .../SimpleConvertsAnnotationTest.java | 2 +- .../converter/SimpleXmlOverriddenTest.java | 2 +- ...XmlWithExplicitConvertAnnotationsTest.java | 2 +- ...edAttributeConverterParameterTypeTest.java | 2 +- .../enums/TestEnumTypeSerialization.java | 4 +-- .../sql/NativeQueryResultBuilderTests.java | 4 +-- .../orm/test/sql/ast/SmokeTests.java | 6 ++-- .../orm/test/type/contributor/ArrayType.java | 2 +- .../converter/GeometryConverterTest.java | 2 +- 74 files changed, 151 insertions(+), 155 deletions(-) delete mode 100644 hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/package-info.java delete mode 100644 hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/package-info.java rename hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/{ => internal}/AttributeConverterMutabilityPlanImpl.java (88%) rename hibernate-core/src/main/java/org/hibernate/{metamodel/model/convert => type/descriptor/converter}/internal/EnumHelper.java (90%) rename hibernate-core/src/main/java/org/hibernate/{metamodel/model/convert => type/descriptor/converter}/internal/JpaAttributeConverterImpl.java (95%) rename hibernate-core/src/main/java/org/hibernate/{metamodel/model/convert => type/descriptor/converter}/internal/NamedEnumValueConverter.java (91%) rename hibernate-core/src/main/java/org/hibernate/{metamodel/model/convert => type/descriptor/converter}/internal/OrdinalEnumValueConverter.java (89%) rename hibernate-core/src/main/java/org/hibernate/{metamodel/model/convert => type/descriptor/converter}/internal/package-info.java (72%) rename hibernate-core/src/main/java/org/hibernate/{metamodel/model/convert => type/descriptor/converter}/spi/BasicValueConverter.java (97%) rename hibernate-core/src/main/java/org/hibernate/{metamodel/model/convert => type/descriptor/converter}/spi/EnumValueConverter.java (92%) rename hibernate-core/src/main/java/org/hibernate/{metamodel/model/convert => type/descriptor/converter}/spi/JpaAttributeConverter.java (93%) create mode 100644 hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/spi/package-info.java diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/bitset/BitSetConverterImmutableTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/bitset/BitSetConverterImmutableTests.java index 150621037d..30d53cfaf8 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/bitset/BitSetConverterImmutableTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/bitset/BitSetConverterImmutableTests.java @@ -19,8 +19,8 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; -import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import org.hibernate.metamodel.spi.MappingMetamodelImplementor; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.descriptor.java.ImmutableMutabilityPlan; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/bitset/BitSetConverterMutabilityTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/bitset/BitSetConverterMutabilityTests.java index 9f0f46ffc4..537b34ce6e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/bitset/BitSetConverterMutabilityTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/bitset/BitSetConverterMutabilityTests.java @@ -19,8 +19,8 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; -import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import org.hibernate.metamodel.spi.MappingMetamodelImplementor; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.internal.ConvertedBasicTypeImpl; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/bitset/BitSetConverterTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/bitset/BitSetConverterTests.java index 4f15f699cd..410cde20c6 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/bitset/BitSetConverterTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/bitset/BitSetConverterTests.java @@ -8,6 +8,7 @@ import java.sql.Types; import java.util.BitSet; + import jakarta.persistence.AttributeConverter; import jakarta.persistence.Convert; import jakarta.persistence.Converter; @@ -17,8 +18,8 @@ import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; -import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import org.hibernate.metamodel.spi.MappingMetamodelImplementor; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.internal.ConvertedBasicTypeImpl; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java index d37a08e1cb..6a57c36377 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java @@ -23,7 +23,7 @@ import org.hibernate.internal.util.collections.CollectionHelper; import org.hibernate.mapping.BasicValue; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.resource.beans.internal.Helper; import org.hibernate.resource.beans.spi.BeanInstanceProducer; import org.hibernate.resource.beans.spi.ManagedBean; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java index d931c5e286..401c9ac19d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java @@ -12,8 +12,8 @@ import org.hibernate.boot.model.convert.spi.AutoApplicableConverterDescriptor; import org.hibernate.boot.model.convert.spi.ConverterDescriptor; import org.hibernate.boot.model.convert.spi.JpaAttributeConverterCreationContext; -import org.hibernate.metamodel.model.convert.internal.JpaAttributeConverterImpl; -import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; +import org.hibernate.type.descriptor.converter.internal.JpaAttributeConverterImpl; +import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import org.hibernate.resource.beans.spi.ManagedBean; import org.hibernate.type.descriptor.java.JavaType; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/package-info.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/package-info.java index f30ede2e4c..75d9f02980 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/package-info.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/package-info.java @@ -19,7 +19,7 @@ * and {@link org.hibernate.boot.model.convert.spi.ConverterAutoApplyHandler}. *

* The runtime piece is defined by - * {@link org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter}. + * {@link org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter}. * The bridge from boot-time to runtime is defined by * {@link org.hibernate.boot.model.convert.spi.ConverterDescriptor#createJpaAttributeConverter}. * This process also incorporates integration with diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterDescriptor.java index cf38a4142c..48e9b3a6a8 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterDescriptor.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.model.convert.spi; -import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; +import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import com.fasterxml.classmate.ResolvedType; import jakarta.persistence.AttributeConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/RegisteredConversion.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/RegisteredConversion.java index 6e8ff83d90..deea710523 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/RegisteredConversion.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/RegisteredConversion.java @@ -13,8 +13,8 @@ import org.hibernate.boot.model.convert.internal.AutoApplicableConverterDescriptorStandardImpl; import org.hibernate.boot.model.convert.internal.ConverterHelper; import org.hibernate.boot.spi.MetadataBuildingContext; -import org.hibernate.metamodel.model.convert.internal.JpaAttributeConverterImpl; -import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; +import org.hibernate.type.descriptor.converter.internal.JpaAttributeConverterImpl; +import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import org.hibernate.resource.beans.spi.ManagedBean; import org.hibernate.type.descriptor.java.spi.JavaTypeRegistry; import org.hibernate.type.spi.TypeConfiguration; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java index 41f526a8b8..ab2d437cc3 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java @@ -37,7 +37,7 @@ import org.hibernate.internal.util.GenericsHelper; import org.hibernate.internal.util.StringHelper; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.metamodel.model.convert.internal.JpaAttributeConverterImpl; +import org.hibernate.type.descriptor.converter.internal.JpaAttributeConverterImpl; import org.hibernate.resource.beans.spi.ManagedBean; import org.hibernate.resource.beans.spi.ManagedBeanRegistry; import org.hibernate.type.BasicType; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/EnumeratedValueResolution.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/EnumeratedValueResolution.java index 93a7cabe2c..559ce0df04 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/EnumeratedValueResolution.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/EnumeratedValueResolution.java @@ -8,7 +8,7 @@ import org.hibernate.mapping.BasicValue; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.metamodel.model.convert.spi.EnumValueConverter; +import org.hibernate.type.descriptor.converter.spi.EnumValueConverter; import org.hibernate.type.BasicType; import org.hibernate.type.CustomType; import org.hibernate.type.descriptor.java.ImmutableMutabilityPlan; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolution.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolution.java index 9b9ed6e89c..edade44f0d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolution.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolution.java @@ -8,7 +8,7 @@ import org.hibernate.mapping.BasicValue; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.type.BasicType; import org.hibernate.type.descriptor.java.JavaType; import org.hibernate.type.descriptor.java.MutabilityPlan; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java index 75c22c9e63..6a0b2a3081 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java @@ -9,6 +9,7 @@ import java.io.Serializable; import java.lang.reflect.Type; import java.util.function.Supplier; + import jakarta.persistence.EnumType; import jakarta.persistence.TemporalType; @@ -18,8 +19,8 @@ import org.hibernate.mapping.Column; import org.hibernate.mapping.Selectable; import org.hibernate.mapping.Table; -import org.hibernate.metamodel.model.convert.internal.NamedEnumValueConverter; -import org.hibernate.metamodel.model.convert.internal.OrdinalEnumValueConverter; +import org.hibernate.type.descriptor.converter.internal.NamedEnumValueConverter; +import org.hibernate.type.descriptor.converter.internal.OrdinalEnumValueConverter; import org.hibernate.tool.schema.extract.spi.ColumnTypeInformation; import org.hibernate.type.AdjustableBasicType; import org.hibernate.type.BasicType; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedBasicTypeResolution.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedBasicTypeResolution.java index 028efb20c0..4d8bd215fe 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedBasicTypeResolution.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedBasicTypeResolution.java @@ -11,7 +11,7 @@ import org.hibernate.boot.spi.MetadataBuildingContext; import org.hibernate.mapping.BasicValue; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.type.BasicType; import org.hibernate.type.descriptor.java.JavaType; import org.hibernate.type.descriptor.java.MutabilityPlan; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedConverterResolution.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedConverterResolution.java index f28b84f80e..e423fe78fc 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedConverterResolution.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedConverterResolution.java @@ -15,9 +15,9 @@ import org.hibernate.boot.spi.MetadataBuildingContext; import org.hibernate.mapping.BasicValue; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; +import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import org.hibernate.type.BasicType; -import org.hibernate.type.descriptor.converter.AttributeConverterMutabilityPlanImpl; +import org.hibernate.type.descriptor.converter.internal.AttributeConverterMutabilityPlanImpl; import org.hibernate.type.descriptor.java.BasicJavaType; import org.hibernate.type.descriptor.java.ImmutableMutabilityPlan; import org.hibernate.type.descriptor.java.JavaType; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/UserTypeResolution.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/UserTypeResolution.java index 2e650188b0..6c710ac57b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/UserTypeResolution.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/UserTypeResolution.java @@ -10,7 +10,7 @@ import org.hibernate.mapping.BasicValue; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.type.BasicType; import org.hibernate.type.CustomType; import org.hibernate.type.descriptor.java.JavaType; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java index b653155620..0836958299 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java @@ -15,7 +15,7 @@ import org.hibernate.dialect.Dialect; import org.hibernate.mapping.BasicValue; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.type.BasicType; import org.hibernate.type.descriptor.java.BasicJavaType; import org.hibernate.type.descriptor.java.ImmutableMutabilityPlan; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java index 600ccd5892..fba37bd767 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java @@ -38,7 +38,7 @@ import org.hibernate.internal.util.collections.CollectionHelper; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.SelectablePath; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.resource.beans.spi.BeanInstanceProducer; import org.hibernate.resource.beans.spi.ManagedBean; import org.hibernate.resource.beans.spi.ManagedBeanRegistry; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java index c9d8d90129..c880f1ce9f 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java @@ -46,7 +46,7 @@ import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.collections.ArrayHelper; -import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; +import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import org.hibernate.resource.beans.spi.ManagedBeanRegistry; import org.hibernate.service.ServiceRegistry; import org.hibernate.generator.Generator; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/JdbcMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/JdbcMapping.java index ddb853c727..d7f899a0ea 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/JdbcMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/JdbcMapping.java @@ -11,7 +11,7 @@ import org.hibernate.Incubating; import org.hibernate.internal.util.IndexedConsumer; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.query.sqm.CastType; import org.hibernate.type.descriptor.ValueBinder; import org.hibernate.type.descriptor.ValueExtractor; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/package-info.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/package-info.java deleted file mode 100644 index f077c3b20b..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html - */ - -/** - * Support for basic-typed value conversions. The main contract is - * {@link org.hibernate.metamodel.model.convert.spi.BasicValueConverter}. - *

- * All basic value conversions are defined by this package including: - *

- */ -@Incubating -package org.hibernate.metamodel.model.convert; - -import org.hibernate.Incubating; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/package-info.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/package-info.java deleted file mode 100644 index 175c04306b..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/package-info.java +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html - */ - -/** - * An SPI for basic-typed value conversions. - * - * @see org.hibernate.metamodel.model.convert.spi.BasicValueConverter - */ -@Incubating -package org.hibernate.metamodel.model.convert.spi; - -import org.hibernate.Incubating; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorConverter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorConverter.java index 692de1b4b3..6e05829f5f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorConverter.java @@ -8,7 +8,7 @@ import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.RepresentationMode; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.BasicType; import org.hibernate.type.MetaType; diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorType.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorType.java index f92703a367..2395761afc 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorType.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorType.java @@ -21,7 +21,7 @@ import org.hibernate.metamodel.RepresentationMode; import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping.DiscriminatorValueDetails; import org.hibernate.metamodel.mapping.EntityMappingType; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.metamodel.spi.MappingMetamodelImplementor; import org.hibernate.type.AbstractType; import org.hibernate.type.BasicType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicValuedConverted.java b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicValuedConverted.java index 2dbdb6227d..643e935d05 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicValuedConverted.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderBasicValuedConverted.java @@ -11,7 +11,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.BasicValuedMapping; -import org.hibernate.metamodel.model.convert.internal.JpaAttributeConverterImpl; +import org.hibernate.type.descriptor.converter.internal.JpaAttributeConverterImpl; import org.hibernate.query.results.DomainResultCreationStateImpl; import org.hibernate.query.results.ResultBuilder; import org.hibernate.query.results.ResultsHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicConverted.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicConverted.java index 8d30e773c8..9df71ff35f 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicConverted.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicConverted.java @@ -8,12 +8,13 @@ import java.util.Objects; import java.util.function.BiFunction; + import jakarta.persistence.AttributeConverter; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.BasicValuedMapping; -import org.hibernate.metamodel.model.convert.internal.JpaAttributeConverterImpl; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.internal.JpaAttributeConverterImpl; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.query.results.ResultsHelper; import org.hibernate.query.results.ResultSetMappingSqlSelection; import org.hibernate.resource.beans.spi.ManagedBean; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicStandard.java b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicStandard.java index f6c64021fc..05a33090a1 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicResultBuilderBasicStandard.java @@ -10,7 +10,7 @@ import java.util.function.BiFunction; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.query.NativeQuery; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.BasicValuedMapping; 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 a6e65ce0f9..0c28806466 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 @@ -16,7 +16,7 @@ import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.JdbcMappingContainer; import org.hibernate.metamodel.mapping.SqlExpressible; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.query.ReturnableType; import org.hibernate.query.sqm.sql.internal.DomainResultProducer; import org.hibernate.sql.ast.SqlAstTranslator; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java index c89c3a288b..0570ad1afa 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java @@ -31,7 +31,7 @@ import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.MappingModelExpressible; import org.hibernate.metamodel.mapping.PluralAttributeMapping; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.query.IllegalQueryOperationException; import org.hibernate.query.IllegalSelectQueryException; import org.hibernate.spi.NavigablePath; 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 f54d6bfd45..891053695e 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 @@ -88,8 +88,8 @@ import org.hibernate.metamodel.mapping.internal.SqlTypedMappingImpl; import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping; import org.hibernate.metamodel.mapping.ordering.OrderByFragment; -import org.hibernate.metamodel.model.convert.internal.OrdinalEnumValueConverter; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.internal.OrdinalEnumValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.metamodel.model.domain.BasicDomainType; import org.hibernate.metamodel.model.domain.EmbeddableDomainType; import org.hibernate.metamodel.model.domain.EntityDomainType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqmParameterInterpretation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqmParameterInterpretation.java index da647c0e44..4f258ecd8a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqmParameterInterpretation.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqmParameterInterpretation.java @@ -16,7 +16,7 @@ import org.hibernate.metamodel.mapping.EntityValuedModelPart; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.MappingModelExpressible; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.query.BindableType; import org.hibernate.query.SemanticException; import org.hibernate.query.spi.QueryParameterBinding; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicFetch.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicFetch.java index 61faef2bd4..eca9b3c3fe 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicFetch.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicFetch.java @@ -8,7 +8,7 @@ import org.hibernate.engine.FetchTiming; import org.hibernate.metamodel.mapping.BasicValuedModelPart; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.spi.NavigablePath; import org.hibernate.sql.results.graph.AssemblerCreationState; import org.hibernate.sql.results.graph.UnfetchedBasicPartResultAssembler; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResult.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResult.java index ec6303b85f..46cfe41166 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResult.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResult.java @@ -8,7 +8,7 @@ import org.hibernate.Internal; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.spi.NavigablePath; import org.hibernate.sql.results.graph.AssemblerCreationState; import org.hibernate.sql.results.graph.DomainResult; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResultAssembler.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResultAssembler.java index 30c1bb38e1..a5f204cfba 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResultAssembler.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/basic/BasicResultAssembler.java @@ -10,7 +10,7 @@ import org.hibernate.HibernateException; import org.hibernate.Internal; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.results.ResultsLogger; import org.hibernate.sql.results.graph.DomainResultAssembler; diff --git a/hibernate-core/src/main/java/org/hibernate/type/BasicArrayType.java b/hibernate-core/src/main/java/org/hibernate/type/BasicArrayType.java index 5650195791..f26d972f40 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/BasicArrayType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/BasicArrayType.java @@ -12,7 +12,7 @@ import java.sql.ResultSet; import java.sql.SQLException; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.type.descriptor.ValueBinder; import org.hibernate.type.descriptor.ValueExtractor; import org.hibernate.type.descriptor.WrapperOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/type/BasicType.java b/hibernate-core/src/main/java/org/hibernate/type/BasicType.java index 9865edd319..b09be1a425 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/BasicType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/BasicType.java @@ -16,7 +16,7 @@ import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.MappingType; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.metamodel.model.domain.BasicDomainType; import org.hibernate.type.descriptor.ValueBinder; import org.hibernate.type.descriptor.ValueExtractor; diff --git a/hibernate-core/src/main/java/org/hibernate/type/BasicTypeReference.java b/hibernate-core/src/main/java/org/hibernate/type/BasicTypeReference.java index f6c9630885..fe53a7c815 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/BasicTypeReference.java +++ b/hibernate-core/src/main/java/org/hibernate/type/BasicTypeReference.java @@ -9,7 +9,7 @@ import java.io.Serializable; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.query.BindableType; import org.hibernate.query.sqm.SqmExpressible; diff --git a/hibernate-core/src/main/java/org/hibernate/type/BasicTypeRegistry.java b/hibernate-core/src/main/java/org/hibernate/type/BasicTypeRegistry.java index 4714af64f3..6ab3a6fd53 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/BasicTypeRegistry.java +++ b/hibernate-core/src/main/java/org/hibernate/type/BasicTypeRegistry.java @@ -16,7 +16,7 @@ import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.collections.CollectionHelper; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.type.descriptor.java.ImmutableMutabilityPlan; import org.hibernate.type.descriptor.java.JavaType; import org.hibernate.type.descriptor.jdbc.JdbcType; diff --git a/hibernate-core/src/main/java/org/hibernate/type/CharBooleanConverter.java b/hibernate-core/src/main/java/org/hibernate/type/CharBooleanConverter.java index 4bb5348e27..bbbf3c5ff4 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/CharBooleanConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/type/CharBooleanConverter.java @@ -8,7 +8,7 @@ import jakarta.persistence.AttributeConverter; import org.hibernate.dialect.Dialect; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.type.descriptor.java.BooleanJavaType; import org.hibernate.type.descriptor.java.CharacterJavaType; import org.hibernate.type.descriptor.java.JavaType; diff --git a/hibernate-core/src/main/java/org/hibernate/type/ConvertedBasicType.java b/hibernate-core/src/main/java/org/hibernate/type/ConvertedBasicType.java index 91da5496ad..9a78530006 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/ConvertedBasicType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/ConvertedBasicType.java @@ -6,7 +6,7 @@ */ package org.hibernate.type; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; /** * Extension for implementations of {@link BasicType} which have an implied diff --git a/hibernate-core/src/main/java/org/hibernate/type/CustomType.java b/hibernate-core/src/main/java/org/hibernate/type/CustomType.java index b19fe2d859..c3561d6ea2 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/CustomType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/CustomType.java @@ -19,7 +19,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.internal.util.collections.ArrayHelper; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.type.descriptor.ValueBinder; import org.hibernate.type.descriptor.ValueExtractor; import org.hibernate.type.descriptor.java.JavaType; diff --git a/hibernate-core/src/main/java/org/hibernate/type/EnumType.java b/hibernate-core/src/main/java/org/hibernate/type/EnumType.java index c89e6f9ef8..9700341ebb 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/EnumType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/EnumType.java @@ -25,10 +25,10 @@ import org.hibernate.internal.CoreLogging; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.config.ConfigurationHelper; -import org.hibernate.metamodel.model.convert.internal.NamedEnumValueConverter; -import org.hibernate.metamodel.model.convert.internal.OrdinalEnumValueConverter; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; -import org.hibernate.metamodel.model.convert.spi.EnumValueConverter; +import org.hibernate.type.descriptor.converter.internal.NamedEnumValueConverter; +import org.hibernate.type.descriptor.converter.internal.OrdinalEnumValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.EnumValueConverter; import org.hibernate.type.descriptor.ValueBinder; import org.hibernate.type.descriptor.ValueExtractor; import org.hibernate.type.descriptor.java.EnumJavaType; diff --git a/hibernate-core/src/main/java/org/hibernate/type/NumericBooleanConverter.java b/hibernate-core/src/main/java/org/hibernate/type/NumericBooleanConverter.java index 7ccfae7903..8e20d0bd70 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/NumericBooleanConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/type/NumericBooleanConverter.java @@ -7,7 +7,7 @@ package org.hibernate.type; import org.hibernate.dialect.Dialect; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.type.descriptor.java.BooleanJavaType; import org.hibernate.type.descriptor.java.IntegerJavaType; import org.hibernate.type.descriptor.java.JavaType; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/AttributeConverterMutabilityPlanImpl.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/AttributeConverterMutabilityPlanImpl.java similarity index 88% rename from hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/AttributeConverterMutabilityPlanImpl.java rename to hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/AttributeConverterMutabilityPlanImpl.java index 015149a01f..21706b073e 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/AttributeConverterMutabilityPlanImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/AttributeConverterMutabilityPlanImpl.java @@ -4,13 +4,13 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.type.descriptor.converter; +package org.hibernate.type.descriptor.converter.internal; import java.io.Serializable; import java.lang.reflect.Type; import org.hibernate.SharedSessionContract; -import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; +import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import org.hibernate.type.descriptor.java.MutableMutabilityPlan; import org.hibernate.type.spi.TypeConfiguration; @@ -64,17 +64,11 @@ protected T deepCopyNotNull(T value) { @Override public Serializable disassemble(T value, SharedSessionContract session) { - if ( mutable ) { - return (Serializable) converter.toRelationalValue( value ); - } - return (Serializable) value; + return mutable ? (Serializable) converter.toRelationalValue(value) : (Serializable) value; } @Override public T assemble(Serializable cached, SharedSessionContract session) { - if ( mutable ) { - return (T) converter.toDomainValue( cached ); - } - return (T) cached; + return mutable ? (T) converter.toDomainValue(cached) : (T) cached; } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/EnumHelper.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/EnumHelper.java similarity index 90% rename from hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/EnumHelper.java rename to hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/EnumHelper.java index 38a294d153..d7be94b2bc 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/EnumHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/EnumHelper.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ -package org.hibernate.metamodel.model.convert.internal; +package org.hibernate.type.descriptor.converter.internal; /** * @author Gavin King diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/JpaAttributeConverterImpl.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/JpaAttributeConverterImpl.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/JpaAttributeConverterImpl.java rename to hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/JpaAttributeConverterImpl.java index 4999a09f40..aee1b219f1 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/JpaAttributeConverterImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/JpaAttributeConverterImpl.java @@ -4,17 +4,16 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ -package org.hibernate.metamodel.model.convert.internal; +package org.hibernate.type.descriptor.converter.internal; import jakarta.persistence.AttributeConverter; import jakarta.persistence.PersistenceException; import org.hibernate.boot.model.convert.spi.JpaAttributeConverterCreationContext; import org.hibernate.dialect.Dialect; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; -import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import org.hibernate.resource.beans.spi.ManagedBean; -import org.hibernate.type.descriptor.converter.AttributeConverterMutabilityPlanImpl; import org.hibernate.type.descriptor.java.JavaType; import org.hibernate.type.descriptor.java.MutabilityPlan; import org.hibernate.type.descriptor.java.spi.JavaTypeRegistry; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/NamedEnumValueConverter.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/NamedEnumValueConverter.java similarity index 91% rename from hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/NamedEnumValueConverter.java rename to hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/NamedEnumValueConverter.java index 1de3d14e8d..b7cafb2025 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/NamedEnumValueConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/NamedEnumValueConverter.java @@ -4,19 +4,19 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ -package org.hibernate.metamodel.model.convert.internal; +package org.hibernate.type.descriptor.converter.internal; import java.io.Serializable; import java.util.Locale; import org.hibernate.dialect.Dialect; -import org.hibernate.metamodel.model.convert.spi.EnumValueConverter; +import org.hibernate.type.descriptor.converter.spi.EnumValueConverter; import org.hibernate.type.descriptor.java.EnumJavaType; import org.hibernate.type.descriptor.java.JavaType; import org.hibernate.type.descriptor.jdbc.JdbcType; import static java.util.Arrays.sort; -import static org.hibernate.metamodel.model.convert.internal.EnumHelper.getEnumeratedValues; +import static org.hibernate.type.descriptor.converter.internal.EnumHelper.getEnumeratedValues; /** * BasicValueConverter handling the conversion of an enum based on diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/OrdinalEnumValueConverter.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/OrdinalEnumValueConverter.java similarity index 89% rename from hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/OrdinalEnumValueConverter.java rename to hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/OrdinalEnumValueConverter.java index 3ee04d3372..96f3fb4c39 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/OrdinalEnumValueConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/OrdinalEnumValueConverter.java @@ -4,15 +4,12 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ -package org.hibernate.metamodel.model.convert.internal; +package org.hibernate.type.descriptor.converter.internal; -import java.io.IOException; -import java.io.ObjectInputStream; import java.io.Serializable; import org.hibernate.dialect.Dialect; -import org.hibernate.metamodel.model.convert.spi.EnumValueConverter; -import org.hibernate.type.descriptor.ValueBinder; +import org.hibernate.type.descriptor.converter.spi.EnumValueConverter; import org.hibernate.type.descriptor.java.EnumJavaType; import org.hibernate.type.descriptor.java.JavaType; import org.hibernate.type.descriptor.jdbc.JdbcType; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/package-info.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/package-info.java similarity index 72% rename from hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/package-info.java rename to hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/package-info.java index 5880f32aed..b7b69b804c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/package-info.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/internal/package-info.java @@ -8,9 +8,9 @@ /** * Implements the SPI for basic-typed value conversions. * - * @see org.hibernate.metamodel.model.convert.spi.BasicValueConverter + * @see org.hibernate.type.descriptor.converter.spi.BasicValueConverter */ @Incubating -package org.hibernate.metamodel.model.convert.internal; +package org.hibernate.type.descriptor.converter.internal; import org.hibernate.Incubating; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/package-info.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/package-info.java index 13d5d27c45..9c63284523 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/package-info.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/package-info.java @@ -6,9 +6,23 @@ */ /** - * Support for handling JPA {@link jakarta.persistence.AttributeConverter} - * instances as part of the Hibernate {@link org.hibernate.type.Type} system. + * Defines basic-typed value conversions, including support for handling JPA + * {@link jakarta.persistence.AttributeConverter} instances as part of the + * Hibernate {@link org.hibernate.type.Type} system. The main contract is + * {@link org.hibernate.type.descriptor.converter.spi.BasicValueConverter}. + *

+ * All basic value conversions are defined by this namespace, including: + *

* - * @see org.hibernate.type.descriptor.converter.AttributeConverterMutabilityPlanImpl + * @see org.hibernate.type.descriptor.converter.spi.BasicValueConverter */ +@Incubating package org.hibernate.type.descriptor.converter; + +import org.hibernate.Incubating; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/BasicValueConverter.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/spi/BasicValueConverter.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/BasicValueConverter.java rename to hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/spi/BasicValueConverter.java index b0bfce4581..183e0e54f1 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/BasicValueConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/spi/BasicValueConverter.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ -package org.hibernate.metamodel.model.convert.spi; +package org.hibernate.type.descriptor.converter.spi; import org.hibernate.Incubating; import org.hibernate.dialect.Dialect; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/EnumValueConverter.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/spi/EnumValueConverter.java similarity index 92% rename from hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/EnumValueConverter.java rename to hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/spi/EnumValueConverter.java index a388d8db7e..8d7c1dfc97 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/EnumValueConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/spi/EnumValueConverter.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ -package org.hibernate.metamodel.model.convert.spi; +package org.hibernate.type.descriptor.converter.spi; import org.hibernate.Incubating; import org.hibernate.type.descriptor.java.EnumJavaType; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/JpaAttributeConverter.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/spi/JpaAttributeConverter.java similarity index 93% rename from hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/JpaAttributeConverter.java rename to hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/spi/JpaAttributeConverter.java index d7c1938cee..0f623e7075 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/JpaAttributeConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/spi/JpaAttributeConverter.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ -package org.hibernate.metamodel.model.convert.spi; +package org.hibernate.type.descriptor.converter.spi; import jakarta.persistence.AttributeConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/spi/package-info.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/spi/package-info.java new file mode 100644 index 0000000000..901da9eccf --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/spi/package-info.java @@ -0,0 +1,28 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later + * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html + */ + +/** + * An SPI for basic-typed value conversions, including support for handling + * JPA {@link jakarta.persistence.AttributeConverter} instances as part of + * the Hibernate {@link org.hibernate.type.Type} system. + *

+ * The main contract is + * {@link org.hibernate.type.descriptor.converter.spi.BasicValueConverter}, + * with specializations: + *

+ * + * @see org.hibernate.type.descriptor.converter.spi.BasicValueConverter + */ +@Incubating +package org.hibernate.type.descriptor.converter.spi; + +import org.hibernate.Incubating; diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/ConvertedBasicTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/internal/ConvertedBasicTypeImpl.java index b63ab6c8dc..de5ed6ba65 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/internal/ConvertedBasicTypeImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/type/internal/ConvertedBasicTypeImpl.java @@ -23,7 +23,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.internal.util.collections.ArrayHelper; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.query.sqm.CastType; import org.hibernate.type.AdjustableBasicType; import org.hibernate.type.ConvertedBasicType; diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/CustomMutabilityConvertedBasicTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/type/internal/CustomMutabilityConvertedBasicTypeImpl.java index 7c84ad198d..e291993853 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/internal/CustomMutabilityConvertedBasicTypeImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/type/internal/CustomMutabilityConvertedBasicTypeImpl.java @@ -6,7 +6,7 @@ */ package org.hibernate.type.internal; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.type.descriptor.java.MutabilityPlan; import org.hibernate.type.descriptor.jdbc.JdbcType; diff --git a/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeJavaTypeWrapper.java b/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeJavaTypeWrapper.java index 0a2cb02b3a..108a8b2a58 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeJavaTypeWrapper.java +++ b/hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeJavaTypeWrapper.java @@ -12,7 +12,7 @@ import org.hibernate.SharedSessionContract; import org.hibernate.annotations.Immutable; import org.hibernate.dialect.Dialect; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.type.descriptor.WrapperOptions; import org.hibernate.type.descriptor.java.BasicJavaType; import org.hibernate.type.descriptor.java.ImmutableMutabilityPlan; diff --git a/hibernate-core/src/main/java/org/hibernate/type/package-info.java b/hibernate-core/src/main/java/org/hibernate/type/package-info.java index f78d720ab2..6b8df552b1 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/package-info.java +++ b/hibernate-core/src/main/java/org/hibernate/type/package-info.java @@ -22,7 +22,7 @@ * *

@@ -48,7 +48,7 @@ * This approach provides quite some flexibility in allowing a given Java type to * map to a range of JDBC types. However, when the built-in conversions don't handle * a particular mapping, a - * {@linkplain org.hibernate.metamodel.model.convert.spi.BasicValueConverter converter} + * {@linkplain org.hibernate.type.descriptor.converter.spi.BasicValueConverter converter} * may assist in the conversion process. For example, a JPA * {@link jakarta.persistence.AttributeConverter} might be provided. *

diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/StaticUserTypeSupport.java b/hibernate-core/src/main/java/org/hibernate/usertype/StaticUserTypeSupport.java index d13a7dee53..2f8515a1e5 100644 --- a/hibernate-core/src/main/java/org/hibernate/usertype/StaticUserTypeSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/usertype/StaticUserTypeSupport.java @@ -13,7 +13,7 @@ import org.hibernate.HibernateException; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.type.descriptor.ValueBinder; import org.hibernate.type.descriptor.ValueExtractor; import org.hibernate.type.descriptor.java.BasicJavaType; diff --git a/hibernate-core/src/main/java/org/hibernate/usertype/UserType.java b/hibernate-core/src/main/java/org/hibernate/usertype/UserType.java index b7d010d77b..703553d32f 100644 --- a/hibernate-core/src/main/java/org/hibernate/usertype/UserType.java +++ b/hibernate-core/src/main/java/org/hibernate/usertype/UserType.java @@ -16,7 +16,7 @@ import org.hibernate.engine.jdbc.Size; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.type.descriptor.jdbc.JdbcType; import org.hibernate.type.spi.TypeConfiguration; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/EnumResolutionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/EnumResolutionTests.java index a8bb0f4634..9da838f5bf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/EnumResolutionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/EnumResolutionTests.java @@ -20,10 +20,10 @@ import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.metamodel.model.convert.internal.NamedEnumValueConverter; -import org.hibernate.metamodel.model.convert.internal.OrdinalEnumValueConverter; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; -import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; +import org.hibernate.type.descriptor.converter.internal.NamedEnumValueConverter; +import org.hibernate.type.descriptor.converter.internal.OrdinalEnumValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import org.hibernate.type.BasicType; import org.hibernate.type.CustomType; import org.hibernate.type.EnumType; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SmokeTests.java index f0521baef5..8328a4bb82 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SmokeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SmokeTests.java @@ -25,11 +25,11 @@ import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping; import org.hibernate.metamodel.mapping.internal.EmbeddedAttributeMapping; import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping; -import org.hibernate.metamodel.model.convert.internal.NamedEnumValueConverter; -import org.hibernate.metamodel.model.convert.internal.OrdinalEnumValueConverter; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; -import org.hibernate.metamodel.model.convert.spi.EnumValueConverter; -import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; +import org.hibernate.type.descriptor.converter.internal.NamedEnumValueConverter; +import org.hibernate.type.descriptor.converter.internal.OrdinalEnumValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.EnumValueConverter; +import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.BasicType; import org.hibernate.type.CustomType; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/BasicJodaTimeConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/BasicJodaTimeConversionTest.java index 35120b7208..126f2261f2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/BasicJodaTimeConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/BasicJodaTimeConversionTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Id; import org.hibernate.Session; -import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; +import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.Type; import org.hibernate.type.internal.ConvertedBasicTypeImpl; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitDateConvertersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitDateConvertersTest.java index 0fafeaee5a..bfdfd61538 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitDateConvertersTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitDateConvertersTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Id; import org.hibernate.Session; -import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; +import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.Type; import org.hibernate.type.internal.ConvertedBasicTypeImpl; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitEnumConvertersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitEnumConvertersTest.java index 38962e0f27..4474f135dc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitEnumConvertersTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ExplicitEnumConvertersTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Id; import org.hibernate.Session; -import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; +import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.Type; import org.hibernate.type.internal.ConvertedBasicTypeImpl; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertAnnotationTest.java index 6c960f8698..01dbd0ceb2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertAnnotationTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.Id; import org.hibernate.Session; -import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; +import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.Type; import org.hibernate.type.internal.ConvertedBasicTypeImpl; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertsAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertsAnnotationTest.java index 6648b55c58..7fc451b15e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertsAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleConvertsAnnotationTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.Id; import org.hibernate.Session; -import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; +import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.Type; import org.hibernate.type.internal.ConvertedBasicTypeImpl; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleXmlOverriddenTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleXmlOverriddenTest.java index 950a94971c..8698e13d51 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleXmlOverriddenTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/SimpleXmlOverriddenTest.java @@ -17,7 +17,7 @@ import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.mapping.PersistentClass; -import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; +import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import org.hibernate.type.BasicType; import org.hibernate.type.Type; import org.hibernate.type.descriptor.java.StringJavaType; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/XmlWithExplicitConvertAnnotationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/XmlWithExplicitConvertAnnotationsTest.java index 79f097ccb3..ac16a502c5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/XmlWithExplicitConvertAnnotationsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/XmlWithExplicitConvertAnnotationsTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.PreUpdate; import org.hibernate.Session; -import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; +import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.Type; import org.hibernate.type.internal.ConvertedBasicTypeImpl; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/generics/ParameterizedAttributeConverterParameterTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/generics/ParameterizedAttributeConverterParameterTypeTest.java index fe78e5203b..e633852bde 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/generics/ParameterizedAttributeConverterParameterTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/generics/ParameterizedAttributeConverterParameterTypeTest.java @@ -20,7 +20,7 @@ import org.hibernate.internal.util.StringHelper; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; -import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; +import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import org.hibernate.type.internal.ConvertedBasicTypeImpl; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/TestEnumTypeSerialization.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/TestEnumTypeSerialization.java index e4b9a6987f..1da78391c5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/TestEnumTypeSerialization.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/TestEnumTypeSerialization.java @@ -7,8 +7,8 @@ package org.hibernate.orm.test.mapping.converted.enums; import org.hibernate.internal.util.SerializationHelper; -import org.hibernate.metamodel.model.convert.internal.NamedEnumValueConverter; -import org.hibernate.metamodel.model.convert.internal.OrdinalEnumValueConverter; +import org.hibernate.type.descriptor.converter.internal.NamedEnumValueConverter; +import org.hibernate.type.descriptor.converter.internal.OrdinalEnumValueConverter; import org.hibernate.type.EnumType; import org.hibernate.type.descriptor.java.EnumJavaType; import org.hibernate.type.descriptor.java.IntegerJavaType; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java index 8b44c615a4..120b9165ca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java @@ -20,8 +20,8 @@ import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; -import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import org.hibernate.query.sql.spi.NativeQueryImplementor; import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SmokeTests.java index 1299d98104..e56ee27b16 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SmokeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SmokeTests.java @@ -10,9 +10,9 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.metamodel.mapping.JdbcMappingContainer; -import org.hibernate.metamodel.model.convert.internal.OrdinalEnumValueConverter; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; -import org.hibernate.metamodel.model.convert.spi.EnumValueConverter; +import org.hibernate.type.descriptor.converter.internal.OrdinalEnumValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.EnumValueConverter; import org.hibernate.orm.test.mapping.SmokeTests.Gender; import org.hibernate.orm.test.mapping.SmokeTests.SimpleEntity; import org.hibernate.query.hql.spi.SqmQueryImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayType.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayType.java index 907123290e..aa481cdf92 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayType.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayType.java @@ -8,7 +8,7 @@ import org.hibernate.HibernateException; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; +import org.hibernate.type.descriptor.converter.spi.BasicValueConverter; import org.hibernate.query.BindableType; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.type.descriptor.java.BasicJavaType; diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/converter/GeometryConverterTest.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/converter/GeometryConverterTest.java index a6c62bf8d9..2d5cc42311 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/converter/GeometryConverterTest.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/testing/converter/GeometryConverterTest.java @@ -13,7 +13,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.H2Dialect; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; +import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.spatial.GeolatteGeometryJavaType; import org.hibernate.tool.schema.Action;