diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java index 8bc2eded1a33..5aeff4d511a3 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java @@ -29,7 +29,7 @@ import org.hibernate.metamodel.internal.ManagedTypeRepresentationResolverStandard; import org.hibernate.metamodel.spi.ManagedTypeRepresentationResolver; import org.hibernate.models.spi.ModelsConfiguration; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.query.sqm.function.SqmFunctionDescriptor; import org.hibernate.query.sqm.function.SqmFunctionRegistry; import org.hibernate.resource.beans.spi.BeanInstanceProducer; @@ -80,7 +80,7 @@ public class BootstrapContextImpl implements BootstrapContext { private final ManagedTypeRepresentationResolver representationStrategySelector; private final ConfigurationService configurationService; - private final SourceModelBuildingContext modelsContext; + private final ModelsContext modelsContext; public BootstrapContextImpl( StandardServiceRegistry serviceRegistry, @@ -136,7 +136,7 @@ public TypeConfiguration getTypeConfiguration() { } @Override - public SourceModelBuildingContext getModelsContext() { + public ModelsContext getModelsContext() { return modelsContext; } @@ -354,7 +354,7 @@ public void addCacheRegionDefinition(CacheRegionDefinition cacheRegionDefinition cacheRegionDefinitions.add( cacheRegionDefinition ); } - public static SourceModelBuildingContext createModelBuildingContext( + public static ModelsContext createModelBuildingContext( ClassLoaderService classLoaderService, ConfigurationService configService) { final ClassLoaderServiceLoading classLoading = new ClassLoaderServiceLoading( classLoaderService ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AbstractPropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AbstractPropertyHolder.java index 321ff7143f6b..baf7fa0159f2 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AbstractPropertyHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AbstractPropertyHolder.java @@ -25,7 +25,7 @@ import org.hibernate.models.spi.AnnotationTarget; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.MemberDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.usertype.internal.AbstractTimeZoneStorageCompositeUserType; import org.hibernate.usertype.internal.OffsetTimeCompositeUserType; @@ -172,7 +172,7 @@ protected MetadataBuildingContext getContext() { return context; } - protected SourceModelBuildingContext getSourceModelContext() { + protected ModelsContext getSourceModelContext() { return getContext().getBootstrapContext().getModelsContext(); } @@ -435,7 +435,7 @@ private static Map buildColumnOverride( return result; } - final SourceModelBuildingContext sourceModelContext = + final ModelsContext sourceModelContext = context.getBootstrapContext().getModelsContext(); final Map> columnOverrideMap = new HashMap<>(); @@ -571,7 +571,7 @@ public MetadataBuildingContext getBuildingContext() { } private static Map buildColumnTransformerOverride(AnnotationTarget element, MetadataBuildingContext context) { - final SourceModelBuildingContext sourceModelContext = context.getBootstrapContext().getModelsContext(); + final ModelsContext sourceModelContext = context.getBootstrapContext().getModelsContext(); final Map columnOverride = new HashMap<>(); if ( element != null ) { element.forEachAnnotationUsage( ColumnTransformer.class, sourceModelContext, (usage) -> { diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java index f2c80d6347b1..7c1e5bcff62d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java @@ -36,7 +36,7 @@ import org.hibernate.mapping.SimpleValue; import org.hibernate.mapping.Table; import org.hibernate.models.spi.MemberDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.model.internal.BinderHelper.getPath; import static org.hibernate.boot.model.internal.BinderHelper.getRelativePath; @@ -831,7 +831,7 @@ private static AnnotatedColumn buildColumn( FractionalSeconds fractionalSeconds, String sqlType, String tableName, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { final String columnName = logicalColumnName( inferredData, suffixForDefaultColumnName, database, column ); final AnnotatedColumn annotatedColumn = new AnnotatedColumn(); annotatedColumn.setLogicalColumnName( columnName ); @@ -983,7 +983,7 @@ void applyCheckConstraint(PropertyData inferredData, int length) { private void extractDataFromPropertyData( PropertyHolder propertyHolder, PropertyData inferredData, - SourceModelBuildingContext context) { + ModelsContext context) { if ( inferredData != null ) { final MemberDetails attributeMember = inferredData.getAttributeMember(); if ( attributeMember != null ) { 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 6a9f3b82c7d4..47035204d9cf 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 @@ -35,7 +35,7 @@ import org.hibernate.internal.CoreMessageLogger; import org.hibernate.models.spi.AnnotationTarget; import org.hibernate.models.spi.ClassDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.resource.beans.internal.FallbackBeanInstanceProducer; import org.hibernate.resource.beans.spi.ManagedBeanRegistry; import org.hibernate.type.descriptor.jdbc.JdbcType; @@ -124,7 +124,7 @@ public static void bindDefaults(MetadataBuildingContext context) { } - private static SourceModelBuildingContext modelsContext(MetadataBuildingContext context) { + private static ModelsContext modelsContext(MetadataBuildingContext context) { return context.getBootstrapContext().getModelsContext(); } @@ -170,7 +170,7 @@ public static void bindQueries(AnnotationTarget annotationTarget, MetadataBuildi } private static void bindNamedHibernateQueries(AnnotationTarget annotationTarget, MetadataBuildingContext context) { - final SourceModelBuildingContext sourceModelContext = modelsContext( context ); + final ModelsContext sourceModelContext = modelsContext( context ); annotationTarget.forEachRepeatedAnnotationUsages( HibernateAnnotations.NAMED_QUERY, @@ -186,7 +186,7 @@ private static void bindNamedHibernateQueries(AnnotationTarget annotationTarget, } private static void bindNamedJpaQueries(AnnotationTarget annotationTarget, MetadataBuildingContext context) { - final SourceModelBuildingContext sourceModelContext = modelsContext( context ); + final ModelsContext sourceModelContext = modelsContext( context ); annotationTarget.forEachRepeatedAnnotationUsages( JpaAnnotations.SQL_RESULT_SET_MAPPING, @@ -277,7 +277,7 @@ private static void bindTypeDescriptorRegistrations( final ManagedBeanRegistry managedBeanRegistry = context.getBootstrapContext().getManagedBeanRegistry(); - final SourceModelBuildingContext sourceModelContext = modelsContext( context ); + final ModelsContext sourceModelContext = modelsContext( context ); annotatedElement.forEachAnnotationUsage( JavaTypeRegistration.class, sourceModelContext, (usage) -> { handleJavaTypeRegistration( context, managedBeanRegistry, usage ); @@ -382,7 +382,7 @@ private static void handleCompositeUserTypeRegistration( } private static void bindConverterRegistrations(AnnotationTarget container, MetadataBuildingContext context) { - final SourceModelBuildingContext sourceModelContext = modelsContext( context ); + final ModelsContext sourceModelContext = modelsContext( context ); container.forEachAnnotationUsage( ConverterRegistration.class, sourceModelContext, (usage) -> { handleConverterRegistration( usage, context ); } ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BasicValueBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BasicValueBinder.java index a807f3928a4b..837f17ecc53f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BasicValueBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BasicValueBinder.java @@ -42,7 +42,7 @@ import org.hibernate.mapping.Table; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.MemberDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.models.spi.TypeDetails; import org.hibernate.resource.beans.internal.FallbackBeanInstanceProducer; import org.hibernate.resource.beans.spi.ManagedBeanRegistry; @@ -151,7 +151,7 @@ public BasicValueBinder(Kind kind, Component aggregateComponent, MetadataBuildin this.buildingContext = buildingContext; } - protected SourceModelBuildingContext getSourceModelContext() { + protected ModelsContext getSourceModelContext() { return buildingContext.getBootstrapContext().getModelsContext(); } @@ -1370,21 +1370,21 @@ private Map createDynamicParameterizedTypeParameters() { * Access to detail of basic value mappings based on {@link Kind} */ private interface BasicMappingAccess { - Class> customType(MemberDetails attribute, SourceModelBuildingContext context); - Map customTypeParameters(MemberDetails attribute, SourceModelBuildingContext context); + Class> customType(MemberDetails attribute, ModelsContext context); + Map customTypeParameters(MemberDetails attribute, ModelsContext context); } private static class ValueMappingAccess implements BasicMappingAccess { private static final ValueMappingAccess INSTANCE = new ValueMappingAccess(); @Override - public Class> customType(MemberDetails attribute, SourceModelBuildingContext context) { + public Class> customType(MemberDetails attribute, ModelsContext context) { final Type customType = attribute.locateAnnotationUsage( Type.class, context ); return customType == null ? null : customType.value(); } @Override - public Map customTypeParameters(MemberDetails attribute, SourceModelBuildingContext context) { + public Map customTypeParameters(MemberDetails attribute, ModelsContext context) { final Type customType = attribute.locateAnnotationUsage( Type.class, context ); return customType == null ? null : extractParameterMap( customType.parameters() ); } @@ -1394,12 +1394,12 @@ private static class AnyDiscriminatorMappingAccess implements BasicMappingAccess private static final AnyDiscriminatorMappingAccess INSTANCE = new AnyDiscriminatorMappingAccess(); @Override - public Class> customType(MemberDetails attribute, SourceModelBuildingContext context) { + public Class> customType(MemberDetails attribute, ModelsContext context) { return null; } @Override - public Map customTypeParameters(MemberDetails attribute, SourceModelBuildingContext context) { + public Map customTypeParameters(MemberDetails attribute, ModelsContext context) { return emptyMap(); } } @@ -1408,12 +1408,12 @@ private static class AnyKeyMappingAccess implements BasicMappingAccess { private static final AnyKeyMappingAccess INSTANCE = new AnyKeyMappingAccess(); @Override - public Class> customType(MemberDetails attribute, SourceModelBuildingContext context) { + public Class> customType(MemberDetails attribute, ModelsContext context) { return null; } @Override - public Map customTypeParameters(MemberDetails attribute, SourceModelBuildingContext context) { + public Map customTypeParameters(MemberDetails attribute, ModelsContext context) { return emptyMap(); } } @@ -1422,14 +1422,14 @@ private static class MapKeyMappingAccess implements BasicMappingAccess { private static final MapKeyMappingAccess INSTANCE = new MapKeyMappingAccess(); @Override - public Class> customType(MemberDetails attribute, SourceModelBuildingContext context) { + public Class> customType(MemberDetails attribute, ModelsContext context) { final MapKeyType customType = attribute.locateAnnotationUsage( MapKeyType.class, context ); return customType == null ? null : customType.value(); } @Override - public Map customTypeParameters(MemberDetails attribute, SourceModelBuildingContext context) { + public Map customTypeParameters(MemberDetails attribute, ModelsContext context) { final MapKeyType customType = attribute.locateAnnotationUsage( MapKeyType.class, context ); return customType == null ? null : extractParameterMap( customType.parameters() ); @@ -1440,14 +1440,14 @@ private static class CollectionIdMappingAccess implements BasicMappingAccess { private static final CollectionIdMappingAccess INSTANCE = new CollectionIdMappingAccess(); @Override - public Class> customType(MemberDetails attribute, SourceModelBuildingContext context) { + public Class> customType(MemberDetails attribute, ModelsContext context) { final CollectionIdType customType = attribute.locateAnnotationUsage( CollectionIdType.class, context ); return customType == null ? null : customType.value(); } @Override - public Map customTypeParameters(MemberDetails attribute, SourceModelBuildingContext context) { + public Map customTypeParameters(MemberDetails attribute, ModelsContext context) { final CollectionIdType customType = attribute.locateAnnotationUsage( CollectionIdType.class, context ); return customType == null ? null : extractParameterMap( customType.parameters() ); @@ -1458,12 +1458,12 @@ private static class ListIndexMappingAccess implements BasicMappingAccess { private static final ListIndexMappingAccess INSTANCE = new ListIndexMappingAccess(); @Override - public Class> customType(MemberDetails attribute, SourceModelBuildingContext context) { + public Class> customType(MemberDetails attribute, ModelsContext context) { return null; } @Override - public Map customTypeParameters(MemberDetails attribute, SourceModelBuildingContext context) { + public Map customTypeParameters(MemberDetails attribute, ModelsContext context) { return emptyMap(); } } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BinderHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BinderHelper.java index 4015bd17e994..78df9875eadb 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BinderHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/BinderHelper.java @@ -44,7 +44,7 @@ import org.hibernate.models.spi.AnnotationTarget; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.MemberDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.models.spi.TypeDetails; import org.hibernate.type.descriptor.java.JavaType; @@ -828,7 +828,7 @@ public static Any buildAnyValue( private static void processAnyDiscriminatorValues( MemberDetails property, Consumer consumer, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { final AnyDiscriminatorValues valuesAnn = property.locateAnnotationUsage( AnyDiscriminatorValues.class, sourceModelContext ); if ( valuesAnn != null ) { @@ -1076,7 +1076,7 @@ public static A extractFromPackage( return null; } else { - final SourceModelBuildingContext modelsContext = + final ModelsContext modelsContext = context.getBootstrapContext().getModelsContext(); try { return modelsContext.getClassDetailsRegistry() diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java index 52b6772748a8..b994f1d4c715 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java @@ -106,7 +106,7 @@ import org.hibernate.models.internal.ClassTypeDetailsImpl; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.MemberDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.models.spi.TypeDetails; import org.hibernate.resource.beans.spi.ManagedBean; import org.hibernate.usertype.CompositeUserType; @@ -264,7 +264,7 @@ public static void bindCollection( Map inheritanceStatePerClass, MemberDetails property, AnnotatedJoinColumns joinColumns) { - final SourceModelBuildingContext modelsContext = context.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = context.getBootstrapContext().getModelsContext(); final OneToMany oneToManyAnn = property.getAnnotationUsage( OneToMany.class, modelsContext ); final ManyToMany manyToManyAnn = property.getAnnotationUsage( ManyToMany.class, modelsContext ); @@ -381,7 +381,7 @@ private static NotFoundAction notFoundAction( PropertyData inferredData, MemberDetails property, ManyToMany manyToManyAnn, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { final NotFound notFound = property.getAnnotationUsage( NotFound.class, sourceModelContext ); if ( notFound != null ) { if ( manyToManyAnn == null ) { @@ -634,7 +634,7 @@ else if ( property.hasDirectAnnotationUsage( Columns.class ) ) { private static JoinColumn[] mapKeyJoinColumnAnnotations( MemberDetails property, MetadataBuildingContext context) { - final SourceModelBuildingContext modelsContext = context.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = context.getBootstrapContext().getModelsContext(); final MapKeyJoinColumn[] mapKeyJoinColumns = property.getRepeatedAnnotationUsages( JpaAnnotations.MAP_KEY_JOIN_COLUMN, @@ -957,7 +957,7 @@ private static CollectionClassification determineCollectionClassification( return CollectionClassification.ARRAY; } - final SourceModelBuildingContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); if ( !property.hasAnnotationUsage( Bag.class, modelsContext ) ) { return determineCollectionClassification( determineSemanticJavaType( property ), property, buildingContext ); } @@ -1026,7 +1026,7 @@ private static CollectionClassification determineCollectionClassification( return CollectionClassification.BAG; } - final SourceModelBuildingContext modelsContext = + final ModelsContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); final ManyToMany manyToMany = property.getAnnotationUsage( ManyToMany.class, modelsContext ); if ( manyToMany != null && !manyToMany.mappedBy().isBlank() ) { @@ -1460,7 +1460,7 @@ private void defineFetchingStrategy() { handleFetchProfileOverrides(); } - private SourceModelBuildingContext modelsContext() { + private ModelsContext modelsContext() { return buildingContext.getBootstrapContext().getModelsContext(); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ColumnsBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ColumnsBuilder.java index 67c98489b2a9..0cadb9d70c3f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ColumnsBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ColumnsBuilder.java @@ -16,7 +16,7 @@ import org.hibernate.boot.spi.MetadataBuildingContext; import org.hibernate.boot.spi.PropertyData; import org.hibernate.models.spi.MemberDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.Column; import jakarta.persistence.ElementCollection; @@ -239,7 +239,7 @@ private AnnotatedJoinColumns buildExplicitJoinColumns(MemberDetails property, Pr } private JoinColumnOrFormula[] joinColumnOrFormulaAnnotations(MemberDetails property, PropertyData inferredData) { - final SourceModelBuildingContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); final JoinColumnOrFormula[] annotations = property.getRepeatedAnnotationUsages( HibernateAnnotations.JOIN_COLUMN_OR_FORMULA, modelsContext @@ -252,7 +252,7 @@ private JoinColumnOrFormula[] joinColumnOrFormulaAnnotations(MemberDetails prope } private JoinColumn[] getJoinColumnAnnotations(MemberDetails property, PropertyData inferredData) { - final SourceModelBuildingContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); final JoinColumn[] joinColumns = property.getRepeatedAnnotationUsages( JpaAnnotations.JOIN_COLUMN, diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/DialectOverridesAnnotationHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/DialectOverridesAnnotationHelper.java index 6477b8f1a987..94efcdae259e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/DialectOverridesAnnotationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/DialectOverridesAnnotationHelper.java @@ -15,7 +15,7 @@ import org.hibernate.boot.spi.MetadataBuildingContext; import org.hibernate.dialect.Dialect; import org.hibernate.models.spi.AnnotationTarget; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.internal.util.collections.CollectionHelper.isNotEmpty; @@ -77,7 +77,7 @@ public static T getOverridableAnnotation( AnnotationTarget element, Class annotationType, MetadataBuildingContext context) { - final SourceModelBuildingContext modelsContext = context.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = context.getBootstrapContext().getModelsContext(); final Class overrideAnnotation = OVERRIDE_MAP.get( annotationType ); if ( overrideAnnotation != null ) { diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java index 924269170848..f6cfeabc8d2a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java @@ -48,7 +48,7 @@ import org.hibernate.models.spi.FieldDetails; import org.hibernate.models.spi.MemberDetails; import org.hibernate.models.spi.MethodDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.models.spi.TypeDetails; import org.hibernate.property.access.internal.PropertyAccessStrategyCompositeUserTypeImpl; import org.hibernate.property.access.internal.PropertyAccessStrategyGetterImpl; @@ -317,7 +317,7 @@ static Component bindEmbeddable( } private static void callTypeBinders(Component component, MetadataBuildingContext context, TypeDetails annotatedClass ) { - final SourceModelBuildingContext modelsContext = context.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = context.getBootstrapContext().getModelsContext(); final List metaAnnotatedAnnotations = annotatedClass.determineRawClass().getMetaAnnotated( TypeBinderType.class, modelsContext ); if ( isEmpty( metaAnnotatedAnnotations ) ) { diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java index 5273483a7160..40fea4376fd5 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java @@ -77,7 +77,7 @@ import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; import org.hibernate.models.spi.MemberDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.models.spi.TypeDetails; import org.hibernate.spi.NavigablePath; @@ -164,7 +164,7 @@ public class EntityBinder { private String naturalIdCacheRegion; private CacheLayout queryCacheLayout; - private SourceModelBuildingContext modelsContext() { + private ModelsContext modelsContext() { return context.getBootstrapContext().getModelsContext(); } @@ -184,7 +184,7 @@ public static void bindEntityClass( } final InFlightMetadataCollector collector = context.getMetadataCollector(); - final SourceModelBuildingContext modelsContext = context.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = context.getBootstrapContext().getModelsContext(); //TODO: be more strict with secondary table allowance (not for ids, not for secondary table join columns etc) @@ -234,7 +234,7 @@ private void bindTables(InheritanceState inheritanceState, PersistentClass super handleSecondaryTables(); } - private static void checkOverrides(ClassDetails clazzToProcess, PersistentClass superEntity, SourceModelBuildingContext sourceModelContext) { + private static void checkOverrides(ClassDetails clazzToProcess, PersistentClass superEntity, ModelsContext sourceModelContext) { if ( superEntity != null ) { //TODO: correctly handle compound paths (embeddables) clazzToProcess.forEachAnnotationUsage( AttributeOverride.class, sourceModelContext, (usage) -> checkOverride( @@ -288,7 +288,7 @@ private static void bindSoftDelete( } private static SoftDelete extractSoftDelete(ClassDetails classDetails, MetadataBuildingContext context) { - final SourceModelBuildingContext modelsContext = context.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = context.getBootstrapContext().getModelsContext(); final SoftDelete fromClass = classDetails.getAnnotationUsage( SoftDelete.class, modelsContext ); if ( fromClass != null ) { return fromClass; @@ -1117,7 +1117,7 @@ private static AnnotatedJoinColumns subclassJoinColumns( final AnnotatedJoinColumns joinColumns = new AnnotatedJoinColumns(); joinColumns.setBuildingContext( context ); - final SourceModelBuildingContext modelsContext = context.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = context.getBootstrapContext().getModelsContext(); final PrimaryKeyJoinColumns primaryKeyJoinColumns = clazzToProcess.getAnnotationUsage( PrimaryKeyJoinColumns.class, modelsContext ); if ( primaryKeyJoinColumns != null ) { @@ -1597,7 +1597,7 @@ private void bindSqlRestriction() { } private SQLRestriction extractSQLRestriction(ClassDetails classDetails) { - final SourceModelBuildingContext modelsContext = modelsContext(); + final ModelsContext modelsContext = modelsContext(); final SQLRestriction fromClass = getOverridableAnnotation( classDetails, SQLRestriction.class, context ); if ( fromClass != null ) { return fromClass; @@ -1671,7 +1671,7 @@ private void bindSubclassCache() { } private void bindRootClassCache() { - final SourceModelBuildingContext sourceModelContext = modelsContext(); + final ModelsContext sourceModelContext = modelsContext(); final Cache cache = annotatedClass.getAnnotationUsage( Cache.class, sourceModelContext ); final Cacheable cacheable = annotatedClass.getAnnotationUsage( Cacheable.class, sourceModelContext ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FilterDefBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FilterDefBinder.java index aaa78e62b0ac..dba72198c7dc 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FilterDefBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FilterDefBinder.java @@ -19,7 +19,7 @@ import org.hibernate.internal.CoreMessageLogger; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.models.spi.AnnotationTarget; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.resource.beans.spi.ManagedBean; import org.hibernate.type.descriptor.java.JavaType; import org.hibernate.usertype.UserType; @@ -41,7 +41,7 @@ public class FilterDefBinder { private static final CoreMessageLogger LOG = messageLogger( FilterDefBinder.class ); public static void bindFilterDefs(AnnotationTarget annotatedElement, MetadataBuildingContext context) { - final SourceModelBuildingContext modelsContext = context.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = context.getBootstrapContext().getModelsContext(); annotatedElement.forEachAnnotationUsage( FilterDef.class, modelsContext, (usage) -> { bindFilterDef( usage, context ); } ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorAnnotationHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorAnnotationHelper.java index 2fb32f1a3c82..a373156c51ea 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorAnnotationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorAnnotationHelper.java @@ -31,8 +31,7 @@ import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; import org.hibernate.models.spi.MemberDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; -import org.hibernate.models.spi.SourceModelContext; +import org.hibernate.models.spi.ModelsContext; import java.lang.annotation.Annotation; import java.util.HashMap; @@ -65,7 +64,7 @@ public static A findLocalizedMatch( @Nullable Function nameExtractor, @Nullable String matchName, MetadataBuildingContext context) { - final SourceModelBuildingContext modelsContext = context.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = context.getBootstrapContext().getModelsContext(); A possibleMatch = null; @@ -152,11 +151,11 @@ else if ( registrationName.equals( matchName ) ) { } public static ClassDetails locatePackageInfoDetails(ClassDetails classDetails, MetadataBuildingContext buildingContext) { - final SourceModelBuildingContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); return locatePackageInfoDetails( classDetails, modelsContext ); } - public static ClassDetails locatePackageInfoDetails(ClassDetails classDetails, SourceModelContext modelContext) { + public static ClassDetails locatePackageInfoDetails(ClassDetails classDetails, ModelsContext modelContext) { return locatePackageInfoDetails( classDetails, modelContext.getClassDetailsRegistry() ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorBinder.java index 7fc34e46f657..3a3e7cb18108 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/GeneratorBinder.java @@ -43,7 +43,7 @@ import org.hibernate.mapping.Value; import org.hibernate.models.spi.AnnotationTarget; import org.hibernate.models.spi.MemberDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.resource.beans.container.spi.BeanContainer; import org.hibernate.resource.beans.internal.Helper; @@ -265,7 +265,7 @@ public static void visitIdGeneratorDefinitions( AnnotationTarget annotatedElement, Consumer consumer, MetadataBuildingContext buildingContext) { - final SourceModelBuildingContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); annotatedElement.forEachAnnotationUsage( TableGenerator.class, modelsContext, usage -> consumer.accept( buildTableIdGenerator( usage ) ) ); @@ -799,7 +799,7 @@ static void createIdGeneratorsFromGeneratorAnnotations( PropertyData inferredData, SimpleValue idValue, MetadataBuildingContext buildingContext) { - final SourceModelBuildingContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); final MemberDetails idAttributeMember = inferredData.getAttributeMember(); final List idGeneratorAnnotations = idAttributeMember.getMetaAnnotated( IdGeneratorType.class, modelsContext ); @@ -850,7 +850,7 @@ else if ( idAttributeMember.hasDirectAnnotationUsage( GeneratedValue.class ) ) { static GeneratorCreator createValueGeneratorFromAnnotations( PropertyHolder holder, String propertyName, Value value, MemberDetails property, MetadataBuildingContext buildingContext) { - final SourceModelBuildingContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); final List generatorAnnotations = property.getMetaAnnotated( ValueGenerationType.class, modelsContext ); return switch ( generatorAnnotations.size() ) { diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java index 95cfe66d2489..1646b0969534 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java @@ -68,7 +68,7 @@ import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; import org.hibernate.models.spi.MemberDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.models.spi.TypeDetails; import org.hibernate.models.spi.TypeVariableScope; import org.hibernate.usertype.CompositeUserType; @@ -131,7 +131,7 @@ public class PropertyBinder { private boolean toMany; private String referencedEntityName; // only used for @MapsId or @IdClass - protected SourceModelBuildingContext getSourceModelContext() { + protected ModelsContext getSourceModelContext() { return buildingContext.getBootstrapContext().getModelsContext(); } @@ -652,7 +652,7 @@ private static int addProperty( return idPropertyCounter; } - private static void checkIdProperty(MemberDetails property, PropertyData propertyData, SourceModelBuildingContext context) { + private static void checkIdProperty(MemberDetails property, PropertyData propertyData, ModelsContext context) { final boolean incomingIdProperty = hasIdAnnotation( property ); final MemberDetails attributeMember = propertyData.getAttributeMember(); final boolean existingIdProperty = hasIdAnnotation( attributeMember ); @@ -1320,7 +1320,7 @@ private static boolean isLazy(MemberDetails property) { private static Class> resolveCompositeUserType( PropertyData inferredData, MetadataBuildingContext buildingContext) { - final SourceModelBuildingContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); final MemberDetails attributeMember = inferredData.getAttributeMember(); final TypeDetails classOrElementType = inferredData.getClassOrElementType(); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyInferredData.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyInferredData.java index 1120ec45fda8..69ecdf785a84 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyInferredData.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyInferredData.java @@ -16,7 +16,7 @@ import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; import org.hibernate.models.spi.MemberDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.models.spi.TypeDetails; import org.hibernate.models.spi.TypeVariableScope; @@ -80,7 +80,7 @@ public String getPropertyName() throws MappingException { @Override public TypeDetails getPropertyType() throws MappingException { final org.hibernate.boot.internal.Target targetAnnotation = propertyMember.getDirectAnnotationUsage( org.hibernate.boot.internal.Target.class ); - final SourceModelBuildingContext sourceModelContext = buildingContext.getBootstrapContext().getModelsContext(); + final ModelsContext sourceModelContext = buildingContext.getBootstrapContext().getModelsContext(); if ( targetAnnotation != null ) { final String targetName = targetAnnotation.value(); final ClassDetails classDetails = ModelsHelper.resolveClassDetails( @@ -101,7 +101,7 @@ public TypeDetails getPropertyType() throws MappingException { private static ClassTypeDetailsImpl resolveLegacyTargetAnnotation( Target legacyTargetAnnotation, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { final ClassDetailsRegistry classDetailsRegistry = sourceModelContext.getClassDetailsRegistry(); final ClassDetails targetClassDetails = classDetailsRegistry.resolveClassDetails( legacyTargetAnnotation.value().getName() ); return new ClassTypeDetailsImpl( targetClassDetails, TypeDetails.Kind.CLASS ); @@ -109,7 +109,7 @@ private static ClassTypeDetailsImpl resolveLegacyTargetAnnotation( @Override public TypeDetails getClassOrElementType() throws MappingException { - final SourceModelBuildingContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); final org.hibernate.boot.internal.Target annotationUsage = propertyMember.getDirectAnnotationUsage( org.hibernate.boot.internal.Target.class ); if ( annotationUsage != null ) { final String targetName = annotationUsage.value(); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryBinder.java index 18b3fbdb4bb2..330ed37808c4 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/QueryBinder.java @@ -36,7 +36,7 @@ import org.hibernate.jpa.internal.util.FlushModeTypeHelper; import org.hibernate.models.spi.AnnotationTarget; import org.hibernate.models.spi.ClassDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.query.QueryFlushMode; import org.hibernate.query.sql.internal.ParameterParser; import org.hibernate.query.sql.spi.ParameterRecognizer; @@ -281,7 +281,7 @@ public static NamedProcedureCallDefinition createStoredProcedure( } final JdbcCall jdbcCall = parseJdbcCall( sqlString, exceptionProducer ); - final SourceModelBuildingContext modelsContext = context.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = context.getBootstrapContext().getModelsContext(); final NamedStoredProcedureQueryJpaAnnotation nameStoredProcedureQueryAnn = JpaAnnotations.NAMED_STORED_PROCEDURE_QUERY.createUsage( modelsContext ); nameStoredProcedureQueryAnn.name( builder.getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/StrictIdGeneratorResolverSecondPass.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/StrictIdGeneratorResolverSecondPass.java index eb9588dbd688..dd96071f4fb6 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/StrictIdGeneratorResolverSecondPass.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/StrictIdGeneratorResolverSecondPass.java @@ -19,7 +19,7 @@ import org.hibernate.models.spi.MemberDetails; import jakarta.persistence.GeneratedValue; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.model.internal.GeneratorAnnotationHelper.handleGenericGenerator; import static org.hibernate.boot.model.internal.GeneratorAnnotationHelper.handleSequenceGenerator; @@ -51,7 +51,7 @@ public StrictIdGeneratorResolverSecondPass( super( entityMapping, idValue, idMember, generatedValue, buildingContext ); } - private SourceModelBuildingContext modelsContext() { + private ModelsContext modelsContext() { return buildingContext.getBootstrapContext().getModelsContext(); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ToOneBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ToOneBinder.java index e3f0ac207f58..22b0ebc4a796 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ToOneBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ToOneBinder.java @@ -28,7 +28,7 @@ import org.hibernate.mapping.ToOne; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.MemberDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -335,7 +335,7 @@ private static void handleFetchProfileOverrides( PropertyData inferredData) { final MetadataBuildingContext context = toOne.getBuildingContext(); final InFlightMetadataCollector collector = context.getMetadataCollector(); - final SourceModelBuildingContext modelsContext = context.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = context.getBootstrapContext().getModelsContext(); property.forEachAnnotationUsage( FetchProfileOverride.class, modelsContext, usage -> collector.addSecondPass( new FetchSecondPass( usage, propertyHolder, inferredData.getPropertyName(), context ) )); } @@ -605,7 +605,7 @@ public static ClassDetails getTargetEntity(PropertyData propertyData, MetadataBu } private static ClassDetails getTargetEntityClass(MemberDetails property, MetadataBuildingContext context) { - final SourceModelBuildingContext modelsContext = context.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = context.getBootstrapContext().getModelsContext(); final ManyToOne manyToOne = property.getDirectAnnotationUsage( ManyToOne.class ); if ( manyToOne != null ) { return modelsContext.getClassDetailsRegistry().resolveClassDetails( manyToOne.targetEntity().getName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java index 82aed1480310..c34c8c8a3e75 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java @@ -73,7 +73,7 @@ import org.hibernate.models.internal.MutableClassDetailsRegistry; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.type.BasicType; import org.hibernate.type.BasicTypeRegistry; import org.hibernate.type.SqlTypes; @@ -359,7 +359,7 @@ public static DomainModelSource processManagedResources( // - pre-process the XML // - collect all known classes // - resolve (possibly building) Jandex index - // - build the SourceModelBuildingContext + // - build the ModelsContext // // INPUTS: // - serviceRegistry @@ -369,9 +369,9 @@ public static DomainModelSource processManagedResources( // OUTPUTS: // - xmlPreProcessingResult // - allKnownClassNames (technically could be included in xmlPreProcessingResult) - // - sourceModelBuildingContext + // - ModelsContext - final SourceModelBuildingContext modelsContext = bootstrapContext.getModelsContext(); + final ModelsContext modelsContext = bootstrapContext.getModelsContext(); final XmlPreProcessingResult xmlPreProcessingResult = XmlPreProcessor.preProcessXmlResources( managedResources, metadataCollector.getPersistenceUnitMetadata() @@ -404,7 +404,7 @@ public static DomainModelSource processManagedResources( // INPUTS: // - "options" (areIdGeneratorsGlobal, etc) // - xmlPreProcessingResult - // - sourceModelBuildingContext + // - ModelsContext // // OUTPUTS // - rootEntities diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AbstractXmlAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AbstractXmlAnnotation.java index 343c2f6c82d4..2392ced65054 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AbstractXmlAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AbstractXmlAnnotation.java @@ -7,14 +7,14 @@ import java.lang.annotation.Annotation; import org.hibernate.boot.internal.Abstract; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; /** * @author Steve Ebersole */ @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) public class AbstractXmlAnnotation implements Abstract { - public AbstractXmlAnnotation(SourceModelBuildingContext modelContext) { + public AbstractXmlAnnotation(ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AccessJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AccessJpaAnnotation.java index a29b20a1a411..8a28d233be9b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AccessJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AccessJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.Access; @@ -20,20 +20,20 @@ public class AccessJpaAnnotation implements Access { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public AccessJpaAnnotation(SourceModelBuildingContext modelContext) { + public AccessJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public AccessJpaAnnotation(Access annotation, SourceModelBuildingContext modelContext) { + public AccessJpaAnnotation(Access annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public AccessJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public AccessJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (jakarta.persistence.AccessType) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyAnnotation.java index e166653b5426..4cd5ba1617b5 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.Any; import org.hibernate.boot.models.annotations.spi.AttributeMarker; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -20,7 +20,7 @@ public class AnyAnnotation implements Any, AttributeMarker, AttributeMarker.Fetc /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public AnyAnnotation(SourceModelBuildingContext modelContext) { + public AnyAnnotation(ModelsContext modelContext) { this.fetch = jakarta.persistence.FetchType.EAGER; this.optional = true; } @@ -28,7 +28,7 @@ public AnyAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public AnyAnnotation(Any annotation, SourceModelBuildingContext modelContext) { + public AnyAnnotation(Any annotation, ModelsContext modelContext) { this.fetch = annotation.fetch(); this.optional = annotation.optional(); } @@ -36,7 +36,7 @@ public AnyAnnotation(Any annotation, SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from Jandex variant */ - public AnyAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public AnyAnnotation(Map attributeValues, ModelsContext modelContext) { this.fetch = (jakarta.persistence.FetchType) attributeValues.get( "fetch" ); this.optional = (boolean) attributeValues.get( "optional" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorAnnotation.java index 51a2a726c4df..bacb5324f30a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorAnnotation.java @@ -5,7 +5,7 @@ package org.hibernate.boot.models.annotations.internal; import org.hibernate.annotations.AnyDiscriminator; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import java.lang.annotation.Annotation; import java.util.Map; @@ -18,21 +18,21 @@ public class AnyDiscriminatorAnnotation implements AnyDiscriminator { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public AnyDiscriminatorAnnotation(SourceModelBuildingContext modelContext) { + public AnyDiscriminatorAnnotation(ModelsContext modelContext) { this.value = jakarta.persistence.DiscriminatorType.STRING; } /** * Used in creating annotation instances from JDK variant */ - public AnyDiscriminatorAnnotation(AnyDiscriminator annotation, SourceModelBuildingContext modelContext) { + public AnyDiscriminatorAnnotation(AnyDiscriminator annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public AnyDiscriminatorAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public AnyDiscriminatorAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (jakarta.persistence.DiscriminatorType) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorImplicitValuesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorImplicitValuesAnnotation.java index 7dea2a7bcde2..0ca7498bd949 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorImplicitValuesAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorImplicitValuesAnnotation.java @@ -6,7 +6,7 @@ import org.hibernate.annotations.AnyDiscriminatorImplicitValues; import org.hibernate.metamodel.spi.ImplicitDiscriminatorStrategy; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import java.lang.annotation.Annotation; import java.util.Map; @@ -20,7 +20,7 @@ public class AnyDiscriminatorImplicitValuesAnnotation implements AnyDiscriminato /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public AnyDiscriminatorImplicitValuesAnnotation(SourceModelBuildingContext modelContext) { + public AnyDiscriminatorImplicitValuesAnnotation(ModelsContext modelContext) { this.value = Strategy.CUSTOM; this.implementation = ImplicitDiscriminatorStrategy.class; } @@ -28,7 +28,7 @@ public AnyDiscriminatorImplicitValuesAnnotation(SourceModelBuildingContext model /** * Used in creating annotation instances from JDK variant */ - public AnyDiscriminatorImplicitValuesAnnotation(AnyDiscriminatorImplicitValues annotation, SourceModelBuildingContext modelContext) { + public AnyDiscriminatorImplicitValuesAnnotation(AnyDiscriminatorImplicitValues annotation, ModelsContext modelContext) { this.value = annotation.value(); this.implementation = annotation.implementation(); } @@ -36,7 +36,7 @@ public AnyDiscriminatorImplicitValuesAnnotation(AnyDiscriminatorImplicitValues a /** * Used in creating annotation instances from Jandex variant */ - public AnyDiscriminatorImplicitValuesAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public AnyDiscriminatorImplicitValuesAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Strategy) attributeValues.get( "value" ); //noinspection unchecked this.implementation = (Class) attributeValues.get( "implementation" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorValueAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorValueAnnotation.java index 8078ced6f9b1..4f7e18d7933e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorValueAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorValueAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.AnyDiscriminatorValue; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -19,13 +19,13 @@ public class AnyDiscriminatorValueAnnotation implements AnyDiscriminatorValue { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public AnyDiscriminatorValueAnnotation(SourceModelBuildingContext modelContext) { + public AnyDiscriminatorValueAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public AnyDiscriminatorValueAnnotation(AnyDiscriminatorValue annotation, SourceModelBuildingContext modelContext) { + public AnyDiscriminatorValueAnnotation(AnyDiscriminatorValue annotation, ModelsContext modelContext) { this.discriminator = annotation.discriminator(); this.entity = annotation.entity(); } @@ -33,7 +33,7 @@ public AnyDiscriminatorValueAnnotation(AnyDiscriminatorValue annotation, SourceM /** * Used in creating annotation instances from Jandex variant */ - public AnyDiscriminatorValueAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public AnyDiscriminatorValueAnnotation(Map attributeValues, ModelsContext modelContext) { this.discriminator = (String) attributeValues.get( "discriminator" ); this.entity = (Class) attributeValues.get( "entity" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorValuesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorValuesAnnotation.java index cb15100216e2..35d7108d32eb 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorValuesAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorValuesAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.AnyDiscriminatorValues; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -24,7 +24,7 @@ public class AnyDiscriminatorValuesAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public AnyDiscriminatorValuesAnnotation(SourceModelBuildingContext modelContext) { + public AnyDiscriminatorValuesAnnotation(ModelsContext modelContext) { } /** @@ -32,7 +32,7 @@ public AnyDiscriminatorValuesAnnotation(SourceModelBuildingContext modelContext) */ public AnyDiscriminatorValuesAnnotation( AnyDiscriminatorValues annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = extractJdkValue( annotation, HibernateAnnotations.ANY_DISCRIMINATOR_VALUES, @@ -44,7 +44,7 @@ public AnyDiscriminatorValuesAnnotation( /** * Used in creating annotation instances from Jandex variant */ - public AnyDiscriminatorValuesAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public AnyDiscriminatorValuesAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (AnyDiscriminatorValue[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeTypeAnnotation.java index c2a941c2bd13..33964471f756 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeTypeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeTypeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.boot.internal.AnyKeyType; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class AnyKeTypeAnnotation implements AnyKeyType { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public AnyKeTypeAnnotation(SourceModelBuildingContext modelContext) { + public AnyKeTypeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public AnyKeTypeAnnotation(AnyKeyType annotation, SourceModelBuildingContext modelContext) { + public AnyKeTypeAnnotation(AnyKeyType annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public AnyKeTypeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public AnyKeTypeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (String) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJavaClassAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJavaClassAnnotation.java index 1f440d171b22..b43dbb97478b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJavaClassAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJavaClassAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.AnyKeyJavaClass; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class AnyKeyJavaClassAnnotation implements AnyKeyJavaClass { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public AnyKeyJavaClassAnnotation(SourceModelBuildingContext modelContext) { + public AnyKeyJavaClassAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public AnyKeyJavaClassAnnotation(AnyKeyJavaClass annotation, SourceModelBuildingContext modelContext) { + public AnyKeyJavaClassAnnotation(AnyKeyJavaClass annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public AnyKeyJavaClassAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public AnyKeyJavaClassAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJavaTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJavaTypeAnnotation.java index dd84d1cce488..d8a0dc36e8d9 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJavaTypeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJavaTypeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.AnyKeyJavaType; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.type.descriptor.java.BasicJavaType; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @@ -19,20 +19,20 @@ public class AnyKeyJavaTypeAnnotation implements AnyKeyJavaType { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public AnyKeyJavaTypeAnnotation(SourceModelBuildingContext modelContext) { + public AnyKeyJavaTypeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public AnyKeyJavaTypeAnnotation(AnyKeyJavaType annotation, SourceModelBuildingContext modelContext) { + public AnyKeyJavaTypeAnnotation(AnyKeyJavaType annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public AnyKeyJavaTypeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public AnyKeyJavaTypeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class>) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJdbcTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJdbcTypeAnnotation.java index f40bf17c8c76..cae758f5025c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJdbcTypeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJdbcTypeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.AnyKeyJdbcType; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.type.descriptor.jdbc.JdbcType; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @@ -19,20 +19,20 @@ public class AnyKeyJdbcTypeAnnotation implements AnyKeyJdbcType { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public AnyKeyJdbcTypeAnnotation(SourceModelBuildingContext modelContext) { + public AnyKeyJdbcTypeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public AnyKeyJdbcTypeAnnotation(AnyKeyJdbcType annotation, SourceModelBuildingContext modelContext) { + public AnyKeyJdbcTypeAnnotation(AnyKeyJdbcType annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public AnyKeyJdbcTypeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public AnyKeyJdbcTypeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJdbcTypeCodeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJdbcTypeCodeAnnotation.java index 256930f3a077..cbe50b63f43b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJdbcTypeCodeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJdbcTypeCodeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.AnyKeyJdbcTypeCode; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class AnyKeyJdbcTypeCodeAnnotation implements AnyKeyJdbcTypeCode { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public AnyKeyJdbcTypeCodeAnnotation(SourceModelBuildingContext modelContext) { + public AnyKeyJdbcTypeCodeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public AnyKeyJdbcTypeCodeAnnotation(AnyKeyJdbcTypeCode annotation, SourceModelBuildingContext modelContext) { + public AnyKeyJdbcTypeCodeAnnotation(AnyKeyJdbcTypeCode annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public AnyKeyJdbcTypeCodeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public AnyKeyJdbcTypeCodeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (int) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyTypeXmlAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyTypeXmlAnnotation.java index 4ff5a8ebf6b2..65c46881b543 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyTypeXmlAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyTypeXmlAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.boot.internal.Abstract; import org.hibernate.boot.internal.AnyKeyType; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; /** * @author Steve Ebersole @@ -21,20 +21,20 @@ public class AnyKeyTypeXmlAnnotation implements AnyKeyType { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public AnyKeyTypeXmlAnnotation(SourceModelBuildingContext modelContext) { + public AnyKeyTypeXmlAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public AnyKeyTypeXmlAnnotation(AnyKeyType annotation, SourceModelBuildingContext modelContext) { + public AnyKeyTypeXmlAnnotation(AnyKeyType annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public AnyKeyTypeXmlAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public AnyKeyTypeXmlAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (String) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ArrayAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ArrayAnnotation.java index a119524af490..c7a8adcb7ca5 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ArrayAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ArrayAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.Array; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class ArrayAnnotation implements Array { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ArrayAnnotation(SourceModelBuildingContext modelContext) { + public ArrayAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public ArrayAnnotation(Array annotation, SourceModelBuildingContext modelContext) { + public ArrayAnnotation(Array annotation, ModelsContext modelContext) { this.length = annotation.length(); } /** * Used in creating annotation instances from Jandex variant */ - public ArrayAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ArrayAnnotation(Map attributeValues, ModelsContext modelContext) { this.length = (int) attributeValues.get( "length" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AssociationOverrideJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AssociationOverrideJpaAnnotation.java index 08887f93486e..5085c4d109f6 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AssociationOverrideJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AssociationOverrideJpaAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.boot.models.JpaAnnotations; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.AssociationOverride; @@ -28,7 +28,7 @@ public class AssociationOverrideJpaAnnotation implements AssociationOverride { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public AssociationOverrideJpaAnnotation(SourceModelBuildingContext modelContext) { + public AssociationOverrideJpaAnnotation(ModelsContext modelContext) { this.joinColumns = new jakarta.persistence.JoinColumn[0]; this.foreignKey = JpaAnnotations.FOREIGN_KEY.createUsage( modelContext ); this.joinTable = JpaAnnotations.JOIN_TABLE.createUsage( modelContext ); @@ -37,7 +37,7 @@ public AssociationOverrideJpaAnnotation(SourceModelBuildingContext modelContext) /** * Used in creating annotation instances from JDK variant */ - public AssociationOverrideJpaAnnotation(AssociationOverride annotation, SourceModelBuildingContext modelContext) { + public AssociationOverrideJpaAnnotation(AssociationOverride annotation, ModelsContext modelContext) { this.name = annotation.name(); this.joinColumns = extractJdkValue( annotation, ASSOCIATION_OVERRIDE, "joinColumns", modelContext ); this.foreignKey = extractJdkValue( annotation, ASSOCIATION_OVERRIDE, "foreignKey", modelContext ); @@ -49,7 +49,7 @@ public AssociationOverrideJpaAnnotation(AssociationOverride annotation, SourceMo */ public AssociationOverrideJpaAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.joinColumns = (jakarta.persistence.JoinColumn[]) attributeValues.get( "joinColumns" ); this.foreignKey = (jakarta.persistence.ForeignKey) attributeValues.get( "foreignKey" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AssociationOverridesJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AssociationOverridesJpaAnnotation.java index 3b3a568a6a61..0db3a07d08d3 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AssociationOverridesJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AssociationOverridesJpaAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.boot.models.JpaAnnotations; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.AssociationOverrides; @@ -22,13 +22,13 @@ public class AssociationOverridesJpaAnnotation implements AssociationOverrides { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public AssociationOverridesJpaAnnotation(SourceModelBuildingContext modelContext) { + public AssociationOverridesJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public AssociationOverridesJpaAnnotation(AssociationOverrides annotation, SourceModelBuildingContext modelContext) { + public AssociationOverridesJpaAnnotation(AssociationOverrides annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, JpaAnnotations.ASSOCIATION_OVERRIDES, "value", modelContext ); } @@ -37,7 +37,7 @@ public AssociationOverridesJpaAnnotation(AssociationOverrides annotation, Source */ public AssociationOverridesJpaAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (jakarta.persistence.AssociationOverride[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeAccessorAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeAccessorAnnotation.java index 81e9672e63f2..ce808e61524a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeAccessorAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeAccessorAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.AttributeAccessor; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @@ -21,7 +21,7 @@ public class AttributeAccessorAnnotation implements AttributeAccessor { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public AttributeAccessorAnnotation(SourceModelBuildingContext modelContext) { + public AttributeAccessorAnnotation(ModelsContext modelContext) { this.value = ""; this.strategy = org.hibernate.property.access.spi.PropertyAccessStrategy.class; } @@ -29,7 +29,7 @@ public AttributeAccessorAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public AttributeAccessorAnnotation(AttributeAccessor annotation, SourceModelBuildingContext modelContext) { + public AttributeAccessorAnnotation(AttributeAccessor annotation, ModelsContext modelContext) { this.value = annotation.value(); this.strategy = annotation.strategy(); } @@ -37,7 +37,7 @@ public AttributeAccessorAnnotation(AttributeAccessor annotation, SourceModelBuil /** * Used in creating annotation instances from Jandex variant */ - public AttributeAccessorAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public AttributeAccessorAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (String) attributeValues.get( "value" ); this.strategy = (Class) attributeValues .get( "strategy" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeBinderTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeBinderTypeAnnotation.java index 21e6513e5e07..5998cb724db4 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeBinderTypeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeBinderTypeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.AttributeBinderType; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class AttributeBinderTypeAnnotation implements AttributeBinderType { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public AttributeBinderTypeAnnotation(SourceModelBuildingContext modelContext) { + public AttributeBinderTypeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public AttributeBinderTypeAnnotation(AttributeBinderType annotation, SourceModelBuildingContext modelContext) { + public AttributeBinderTypeAnnotation(AttributeBinderType annotation, ModelsContext modelContext) { this.binder = annotation.binder(); } /** * Used in creating annotation instances from Jandex variant */ - public AttributeBinderTypeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public AttributeBinderTypeAnnotation(Map attributeValues, ModelsContext modelContext) { this.binder = (Class>) attributeValues.get( "binder" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeOverrideJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeOverrideJpaAnnotation.java index 45e282fa834c..498d2ed520f7 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeOverrideJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeOverrideJpaAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.boot.models.JpaAnnotations; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.AttributeOverride; @@ -24,13 +24,13 @@ public class AttributeOverrideJpaAnnotation implements AttributeOverride { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public AttributeOverrideJpaAnnotation(SourceModelBuildingContext modelContext) { + public AttributeOverrideJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public AttributeOverrideJpaAnnotation(AttributeOverride annotation, SourceModelBuildingContext modelContext) { + public AttributeOverrideJpaAnnotation(AttributeOverride annotation, ModelsContext modelContext) { this.name = annotation.name(); this.column = extractJdkValue( annotation, JpaAnnotations.ATTRIBUTE_OVERRIDE, "column", modelContext ); } @@ -38,7 +38,7 @@ public AttributeOverrideJpaAnnotation(AttributeOverride annotation, SourceModelB /** * Used in creating annotation instances from Jandex variant */ - public AttributeOverrideJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public AttributeOverrideJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.column = (jakarta.persistence.Column) attributeValues.get( "column" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeOverridesJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeOverridesJpaAnnotation.java index 7ab7764e7d5d..8c0870182a54 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeOverridesJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AttributeOverridesJpaAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.boot.models.JpaAnnotations; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.AttributeOverrides; @@ -22,20 +22,20 @@ public class AttributeOverridesJpaAnnotation implements AttributeOverrides { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public AttributeOverridesJpaAnnotation(SourceModelBuildingContext modelContext) { + public AttributeOverridesJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public AttributeOverridesJpaAnnotation(AttributeOverrides annotation, SourceModelBuildingContext modelContext) { + public AttributeOverridesJpaAnnotation(AttributeOverrides annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, JpaAnnotations.ATTRIBUTE_OVERRIDES, "value", modelContext ); } /** * Used in creating annotation instances from Jandex variant */ - public AttributeOverridesJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public AttributeOverridesJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (jakarta.persistence.AttributeOverride[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BagAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BagAnnotation.java index 39b6792526bf..38b3d1b1a155 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BagAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BagAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.Bag; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -16,19 +16,19 @@ public class BagAnnotation implements Bag { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public BagAnnotation(SourceModelBuildingContext modelContext) { + public BagAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public BagAnnotation(Bag annotation, SourceModelBuildingContext modelContext) { + public BagAnnotation(Bag annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public BagAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public BagAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BasicJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BasicJpaAnnotation.java index 2396b62438ae..781a3a5d1a35 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BasicJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BasicJpaAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.boot.models.annotations.spi.AttributeMarker; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.Basic; @@ -23,7 +23,7 @@ public class BasicJpaAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public BasicJpaAnnotation(SourceModelBuildingContext modelContext) { + public BasicJpaAnnotation(ModelsContext modelContext) { this.fetch = jakarta.persistence.FetchType.EAGER; this.optional = true; } @@ -31,7 +31,7 @@ public BasicJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public BasicJpaAnnotation(Basic annotation, SourceModelBuildingContext modelContext) { + public BasicJpaAnnotation(Basic annotation, ModelsContext modelContext) { this.fetch = annotation.fetch(); this.optional = annotation.optional(); } @@ -39,7 +39,7 @@ public BasicJpaAnnotation(Basic annotation, SourceModelBuildingContext modelCont /** * Used in creating annotation instances from Jandex variant */ - public BasicJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public BasicJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.fetch = (jakarta.persistence.FetchType) attributeValues.get( "fetch" ); this.optional = (boolean) attributeValues.get( "optional" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BatchSizeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BatchSizeAnnotation.java index 3af2b26f072b..364ab91843bf 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BatchSizeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/BatchSizeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.BatchSize; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class BatchSizeAnnotation implements BatchSize { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public BatchSizeAnnotation(SourceModelBuildingContext modelContext) { + public BatchSizeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public BatchSizeAnnotation(BatchSize annotation, SourceModelBuildingContext modelContext) { + public BatchSizeAnnotation(BatchSize annotation, ModelsContext modelContext) { this.size = annotation.size(); } /** * Used in creating annotation instances from Jandex variant */ - public BatchSizeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public BatchSizeAnnotation(Map attributeValues, ModelsContext modelContext) { this.size = (int) attributeValues.get( "size" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CacheAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CacheAnnotation.java index e405f52f7a1a..d061c9388c54 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CacheAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CacheAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.Cache; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -20,7 +20,7 @@ public class CacheAnnotation implements Cache { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CacheAnnotation(SourceModelBuildingContext modelContext) { + public CacheAnnotation(ModelsContext modelContext) { this.region = ""; this.includeLazy = true; } @@ -28,7 +28,7 @@ public CacheAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public CacheAnnotation(Cache annotation, SourceModelBuildingContext modelContext) { + public CacheAnnotation(Cache annotation, ModelsContext modelContext) { this.usage = annotation.usage(); this.region = annotation.region(); this.includeLazy = annotation.includeLazy(); @@ -37,7 +37,7 @@ public CacheAnnotation(Cache annotation, SourceModelBuildingContext modelContext /** * Used in creating annotation instances from Jandex variant */ - public CacheAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public CacheAnnotation(Map attributeValues, ModelsContext modelContext) { this.usage = (org.hibernate.annotations.CacheConcurrencyStrategy) attributeValues.get( "usage" ); this.region = (String) attributeValues.get( "region" ); this.includeLazy = (boolean) attributeValues.get( "includeLazy" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CacheableJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CacheableJpaAnnotation.java index ed2b363beb51..349420fd8c29 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CacheableJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CacheableJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.Cacheable; @@ -19,21 +19,21 @@ public class CacheableJpaAnnotation implements Cacheable { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CacheableJpaAnnotation(SourceModelBuildingContext modelContext) { + public CacheableJpaAnnotation(ModelsContext modelContext) { this.value = true; } /** * Used in creating annotation instances from JDK variant */ - public CacheableJpaAnnotation(Cacheable annotation, SourceModelBuildingContext modelContext) { + public CacheableJpaAnnotation(Cacheable annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public CacheableJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public CacheableJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (boolean) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CascadeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CascadeAnnotation.java index b10d9f1128f0..56d6e0b2e95a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CascadeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CascadeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.Cascade; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class CascadeAnnotation implements Cascade { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CascadeAnnotation(SourceModelBuildingContext modelContext) { + public CascadeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public CascadeAnnotation(Cascade annotation, SourceModelBuildingContext modelContext) { + public CascadeAnnotation(Cascade annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public CascadeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public CascadeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (org.hibernate.annotations.CascadeType[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CheckAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CheckAnnotation.java index e0aa3616bfd5..ec8bbf609e61 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CheckAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CheckAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.Check; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -19,14 +19,14 @@ public class CheckAnnotation implements Check { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CheckAnnotation(SourceModelBuildingContext modelContext) { + public CheckAnnotation(ModelsContext modelContext) { this.name = ""; } /** * Used in creating annotation instances from JDK variant */ - public CheckAnnotation(Check annotation, SourceModelBuildingContext modelContext) { + public CheckAnnotation(Check annotation, ModelsContext modelContext) { this.name = annotation.name(); this.constraints = annotation.constraints(); } @@ -34,7 +34,7 @@ public CheckAnnotation(Check annotation, SourceModelBuildingContext modelContext /** * Used in creating annotation instances from Jandex variant */ - public CheckAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public CheckAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.constraints = (String) attributeValues.get( "constraints" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CheckConstraintJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CheckConstraintJpaAnnotation.java index 6d154aa08d68..4760ae13c5fb 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CheckConstraintJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CheckConstraintJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.CheckConstraint; @@ -22,7 +22,7 @@ public class CheckConstraintJpaAnnotation implements CheckConstraint { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CheckConstraintJpaAnnotation(SourceModelBuildingContext modelContext) { + public CheckConstraintJpaAnnotation(ModelsContext modelContext) { this.name = ""; this.options = ""; } @@ -30,7 +30,7 @@ public CheckConstraintJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public CheckConstraintJpaAnnotation(CheckConstraint annotation, SourceModelBuildingContext modelContext) { + public CheckConstraintJpaAnnotation(CheckConstraint annotation, ModelsContext modelContext) { this.name = annotation.name(); this.constraint = annotation.constraint(); this.options = annotation.options(); @@ -39,7 +39,7 @@ public CheckConstraintJpaAnnotation(CheckConstraint annotation, SourceModelBuild /** * Used in creating annotation instances from Jandex variant */ - public CheckConstraintJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public CheckConstraintJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.constraint = (String) attributeValues.get( "constraint" ); this.options = (String) attributeValues.get( "options" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ChecksAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ChecksAnnotation.java index f3fe8b8a2053..4c2929f32800 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ChecksAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ChecksAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.Checks; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -23,20 +23,20 @@ public class ChecksAnnotation implements Checks, RepeatableContainer { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ChecksAnnotation(SourceModelBuildingContext modelContext) { + public ChecksAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public ChecksAnnotation(Checks annotation, SourceModelBuildingContext modelContext) { + public ChecksAnnotation(Checks annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, HibernateAnnotations.CHECKS, "value", modelContext ); } /** * Used in creating annotation instances from Jandex variant */ - public ChecksAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ChecksAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Check[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollateAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollateAnnotation.java index ffe897727eca..92ca282239fe 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollateAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollateAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.Collate; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class CollateAnnotation implements Collate { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CollateAnnotation(SourceModelBuildingContext modelContext) { + public CollateAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public CollateAnnotation(Collate annotation, SourceModelBuildingContext modelContext) { + public CollateAnnotation(Collate annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public CollateAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public CollateAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (String) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionClassificationXmlAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionClassificationXmlAnnotation.java index 017f95f36bff..bade70f54317 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionClassificationXmlAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionClassificationXmlAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.boot.internal.CollectionClassification; import org.hibernate.boot.internal.LimitedCollectionClassification; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -19,7 +19,7 @@ public class CollectionClassificationXmlAnnotation implements CollectionClassifi /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CollectionClassificationXmlAnnotation(SourceModelBuildingContext modelContext) { + public CollectionClassificationXmlAnnotation(ModelsContext modelContext) { } /** @@ -27,7 +27,7 @@ public CollectionClassificationXmlAnnotation(SourceModelBuildingContext modelCon */ public CollectionClassificationXmlAnnotation( CollectionClassification annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = annotation.value(); } @@ -36,7 +36,7 @@ public CollectionClassificationXmlAnnotation( */ public CollectionClassificationXmlAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (LimitedCollectionClassification) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdAnnotation.java index d10fb547ed18..5375d8741f7d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdAnnotation.java @@ -10,7 +10,7 @@ import org.hibernate.annotations.CollectionId; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.JpaAnnotations; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -24,7 +24,7 @@ public class CollectionIdAnnotation implements CollectionId { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CollectionIdAnnotation(SourceModelBuildingContext modelContext) { + public CollectionIdAnnotation(ModelsContext modelContext) { this.column = JpaAnnotations.COLUMN.createUsage( modelContext ); this.generatorImplementation = org.hibernate.id.IdentifierGenerator.class; this.generator = ""; @@ -33,7 +33,7 @@ public CollectionIdAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public CollectionIdAnnotation(CollectionId annotation, SourceModelBuildingContext modelContext) { + public CollectionIdAnnotation(CollectionId annotation, ModelsContext modelContext) { this.column = extractJdkValue( annotation, HibernateAnnotations.COLLECTION_ID, "column", modelContext ); this.generatorImplementation = annotation.generatorImplementation(); this.generator = annotation.generator(); @@ -42,7 +42,7 @@ public CollectionIdAnnotation(CollectionId annotation, SourceModelBuildingContex /** * Used in creating annotation instances from Jandex variant */ - public CollectionIdAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public CollectionIdAnnotation(Map attributeValues, ModelsContext modelContext) { this.column = (jakarta.persistence.Column) attributeValues.get( "column" ); this.generatorImplementation = (Class) attributeValues .get( "generatorImplementation" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJavaTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJavaTypeAnnotation.java index 50c98c96e827..24a44de23d8f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJavaTypeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJavaTypeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.CollectionIdJavaType; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class CollectionIdJavaTypeAnnotation implements CollectionIdJavaType { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CollectionIdJavaTypeAnnotation(SourceModelBuildingContext modelContext) { + public CollectionIdJavaTypeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public CollectionIdJavaTypeAnnotation(CollectionIdJavaType annotation, SourceModelBuildingContext modelContext) { + public CollectionIdJavaTypeAnnotation(CollectionIdJavaType annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public CollectionIdJavaTypeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public CollectionIdJavaTypeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class>) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJdbcTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJdbcTypeAnnotation.java index 274a4d462d3d..1801d5076ae5 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJdbcTypeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJdbcTypeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.CollectionIdJdbcType; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.type.descriptor.jdbc.JdbcType; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @@ -19,20 +19,20 @@ public class CollectionIdJdbcTypeAnnotation implements CollectionIdJdbcType { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CollectionIdJdbcTypeAnnotation(SourceModelBuildingContext modelContext) { + public CollectionIdJdbcTypeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public CollectionIdJdbcTypeAnnotation(CollectionIdJdbcType annotation, SourceModelBuildingContext modelContext) { + public CollectionIdJdbcTypeAnnotation(CollectionIdJdbcType annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public CollectionIdJdbcTypeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public CollectionIdJdbcTypeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJdbcTypeCodeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJdbcTypeCodeAnnotation.java index 4b58a37dbd35..13e9db0b0798 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJdbcTypeCodeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdJdbcTypeCodeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.CollectionIdJdbcTypeCode; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,7 +18,7 @@ public class CollectionIdJdbcTypeCodeAnnotation implements CollectionIdJdbcTypeC /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CollectionIdJdbcTypeCodeAnnotation(SourceModelBuildingContext modelContext) { + public CollectionIdJdbcTypeCodeAnnotation(ModelsContext modelContext) { } /** @@ -26,14 +26,14 @@ public CollectionIdJdbcTypeCodeAnnotation(SourceModelBuildingContext modelContex */ public CollectionIdJdbcTypeCodeAnnotation( CollectionIdJdbcTypeCode annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public CollectionIdJdbcTypeCodeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public CollectionIdJdbcTypeCodeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (int) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdMutabilityAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdMutabilityAnnotation.java index 6f63bef5620e..92fedd473811 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdMutabilityAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdMutabilityAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.CollectionIdMutability; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,7 +18,7 @@ public class CollectionIdMutabilityAnnotation implements CollectionIdMutability /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CollectionIdMutabilityAnnotation(SourceModelBuildingContext modelContext) { + public CollectionIdMutabilityAnnotation(ModelsContext modelContext) { } /** @@ -26,14 +26,14 @@ public CollectionIdMutabilityAnnotation(SourceModelBuildingContext modelContext) */ public CollectionIdMutabilityAnnotation( CollectionIdMutability annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public CollectionIdMutabilityAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public CollectionIdMutabilityAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class>) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdTypeAnnotation.java index 650ee23a16bf..58d6289d06cf 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdTypeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionIdTypeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.CollectionIdType; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.HibernateAnnotations.COLLECTION_ID_TYPE; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -22,14 +22,14 @@ public class CollectionIdTypeAnnotation implements CollectionIdType { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CollectionIdTypeAnnotation(SourceModelBuildingContext modelContext) { + public CollectionIdTypeAnnotation(ModelsContext modelContext) { this.parameters = new org.hibernate.annotations.Parameter[0]; } /** * Used in creating annotation instances from JDK variant */ - public CollectionIdTypeAnnotation(CollectionIdType annotation, SourceModelBuildingContext modelContext) { + public CollectionIdTypeAnnotation(CollectionIdType annotation, ModelsContext modelContext) { this.value = annotation.value(); this.parameters = extractJdkValue( annotation, COLLECTION_ID_TYPE, "parameters", modelContext ); } @@ -37,7 +37,7 @@ public CollectionIdTypeAnnotation(CollectionIdType annotation, SourceModelBuildi /** * Used in creating annotation instances from Jandex variant */ - public CollectionIdTypeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public CollectionIdTypeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class>) attributeValues.get( "value" ); this.parameters = (org.hibernate.annotations.Parameter[]) attributeValues.get( "parameters" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTableJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTableJpaAnnotation.java index 6f1722d43773..10eacab63795 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTableJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTableJpaAnnotation.java @@ -13,7 +13,7 @@ import org.hibernate.boot.models.xml.internal.db.ForeignKeyProcessing; import org.hibernate.boot.models.xml.internal.db.JoinColumnProcessing; import org.hibernate.boot.models.xml.spi.XmlDocumentContext; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.CollectionTable; @@ -41,7 +41,7 @@ public class CollectionTableJpaAnnotation implements CollectionTable, CommonTabl /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CollectionTableJpaAnnotation(SourceModelBuildingContext modelContext) { + public CollectionTableJpaAnnotation(ModelsContext modelContext) { this.name = ""; this.catalog = ""; this.schema = ""; @@ -55,7 +55,7 @@ public CollectionTableJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public CollectionTableJpaAnnotation(CollectionTable annotation, SourceModelBuildingContext modelContext) { + public CollectionTableJpaAnnotation(CollectionTable annotation, ModelsContext modelContext) { this.name = annotation.name(); this.catalog = annotation.catalog(); this.schema = annotation.schema(); @@ -69,7 +69,7 @@ public CollectionTableJpaAnnotation(CollectionTable annotation, SourceModelBuild /** * Used in creating annotation instances from Jandex variant */ - public CollectionTableJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public CollectionTableJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.catalog = (String) attributeValues.get( "catalog" ); this.schema = (String) attributeValues.get( "schema" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeAnnotation.java index bdb04602bed0..d10719aee939 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.CollectionType; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.HibernateAnnotations.COLLECTION_TYPE; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -22,14 +22,14 @@ public class CollectionTypeAnnotation implements CollectionType { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CollectionTypeAnnotation(SourceModelBuildingContext modelContext) { + public CollectionTypeAnnotation(ModelsContext modelContext) { this.parameters = new org.hibernate.annotations.Parameter[0]; } /** * Used in creating annotation instances from JDK variant */ - public CollectionTypeAnnotation(CollectionType annotation, SourceModelBuildingContext modelContext) { + public CollectionTypeAnnotation(CollectionType annotation, ModelsContext modelContext) { this.type = annotation.type(); this.parameters = extractJdkValue( annotation, COLLECTION_TYPE, "parameters", modelContext ); } @@ -37,7 +37,7 @@ public CollectionTypeAnnotation(CollectionType annotation, SourceModelBuildingCo /** * Used in creating annotation instances from Jandex variant */ - public CollectionTypeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public CollectionTypeAnnotation(Map attributeValues, ModelsContext modelContext) { this.type = (Class) attributeValues.get( "type" ); this.parameters = (org.hibernate.annotations.Parameter[]) attributeValues.get( "parameters" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeRegistrationAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeRegistrationAnnotation.java index 972db12d764b..3e14a4b4e79b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeRegistrationAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeRegistrationAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.CollectionTypeRegistration; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.HibernateAnnotations.COLLECTION_TYPE_REGISTRATION; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -23,7 +23,7 @@ public class CollectionTypeRegistrationAnnotation implements CollectionTypeRegis /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CollectionTypeRegistrationAnnotation(SourceModelBuildingContext modelContext) { + public CollectionTypeRegistrationAnnotation(ModelsContext modelContext) { this.parameters = new org.hibernate.annotations.Parameter[0]; } @@ -32,7 +32,7 @@ public CollectionTypeRegistrationAnnotation(SourceModelBuildingContext modelCont */ public CollectionTypeRegistrationAnnotation( CollectionTypeRegistration annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.classification = annotation.classification(); this.type = annotation.type(); this.parameters = extractJdkValue( annotation, COLLECTION_TYPE_REGISTRATION, "parameters", modelContext ); @@ -43,7 +43,7 @@ public CollectionTypeRegistrationAnnotation( */ public CollectionTypeRegistrationAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.classification = (org.hibernate.metamodel.CollectionClassification) attributeValues.get( "classification" ); this.type = (Class) attributeValues.get( "type" ); this.parameters = (org.hibernate.annotations.Parameter[]) attributeValues.get( "parameters" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeRegistrationsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeRegistrationsAnnotation.java index b92eb5458393..d8023e2d51f3 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeRegistrationsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CollectionTypeRegistrationsAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.CollectionTypeRegistrations; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -24,7 +24,7 @@ public class CollectionTypeRegistrationsAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CollectionTypeRegistrationsAnnotation(SourceModelBuildingContext modelContext) { + public CollectionTypeRegistrationsAnnotation(ModelsContext modelContext) { } /** @@ -32,7 +32,7 @@ public CollectionTypeRegistrationsAnnotation(SourceModelBuildingContext modelCon */ public CollectionTypeRegistrationsAnnotation( CollectionTypeRegistrations annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = extractJdkValue( annotation, HibernateAnnotations.COLLECTION_TYPE_REGISTRATIONS, @@ -46,7 +46,7 @@ public CollectionTypeRegistrationsAnnotation( */ public CollectionTypeRegistrationsAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (CollectionTypeRegistration[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnDefaultAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnDefaultAnnotation.java index d80e980ab893..9af524aa5c09 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnDefaultAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnDefaultAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.ColumnDefault; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class ColumnDefaultAnnotation implements ColumnDefault { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ColumnDefaultAnnotation(SourceModelBuildingContext modelContext) { + public ColumnDefaultAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public ColumnDefaultAnnotation(ColumnDefault annotation, SourceModelBuildingContext modelContext) { + public ColumnDefaultAnnotation(ColumnDefault annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public ColumnDefaultAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ColumnDefaultAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (String) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnJpaAnnotation.java index cf22d5edd356..9fb4e0dcbf4f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnJpaAnnotation.java @@ -15,7 +15,7 @@ import org.hibernate.boot.models.xml.internal.XmlAnnotationHelper; import org.hibernate.boot.models.xml.spi.XmlDocumentContext; import org.hibernate.internal.util.StringHelper; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.Column; @@ -51,7 +51,7 @@ public class ColumnJpaAnnotation implements Column, /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ColumnJpaAnnotation(SourceModelBuildingContext modelContext) { + public ColumnJpaAnnotation(ModelsContext modelContext) { this.name = ""; this.unique = false; this.nullable = true; @@ -71,7 +71,7 @@ public ColumnJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public ColumnJpaAnnotation(Column annotation, SourceModelBuildingContext modelContext) { + public ColumnJpaAnnotation(Column annotation, ModelsContext modelContext) { this.name = annotation.name(); this.unique = annotation.unique(); this.nullable = annotation.nullable(); @@ -91,7 +91,7 @@ public ColumnJpaAnnotation(Column annotation, SourceModelBuildingContext modelCo /** * Used in creating annotation instances from Jandex variant */ - public ColumnJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ColumnJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.unique = (boolean) attributeValues.get( "unique" ); this.nullable = (boolean) attributeValues.get( "nullable" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnResultJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnResultJpaAnnotation.java index 1b8a403fb111..e57fda352575 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnResultJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnResultJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.ColumnResult; @@ -20,14 +20,14 @@ public class ColumnResultJpaAnnotation implements ColumnResult { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ColumnResultJpaAnnotation(SourceModelBuildingContext modelContext) { + public ColumnResultJpaAnnotation(ModelsContext modelContext) { this.type = void.class; } /** * Used in creating annotation instances from JDK variant */ - public ColumnResultJpaAnnotation(ColumnResult annotation, SourceModelBuildingContext modelContext) { + public ColumnResultJpaAnnotation(ColumnResult annotation, ModelsContext modelContext) { this.name = annotation.name(); this.type = annotation.type(); } @@ -35,7 +35,7 @@ public ColumnResultJpaAnnotation(ColumnResult annotation, SourceModelBuildingCon /** * Used in creating annotation instances from Jandex variant */ - public ColumnResultJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ColumnResultJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.type = (Class) attributeValues.get( "type" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnTransformerAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnTransformerAnnotation.java index a525cbd19ef0..d07391cc1a1f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnTransformerAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnTransformerAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.ColumnTransformer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -20,7 +20,7 @@ public class ColumnTransformerAnnotation implements ColumnTransformer { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ColumnTransformerAnnotation(SourceModelBuildingContext modelContext) { + public ColumnTransformerAnnotation(ModelsContext modelContext) { this.forColumn = ""; this.read = ""; this.write = ""; @@ -29,7 +29,7 @@ public ColumnTransformerAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public ColumnTransformerAnnotation(ColumnTransformer annotation, SourceModelBuildingContext modelContext) { + public ColumnTransformerAnnotation(ColumnTransformer annotation, ModelsContext modelContext) { this.forColumn = annotation.forColumn(); this.read = annotation.read(); this.write = annotation.write(); @@ -38,7 +38,7 @@ public ColumnTransformerAnnotation(ColumnTransformer annotation, SourceModelBuil /** * Used in creating annotation instances from Jandex variant */ - public ColumnTransformerAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ColumnTransformerAnnotation(Map attributeValues, ModelsContext modelContext) { this.forColumn = (String) attributeValues.get( "forColumn" ); this.read = (String) attributeValues.get( "read" ); this.write = (String) attributeValues.get( "write" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnTransformersAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnTransformersAnnotation.java index 1ef67561dc73..7bf85877042f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnTransformersAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnTransformersAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.ColumnTransformers; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -20,14 +20,14 @@ public class ColumnTransformersAnnotation implements ColumnTransformers, RepeatableContainer { private org.hibernate.annotations.ColumnTransformer[] value; - public ColumnTransformersAnnotation(SourceModelBuildingContext modelContext) { + public ColumnTransformersAnnotation(ModelsContext modelContext) { } - public ColumnTransformersAnnotation(ColumnTransformers annotation, SourceModelBuildingContext modelContext) { + public ColumnTransformersAnnotation(ColumnTransformers annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, HibernateAnnotations.COLUMN_TRANSFORMERS, "value", modelContext ); } - public ColumnTransformersAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ColumnTransformersAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (ColumnTransformer[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnsAnnotation.java index 7f2872580f7c..d119ae9d5f56 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ColumnsAnnotation.java @@ -10,7 +10,7 @@ import org.hibernate.annotations.Columns; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.models.spi.AnnotationDescriptor; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -24,20 +24,20 @@ public class ColumnsAnnotation implements Columns { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ColumnsAnnotation(SourceModelBuildingContext modelContext) { + public ColumnsAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public ColumnsAnnotation(Columns annotation, SourceModelBuildingContext modelContext) { + public ColumnsAnnotation(Columns annotation, ModelsContext modelContext) { this.columns = extractJdkValue( annotation, HibernateAnnotations.COLUMNS, "columns", modelContext ); } /** * Used in creating annotation instances from Jandex variant */ - public ColumnsAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ColumnsAnnotation(Map attributeValues, ModelsContext modelContext) { this.columns = (jakarta.persistence.Column[]) attributeValues.get( "columns" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CommentAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CommentAnnotation.java index f26833c4b792..261541396b7c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CommentAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CommentAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.Comment; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -19,14 +19,14 @@ public class CommentAnnotation implements Comment { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CommentAnnotation(SourceModelBuildingContext modelContext) { + public CommentAnnotation(ModelsContext modelContext) { this.on = ""; } /** * Used in creating annotation instances from JDK variant */ - public CommentAnnotation(Comment annotation, SourceModelBuildingContext modelContext) { + public CommentAnnotation(Comment annotation, ModelsContext modelContext) { this.value = annotation.value(); this.on = annotation.on(); } @@ -34,7 +34,7 @@ public CommentAnnotation(Comment annotation, SourceModelBuildingContext modelCon /** * Used in creating annotation instances from Jandex variant */ - public CommentAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public CommentAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (String) attributeValues.get( "value" ); this.on = (String) attributeValues.get( "on" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CommentsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CommentsAnnotation.java index b410c74d79f7..4929bc43ab35 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CommentsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CommentsAnnotation.java @@ -10,7 +10,7 @@ import org.hibernate.annotations.Comments; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -23,20 +23,20 @@ public class CommentsAnnotation implements Comments, RepeatableContainer attributeValues, SourceModelBuildingContext modelContext) { + public CommentsAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (org.hibernate.annotations.Comment[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeAnnotation.java index 4f06b8816b84..337e8d301a90 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.CompositeType; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class CompositeTypeAnnotation implements CompositeType { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CompositeTypeAnnotation(SourceModelBuildingContext modelContext) { + public CompositeTypeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public CompositeTypeAnnotation(CompositeType annotation, SourceModelBuildingContext modelContext) { + public CompositeTypeAnnotation(CompositeType annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public CompositeTypeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public CompositeTypeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class>) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeRegistrationAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeRegistrationAnnotation.java index ed2bf8714da7..21d22adc17b5 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeRegistrationAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeRegistrationAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.CompositeTypeRegistration; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -19,7 +19,7 @@ public class CompositeTypeRegistrationAnnotation implements CompositeTypeRegistr /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CompositeTypeRegistrationAnnotation(SourceModelBuildingContext modelContext) { + public CompositeTypeRegistrationAnnotation(ModelsContext modelContext) { } /** @@ -27,7 +27,7 @@ public CompositeTypeRegistrationAnnotation(SourceModelBuildingContext modelConte */ public CompositeTypeRegistrationAnnotation( CompositeTypeRegistration annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.embeddableClass = annotation.embeddableClass(); this.userType = annotation.userType(); } @@ -35,7 +35,7 @@ public CompositeTypeRegistrationAnnotation( /** * Used in creating annotation instances from Jandex variant */ - public CompositeTypeRegistrationAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public CompositeTypeRegistrationAnnotation(Map attributeValues, ModelsContext modelContext) { this.embeddableClass = (Class) attributeValues.get( "embeddableClass" ); this.userType = (Class>) attributeValues.get( "userType" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeRegistrationsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeRegistrationsAnnotation.java index 26c126337343..2cd2487f6897 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeRegistrationsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CompositeTypeRegistrationsAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.CompositeTypeRegistrations; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -24,7 +24,7 @@ public class CompositeTypeRegistrationsAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CompositeTypeRegistrationsAnnotation(SourceModelBuildingContext modelContext) { + public CompositeTypeRegistrationsAnnotation(ModelsContext modelContext) { } /** @@ -32,7 +32,7 @@ public CompositeTypeRegistrationsAnnotation(SourceModelBuildingContext modelCont */ public CompositeTypeRegistrationsAnnotation( CompositeTypeRegistrations annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = extractJdkValue( annotation, HibernateAnnotations.COMPOSITE_TYPE_REGISTRATIONS, @@ -46,7 +46,7 @@ public CompositeTypeRegistrationsAnnotation( */ public CompositeTypeRegistrationsAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (CompositeTypeRegistration[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConcreteProxyAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConcreteProxyAnnotation.java index 1ead91972b54..f586fbc74bc6 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConcreteProxyAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConcreteProxyAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.ConcreteProxy; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -17,19 +17,19 @@ public class ConcreteProxyAnnotation implements ConcreteProxy { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ConcreteProxyAnnotation(SourceModelBuildingContext modelContext) { + public ConcreteProxyAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public ConcreteProxyAnnotation(ConcreteProxy annotation, SourceModelBuildingContext modelContext) { + public ConcreteProxyAnnotation(ConcreteProxy annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public ConcreteProxyAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ConcreteProxyAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConstructorResultJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConstructorResultJpaAnnotation.java index 5d82df0eed6e..256f4287e6c8 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConstructorResultJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConstructorResultJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.ConstructorResult; @@ -24,13 +24,13 @@ public class ConstructorResultJpaAnnotation implements ConstructorResult { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ConstructorResultJpaAnnotation(SourceModelBuildingContext modelContext) { + public ConstructorResultJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public ConstructorResultJpaAnnotation(ConstructorResult annotation, SourceModelBuildingContext modelContext) { + public ConstructorResultJpaAnnotation(ConstructorResult annotation, ModelsContext modelContext) { this.targetClass = annotation.targetClass(); this.columns = extractJdkValue( annotation, CONSTRUCTOR_RESULT, "columns", modelContext ); } @@ -40,7 +40,7 @@ public ConstructorResultJpaAnnotation(ConstructorResult annotation, SourceModelB */ public ConstructorResultJpaAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.targetClass = (Class) attributeValues.get( "targetClass" ); this.columns = (jakarta.persistence.ColumnResult[]) attributeValues.get( "columns" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConvertJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConvertJpaAnnotation.java index 622fa23874e8..f31d1f78339c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConvertJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConvertJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.Convert; @@ -22,7 +22,7 @@ public class ConvertJpaAnnotation implements Convert { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ConvertJpaAnnotation(SourceModelBuildingContext modelContext) { + public ConvertJpaAnnotation(ModelsContext modelContext) { this.converter = jakarta.persistence.AttributeConverter.class; this.attributeName = ""; this.disableConversion = false; @@ -31,7 +31,7 @@ public ConvertJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public ConvertJpaAnnotation(Convert annotation, SourceModelBuildingContext modelContext) { + public ConvertJpaAnnotation(Convert annotation, ModelsContext modelContext) { this.converter = annotation.converter(); this.attributeName = annotation.attributeName(); this.disableConversion = annotation.disableConversion(); @@ -40,7 +40,7 @@ public ConvertJpaAnnotation(Convert annotation, SourceModelBuildingContext model /** * Used in creating annotation instances from Jandex variant */ - public ConvertJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ConvertJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.converter = (Class) attributeValues.get( "converter" ); this.attributeName = (String) attributeValues.get( "attributeName" ); this.disableConversion = (boolean) attributeValues.get( "disableConversion" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterJpaAnnotation.java index b03696296857..ff7e1daca247 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.Converter; @@ -20,21 +20,21 @@ public class ConverterJpaAnnotation implements Converter { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ConverterJpaAnnotation(SourceModelBuildingContext modelContext) { + public ConverterJpaAnnotation(ModelsContext modelContext) { this.autoApply = false; } /** * Used in creating annotation instances from JDK variant */ - public ConverterJpaAnnotation(Converter annotation, SourceModelBuildingContext modelContext) { + public ConverterJpaAnnotation(Converter annotation, ModelsContext modelContext) { this.autoApply = annotation.autoApply(); } /** * Used in creating annotation instances from Jandex variant */ - public ConverterJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ConverterJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.autoApply = (boolean) attributeValues.get( "autoApply" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterRegistrationAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterRegistrationAnnotation.java index 93f6d69dacdb..dc2aa40550eb 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterRegistrationAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterRegistrationAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.ConverterRegistration; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -20,7 +20,7 @@ public class ConverterRegistrationAnnotation implements ConverterRegistration { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ConverterRegistrationAnnotation(SourceModelBuildingContext modelContext) { + public ConverterRegistrationAnnotation(ModelsContext modelContext) { this.domainType = void.class; this.autoApply = true; } @@ -28,7 +28,7 @@ public ConverterRegistrationAnnotation(SourceModelBuildingContext modelContext) /** * Used in creating annotation instances from JDK variant */ - public ConverterRegistrationAnnotation(ConverterRegistration annotation, SourceModelBuildingContext modelContext) { + public ConverterRegistrationAnnotation(ConverterRegistration annotation, ModelsContext modelContext) { this.converter = annotation.converter(); this.domainType = annotation.domainType(); this.autoApply = annotation.autoApply(); @@ -39,7 +39,7 @@ public ConverterRegistrationAnnotation(ConverterRegistration annotation, SourceM */ public ConverterRegistrationAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.converter = (Class>) attributeValues.get( "converter" ); this.domainType = (Class) attributeValues.get( "domainType" ); this.autoApply = (boolean) attributeValues.get( "autoApply" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterRegistrationsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterRegistrationsAnnotation.java index b9310836c9bc..da38dec64222 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterRegistrationsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConverterRegistrationsAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.ConverterRegistrations; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -24,7 +24,7 @@ public class ConverterRegistrationsAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ConverterRegistrationsAnnotation(SourceModelBuildingContext modelContext) { + public ConverterRegistrationsAnnotation(ModelsContext modelContext) { } /** @@ -32,7 +32,7 @@ public ConverterRegistrationsAnnotation(SourceModelBuildingContext modelContext) */ public ConverterRegistrationsAnnotation( ConverterRegistrations annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = extractJdkValue( annotation, HibernateAnnotations.CONVERTER_REGISTRATIONS, "value", modelContext ); } @@ -41,7 +41,7 @@ public ConverterRegistrationsAnnotation( */ public ConverterRegistrationsAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (ConverterRegistration[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConvertsJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConvertsJpaAnnotation.java index 7b4e8b78dd33..d0b243973c59 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConvertsJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ConvertsJpaAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.boot.models.JpaAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.Converts; @@ -23,13 +23,13 @@ public class ConvertsJpaAnnotation implements Converts, RepeatableContainer attributeValues, SourceModelBuildingContext modelContext) { + public ConvertsJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (jakarta.persistence.Convert[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CreationTimestampAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CreationTimestampAnnotation.java index 90c896585535..32129daf734d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CreationTimestampAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CreationTimestampAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.CreationTimestamp; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,21 +18,21 @@ public class CreationTimestampAnnotation implements CreationTimestamp { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CreationTimestampAnnotation(SourceModelBuildingContext modelContext) { + public CreationTimestampAnnotation(ModelsContext modelContext) { this.source = org.hibernate.annotations.SourceType.VM; } /** * Used in creating annotation instances from JDK variant */ - public CreationTimestampAnnotation(CreationTimestamp annotation, SourceModelBuildingContext modelContext) { + public CreationTimestampAnnotation(CreationTimestamp annotation, ModelsContext modelContext) { this.source = annotation.source(); } /** * Used in creating annotation instances from Jandex variant */ - public CreationTimestampAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public CreationTimestampAnnotation(Map attributeValues, ModelsContext modelContext) { this.source = (org.hibernate.annotations.SourceType) attributeValues.get( "source" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CurrentTimestampAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CurrentTimestampAnnotation.java index 7925a3068ed4..77e34a37c94d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CurrentTimestampAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/CurrentTimestampAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.CurrentTimestamp; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.generator.EventType.INSERT; import static org.hibernate.generator.EventType.UPDATE; @@ -22,7 +22,7 @@ public class CurrentTimestampAnnotation implements CurrentTimestamp { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public CurrentTimestampAnnotation(SourceModelBuildingContext modelContext) { + public CurrentTimestampAnnotation(ModelsContext modelContext) { this.event = new org.hibernate.generator.EventType[] {INSERT, UPDATE}; this.source = org.hibernate.annotations.SourceType.DB; } @@ -30,7 +30,7 @@ public CurrentTimestampAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public CurrentTimestampAnnotation(CurrentTimestamp annotation, SourceModelBuildingContext modelContext) { + public CurrentTimestampAnnotation(CurrentTimestamp annotation, ModelsContext modelContext) { this.event = annotation.event(); this.source = annotation.source(); } @@ -38,7 +38,7 @@ public CurrentTimestampAnnotation(CurrentTimestamp annotation, SourceModelBuildi /** * Used in creating annotation instances from Jandex variant */ - public CurrentTimestampAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public CurrentTimestampAnnotation(Map attributeValues, ModelsContext modelContext) { this.event = (org.hibernate.generator.EventType[]) attributeValues.get( "event" ); this.source = (org.hibernate.annotations.SourceType) attributeValues.get( "source" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorColumnJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorColumnJpaAnnotation.java index 4bb8e1287e7c..b573ce7f6ac6 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorColumnJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorColumnJpaAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.boot.models.annotations.spi.ColumnDetails; import org.hibernate.boot.models.xml.spi.XmlDocumentContext; import org.hibernate.internal.util.StringHelper; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.DiscriminatorColumn; @@ -28,7 +28,7 @@ public class DiscriminatorColumnJpaAnnotation implements DiscriminatorColumn, Co /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public DiscriminatorColumnJpaAnnotation(SourceModelBuildingContext modelContext) { + public DiscriminatorColumnJpaAnnotation(ModelsContext modelContext) { this.name = "DTYPE"; this.discriminatorType = jakarta.persistence.DiscriminatorType.STRING; this.columnDefinition = ""; @@ -39,7 +39,7 @@ public DiscriminatorColumnJpaAnnotation(SourceModelBuildingContext modelContext) /** * Used in creating annotation instances from JDK variant */ - public DiscriminatorColumnJpaAnnotation(DiscriminatorColumn annotation, SourceModelBuildingContext modelContext) { + public DiscriminatorColumnJpaAnnotation(DiscriminatorColumn annotation, ModelsContext modelContext) { this.name = annotation.name(); this.discriminatorType = annotation.discriminatorType(); this.columnDefinition = annotation.columnDefinition(); @@ -52,7 +52,7 @@ public DiscriminatorColumnJpaAnnotation(DiscriminatorColumn annotation, SourceMo */ public DiscriminatorColumnJpaAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.discriminatorType = (jakarta.persistence.DiscriminatorType) attributeValues.get( "discriminatorType" ); this.columnDefinition = (String) attributeValues.get( "columnDefinition" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorFormulaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorFormulaAnnotation.java index 2679aee54572..ea8eba29f5d2 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorFormulaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorFormulaAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.DiscriminatorFormula; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -19,14 +19,14 @@ public class DiscriminatorFormulaAnnotation implements DiscriminatorFormula { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public DiscriminatorFormulaAnnotation(SourceModelBuildingContext modelContext) { + public DiscriminatorFormulaAnnotation(ModelsContext modelContext) { this.discriminatorType = jakarta.persistence.DiscriminatorType.STRING; } /** * Used in creating annotation instances from JDK variant */ - public DiscriminatorFormulaAnnotation(DiscriminatorFormula annotation, SourceModelBuildingContext modelContext) { + public DiscriminatorFormulaAnnotation(DiscriminatorFormula annotation, ModelsContext modelContext) { this.value = annotation.value(); this.discriminatorType = annotation.discriminatorType(); } @@ -36,7 +36,7 @@ public DiscriminatorFormulaAnnotation(DiscriminatorFormula annotation, SourceMod */ public DiscriminatorFormulaAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (String) attributeValues.get( "value" ); this.discriminatorType = (jakarta.persistence.DiscriminatorType) attributeValues.get( "discriminatorType" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorOptionsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorOptionsAnnotation.java index e1759f5a2f37..935890dcf775 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorOptionsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorOptionsAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.DiscriminatorOptions; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -19,7 +19,7 @@ public class DiscriminatorOptionsAnnotation implements DiscriminatorOptions { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public DiscriminatorOptionsAnnotation(SourceModelBuildingContext modelContext) { + public DiscriminatorOptionsAnnotation(ModelsContext modelContext) { this.force = false; this.insert = true; } @@ -27,7 +27,7 @@ public DiscriminatorOptionsAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public DiscriminatorOptionsAnnotation(DiscriminatorOptions annotation, SourceModelBuildingContext modelContext) { + public DiscriminatorOptionsAnnotation(DiscriminatorOptions annotation, ModelsContext modelContext) { this.force = annotation.force(); this.insert = annotation.insert(); } @@ -35,7 +35,7 @@ public DiscriminatorOptionsAnnotation(DiscriminatorOptions annotation, SourceMod /** * Used in creating annotation instances from Jandex variant */ - public DiscriminatorOptionsAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public DiscriminatorOptionsAnnotation(Map attributeValues, ModelsContext modelContext) { this.force = (boolean) attributeValues.get( "force"); this.insert = (boolean) attributeValues.get( "insert"); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorValueJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorValueJpaAnnotation.java index 2d570ab1e172..ad6e5c1a45a3 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorValueJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DiscriminatorValueJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.DiscriminatorValue; @@ -19,13 +19,13 @@ public class DiscriminatorValueJpaAnnotation implements DiscriminatorValue { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public DiscriminatorValueJpaAnnotation(SourceModelBuildingContext modelContext) { + public DiscriminatorValueJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public DiscriminatorValueJpaAnnotation(DiscriminatorValue annotation, SourceModelBuildingContext modelContext) { + public DiscriminatorValueJpaAnnotation(DiscriminatorValue annotation, ModelsContext modelContext) { this.value = annotation.value(); } @@ -34,7 +34,7 @@ public DiscriminatorValueJpaAnnotation(DiscriminatorValue annotation, SourceMode */ public DiscriminatorValueJpaAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (String) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DynamicInsertAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DynamicInsertAnnotation.java index 091e5744ea4a..d02a7a7df434 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DynamicInsertAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DynamicInsertAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.DynamicInsert; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -17,19 +17,19 @@ public class DynamicInsertAnnotation implements DynamicInsert { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public DynamicInsertAnnotation(SourceModelBuildingContext modelContext) { + public DynamicInsertAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public DynamicInsertAnnotation(DynamicInsert annotation, SourceModelBuildingContext modelContext) { + public DynamicInsertAnnotation(DynamicInsert annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public DynamicInsertAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public DynamicInsertAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DynamicUpdateAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DynamicUpdateAnnotation.java index 683ed1e00686..fe79da3f6303 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DynamicUpdateAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/DynamicUpdateAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,19 +18,19 @@ public class DynamicUpdateAnnotation implements DynamicUpdate { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public DynamicUpdateAnnotation(SourceModelBuildingContext modelContext) { + public DynamicUpdateAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public DynamicUpdateAnnotation(DynamicUpdate annotation, SourceModelBuildingContext modelContext) { + public DynamicUpdateAnnotation(DynamicUpdate annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public DynamicUpdateAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public DynamicUpdateAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ElementCollectionJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ElementCollectionJpaAnnotation.java index 23b58db23562..87328fb156bb 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ElementCollectionJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ElementCollectionJpaAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.boot.models.annotations.spi.AttributeMarker; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.ElementCollection; @@ -21,7 +21,7 @@ public class ElementCollectionJpaAnnotation implements ElementCollection, Attrib /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ElementCollectionJpaAnnotation(SourceModelBuildingContext modelContext) { + public ElementCollectionJpaAnnotation(ModelsContext modelContext) { this.targetClass = void.class; this.fetch = jakarta.persistence.FetchType.LAZY; } @@ -29,7 +29,7 @@ public ElementCollectionJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public ElementCollectionJpaAnnotation(ElementCollection annotation, SourceModelBuildingContext modelContext) { + public ElementCollectionJpaAnnotation(ElementCollection annotation, ModelsContext modelContext) { this.targetClass = annotation.targetClass(); this.fetch = annotation.fetch(); } @@ -39,7 +39,7 @@ public ElementCollectionJpaAnnotation(ElementCollection annotation, SourceModelB */ public ElementCollectionJpaAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.targetClass = (Class) attributeValues.get( "targetClass" ); this.fetch = (jakarta.persistence.FetchType) attributeValues.get( "fetch" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorAnnotation.java index eb9fc5de5f4d..ad5cf43b60d2 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.EmbeddableInstantiator; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,7 +18,7 @@ public class EmbeddableInstantiatorAnnotation implements EmbeddableInstantiator /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public EmbeddableInstantiatorAnnotation(SourceModelBuildingContext modelContext) { + public EmbeddableInstantiatorAnnotation(ModelsContext modelContext) { } /** @@ -26,7 +26,7 @@ public EmbeddableInstantiatorAnnotation(SourceModelBuildingContext modelContext) */ public EmbeddableInstantiatorAnnotation( EmbeddableInstantiator annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = annotation.value(); } @@ -35,7 +35,7 @@ public EmbeddableInstantiatorAnnotation( */ public EmbeddableInstantiatorAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (Class) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorRegistrationAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorRegistrationAnnotation.java index 8fd4dc0d1fe5..b5eba1911982 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorRegistrationAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorRegistrationAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.EmbeddableInstantiatorRegistration; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -19,7 +19,7 @@ public class EmbeddableInstantiatorRegistrationAnnotation implements EmbeddableI /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public EmbeddableInstantiatorRegistrationAnnotation(SourceModelBuildingContext modelContext) { + public EmbeddableInstantiatorRegistrationAnnotation(ModelsContext modelContext) { } /** @@ -27,7 +27,7 @@ public EmbeddableInstantiatorRegistrationAnnotation(SourceModelBuildingContext m */ public EmbeddableInstantiatorRegistrationAnnotation( EmbeddableInstantiatorRegistration annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.embeddableClass = annotation.embeddableClass(); this.instantiator = annotation.instantiator(); } @@ -37,7 +37,7 @@ public EmbeddableInstantiatorRegistrationAnnotation( */ public EmbeddableInstantiatorRegistrationAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.embeddableClass = (Class) attributeValues.get( "embeddableClass" ); this.instantiator = (Class) attributeValues .get( "instantiator" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorRegistrationsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorRegistrationsAnnotation.java index c6bd8866e9a1..6bb4666082a7 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorRegistrationsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableInstantiatorRegistrationsAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.EmbeddableInstantiatorRegistrations; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -24,7 +24,7 @@ public class EmbeddableInstantiatorRegistrationsAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public EmbeddableInstantiatorRegistrationsAnnotation(SourceModelBuildingContext modelContext) { + public EmbeddableInstantiatorRegistrationsAnnotation(ModelsContext modelContext) { } /** @@ -32,7 +32,7 @@ public EmbeddableInstantiatorRegistrationsAnnotation(SourceModelBuildingContext */ public EmbeddableInstantiatorRegistrationsAnnotation( EmbeddableInstantiatorRegistrations annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = extractJdkValue( annotation, HibernateAnnotations.EMBEDDABLE_INSTANTIATOR_REGISTRATIONS, @@ -46,7 +46,7 @@ public EmbeddableInstantiatorRegistrationsAnnotation( */ public EmbeddableInstantiatorRegistrationsAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (EmbeddableInstantiatorRegistration[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableJpaAnnotation.java index f804eb241ab8..a78884aa8136 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddableJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.Embeddable; @@ -18,19 +18,19 @@ public class EmbeddableJpaAnnotation implements Embeddable { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public EmbeddableJpaAnnotation(SourceModelBuildingContext modelContext) { + public EmbeddableJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public EmbeddableJpaAnnotation(Embeddable annotation, SourceModelBuildingContext modelContext) { + public EmbeddableJpaAnnotation(Embeddable annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public EmbeddableJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public EmbeddableJpaAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddedColumnNamingAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddedColumnNamingAnnotation.java index 904c4453a2a0..65521ba2d6c0 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddedColumnNamingAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddedColumnNamingAnnotation.java @@ -5,7 +5,7 @@ package org.hibernate.boot.models.annotations.internal; import org.hibernate.annotations.EmbeddedColumnNaming; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import java.lang.annotation.Annotation; import java.util.Map; @@ -17,7 +17,7 @@ public class EmbeddedColumnNamingAnnotation implements EmbeddedColumnNaming { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public EmbeddedColumnNamingAnnotation(SourceModelBuildingContext modelContext) { + public EmbeddedColumnNamingAnnotation(ModelsContext modelContext) { } /** @@ -25,7 +25,7 @@ public EmbeddedColumnNamingAnnotation(SourceModelBuildingContext modelContext) { */ public EmbeddedColumnNamingAnnotation( EmbeddedColumnNaming annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = annotation.value(); } @@ -34,7 +34,7 @@ public EmbeddedColumnNamingAnnotation( */ public EmbeddedColumnNamingAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (String) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddedIdJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddedIdJpaAnnotation.java index 46546dbc1323..c4728defcf2d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddedIdJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddedIdJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.EmbeddedId; @@ -17,19 +17,19 @@ public class EmbeddedIdJpaAnnotation implements EmbeddedId { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public EmbeddedIdJpaAnnotation(SourceModelBuildingContext modelContext) { + public EmbeddedIdJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public EmbeddedIdJpaAnnotation(EmbeddedId annotation, SourceModelBuildingContext modelContext) { + public EmbeddedIdJpaAnnotation(EmbeddedId annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public EmbeddedIdJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public EmbeddedIdJpaAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddedJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddedJpaAnnotation.java index 993d82bd22bc..97d790558253 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddedJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EmbeddedJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.Embedded; @@ -18,19 +18,19 @@ public class EmbeddedJpaAnnotation implements Embedded { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public EmbeddedJpaAnnotation(SourceModelBuildingContext modelContext) { + public EmbeddedJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public EmbeddedJpaAnnotation(Embedded annotation, SourceModelBuildingContext modelContext) { + public EmbeddedJpaAnnotation(Embedded annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public EmbeddedJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public EmbeddedJpaAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityJpaAnnotation.java index ceb893b18614..8bc9b7e2b35a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.Entity; @@ -19,21 +19,21 @@ public class EntityJpaAnnotation implements Entity { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public EntityJpaAnnotation(SourceModelBuildingContext modelContext) { + public EntityJpaAnnotation(ModelsContext modelContext) { this.name = ""; } /** * Used in creating annotation instances from JDK variant */ - public EntityJpaAnnotation(Entity annotation, SourceModelBuildingContext modelContext) { + public EntityJpaAnnotation(Entity annotation, ModelsContext modelContext) { this.name = annotation.name(); } /** * Used in creating annotation instances from Jandex variant */ - public EntityJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public EntityJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityListenersJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityListenersJpaAnnotation.java index 6b4ea2495c93..fde5596c88ac 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityListenersJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityListenersJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.EntityListeners; @@ -19,20 +19,20 @@ public class EntityListenersJpaAnnotation implements EntityListeners { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public EntityListenersJpaAnnotation(SourceModelBuildingContext modelContext) { + public EntityListenersJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public EntityListenersJpaAnnotation(EntityListeners annotation, SourceModelBuildingContext modelContext) { + public EntityListenersJpaAnnotation(EntityListeners annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public EntityListenersJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public EntityListenersJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityResultJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityResultJpaAnnotation.java index c58f763860e0..e6a79fe046af 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityResultJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EntityResultJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.EntityResult; @@ -22,7 +22,7 @@ public class EntityResultJpaAnnotation implements EntityResult { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public EntityResultJpaAnnotation(SourceModelBuildingContext modelContext) { + public EntityResultJpaAnnotation(ModelsContext modelContext) { this.lockMode = jakarta.persistence.LockModeType.OPTIMISTIC; this.fields = new jakarta.persistence.FieldResult[0]; this.discriminatorColumn = ""; @@ -31,7 +31,7 @@ public EntityResultJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public EntityResultJpaAnnotation(EntityResult annotation, SourceModelBuildingContext modelContext) { + public EntityResultJpaAnnotation(EntityResult annotation, ModelsContext modelContext) { this.entityClass = annotation.entityClass(); this.lockMode = annotation.lockMode(); this.fields = annotation.fields(); @@ -41,7 +41,7 @@ public EntityResultJpaAnnotation(EntityResult annotation, SourceModelBuildingCon /** * Used in creating annotation instances from Jandex variant */ - public EntityResultJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public EntityResultJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.entityClass = (Class) attributeValues.get( "entityClass" ); this.lockMode = (jakarta.persistence.LockModeType) attributeValues.get( "lockMode" ); this.fields = (jakarta.persistence.FieldResult[]) attributeValues.get( "fields" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EnumeratedJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EnumeratedJpaAnnotation.java index d43fe66dd339..92ddad2b291f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EnumeratedJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EnumeratedJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.Enumerated; @@ -19,21 +19,21 @@ public class EnumeratedJpaAnnotation implements Enumerated { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public EnumeratedJpaAnnotation(SourceModelBuildingContext modelContext) { + public EnumeratedJpaAnnotation(ModelsContext modelContext) { this.value = jakarta.persistence.EnumType.ORDINAL; } /** * Used in creating annotation instances from JDK variant */ - public EnumeratedJpaAnnotation(Enumerated annotation, SourceModelBuildingContext modelContext) { + public EnumeratedJpaAnnotation(Enumerated annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public EnumeratedJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public EnumeratedJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (jakarta.persistence.EnumType) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EnumeratedValueJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EnumeratedValueJpaAnnotation.java index 3828ed1cc276..6d772a81d7e7 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EnumeratedValueJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/EnumeratedValueJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.EnumeratedValue; @@ -17,19 +17,19 @@ public class EnumeratedValueJpaAnnotation implements EnumeratedValue { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public EnumeratedValueJpaAnnotation(SourceModelBuildingContext modelContext) { + public EnumeratedValueJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public EnumeratedValueJpaAnnotation(EnumeratedValue annotation, SourceModelBuildingContext modelContext) { + public EnumeratedValueJpaAnnotation(EnumeratedValue annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public EnumeratedValueJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public EnumeratedValueJpaAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExcludeDefaultListenersJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExcludeDefaultListenersJpaAnnotation.java index f1060cdcd383..f4b3c6846dea 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExcludeDefaultListenersJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExcludeDefaultListenersJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.ExcludeDefaultListeners; @@ -18,7 +18,7 @@ public class ExcludeDefaultListenersJpaAnnotation implements ExcludeDefaultListe /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ExcludeDefaultListenersJpaAnnotation(SourceModelBuildingContext modelContext) { + public ExcludeDefaultListenersJpaAnnotation(ModelsContext modelContext) { } /** @@ -26,7 +26,7 @@ public ExcludeDefaultListenersJpaAnnotation(SourceModelBuildingContext modelCont */ public ExcludeDefaultListenersJpaAnnotation( ExcludeDefaultListeners annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { } /** @@ -34,7 +34,7 @@ public ExcludeDefaultListenersJpaAnnotation( */ public ExcludeDefaultListenersJpaAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExcludeSuperclassListenersJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExcludeSuperclassListenersJpaAnnotation.java index 46cd247dca0b..0f4a2d1ed582 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExcludeSuperclassListenersJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExcludeSuperclassListenersJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.ExcludeSuperclassListeners; @@ -18,7 +18,7 @@ public class ExcludeSuperclassListenersJpaAnnotation implements ExcludeSuperclas /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ExcludeSuperclassListenersJpaAnnotation(SourceModelBuildingContext modelContext) { + public ExcludeSuperclassListenersJpaAnnotation(ModelsContext modelContext) { } /** @@ -26,7 +26,7 @@ public ExcludeSuperclassListenersJpaAnnotation(SourceModelBuildingContext modelC */ public ExcludeSuperclassListenersJpaAnnotation( ExcludeSuperclassListeners annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { } /** @@ -34,7 +34,7 @@ public ExcludeSuperclassListenersJpaAnnotation( */ public ExcludeSuperclassListenersJpaAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExtendsXmlAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExtendsXmlAnnotation.java index 5ddd17ae3c0d..2dc73ba35ca8 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExtendsXmlAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ExtendsXmlAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.boot.internal.Extends; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class ExtendsXmlAnnotation implements Extends { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ExtendsXmlAnnotation(SourceModelBuildingContext modelContext) { + public ExtendsXmlAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public ExtendsXmlAnnotation(Extends annotation, SourceModelBuildingContext modelContext) { + public ExtendsXmlAnnotation(Extends annotation, ModelsContext modelContext) { this.superType = annotation.superType(); } /** * Used in creating annotation instances from Jandex variant */ - public ExtendsXmlAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ExtendsXmlAnnotation(Map attributeValues, ModelsContext modelContext) { this.superType = (String) attributeValues.get( "superType" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchAnnotation.java index 6002e314adb6..3b201a87280e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.Fetch; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class FetchAnnotation implements Fetch { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public FetchAnnotation(SourceModelBuildingContext modelContext) { + public FetchAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public FetchAnnotation(Fetch annotation, SourceModelBuildingContext modelContext) { + public FetchAnnotation(Fetch annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public FetchAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public FetchAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (org.hibernate.annotations.FetchMode) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileAnnotation.java index 18de83539ed5..4ee20f55b880 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.FetchProfile; import org.hibernate.boot.models.HibernateAnnotations; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -22,14 +22,14 @@ public class FetchProfileAnnotation implements FetchProfile { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public FetchProfileAnnotation(SourceModelBuildingContext modelContext) { + public FetchProfileAnnotation(ModelsContext modelContext) { this.fetchOverrides = new org.hibernate.annotations.FetchProfile.FetchOverride[0]; } /** * Used in creating annotation instances from JDK variant */ - public FetchProfileAnnotation(FetchProfile annotation, SourceModelBuildingContext modelContext) { + public FetchProfileAnnotation(FetchProfile annotation, ModelsContext modelContext) { this.name = annotation.name(); this.fetchOverrides = extractJdkValue( annotation, @@ -42,7 +42,7 @@ public FetchProfileAnnotation(FetchProfile annotation, SourceModelBuildingContex /** * Used in creating annotation instances from Jandex variant */ - public FetchProfileAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public FetchProfileAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.fetchOverrides = (FetchOverride[]) attributeValues.get( "fetchOverrides" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileOverrideAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileOverrideAnnotation.java index 15a3de9c2931..311a2489fb61 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileOverrideAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileOverrideAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.FetchProfileOverride; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -21,7 +21,7 @@ public class FetchProfileOverrideAnnotation implements FetchProfileOverride { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public FetchProfileOverrideAnnotation(SourceModelBuildingContext modelContext) { + public FetchProfileOverrideAnnotation(ModelsContext modelContext) { this.mode = org.hibernate.annotations.FetchMode.JOIN; this.fetch = jakarta.persistence.FetchType.EAGER; } @@ -29,7 +29,7 @@ public FetchProfileOverrideAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public FetchProfileOverrideAnnotation(FetchProfileOverride annotation, SourceModelBuildingContext modelContext) { + public FetchProfileOverrideAnnotation(FetchProfileOverride annotation, ModelsContext modelContext) { this.mode = annotation.mode(); this.fetch = annotation.fetch(); this.profile = annotation.profile(); @@ -40,7 +40,7 @@ public FetchProfileOverrideAnnotation(FetchProfileOverride annotation, SourceMod */ public FetchProfileOverrideAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.mode = (org.hibernate.annotations.FetchMode) attributeValues.get( "mode" ); this.fetch = (jakarta.persistence.FetchType) attributeValues.get( "fetch" ); this.profile = (String) attributeValues.get( "profile" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileOverridesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileOverridesAnnotation.java index 02f7ecf2787e..574a2cc53c20 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileOverridesAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfileOverridesAnnotation.java @@ -10,7 +10,7 @@ import org.hibernate.annotations.FetchProfileOverrides; import org.hibernate.boot.models.DialectOverrideAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -23,13 +23,13 @@ public class FetchProfileOverridesAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public FetchProfileOverridesAnnotation(SourceModelBuildingContext modelContext) { + public FetchProfileOverridesAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public FetchProfileOverridesAnnotation(FetchProfileOverrides annotation, SourceModelBuildingContext modelContext) { + public FetchProfileOverridesAnnotation(FetchProfileOverrides annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, DialectOverrideAnnotations.FETCH_PROFILE_OVERRIDES, @@ -43,7 +43,7 @@ public FetchProfileOverridesAnnotation(FetchProfileOverrides annotation, SourceM */ public FetchProfileOverridesAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (org.hibernate.annotations.FetchProfileOverride[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfilesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfilesAnnotation.java index 030f601954d0..e0feb6865f69 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfilesAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FetchProfilesAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.FetchProfiles; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -23,20 +23,20 @@ public class FetchProfilesAnnotation implements FetchProfiles, RepeatableContain /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public FetchProfilesAnnotation(SourceModelBuildingContext modelContext) { + public FetchProfilesAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public FetchProfilesAnnotation(FetchProfiles annotation, SourceModelBuildingContext modelContext) { + public FetchProfilesAnnotation(FetchProfiles annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, HibernateAnnotations.FETCH_PROFILES, "value", modelContext ); } /** * Used in creating annotation instances from Jandex variant */ - public FetchProfilesAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public FetchProfilesAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (FetchProfile[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FieldResultJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FieldResultJpaAnnotation.java index 30d94129d296..801cd87cbe4d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FieldResultJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FieldResultJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.FieldResult; @@ -20,13 +20,13 @@ public class FieldResultJpaAnnotation implements FieldResult { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public FieldResultJpaAnnotation(SourceModelBuildingContext modelContext) { + public FieldResultJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public FieldResultJpaAnnotation(FieldResult annotation, SourceModelBuildingContext modelContext) { + public FieldResultJpaAnnotation(FieldResult annotation, ModelsContext modelContext) { this.name = annotation.name(); this.column = annotation.column(); } @@ -34,7 +34,7 @@ public FieldResultJpaAnnotation(FieldResult annotation, SourceModelBuildingConte /** * Used in creating annotation instances from Jandex variant */ - public FieldResultJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public FieldResultJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.column = (String) attributeValues.get( "column" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterAnnotation.java index e9becd6d57b8..7d00fb1de74d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterAnnotation.java @@ -14,7 +14,7 @@ import org.hibernate.boot.models.xml.internal.FilterProcessing; import org.hibernate.boot.models.xml.spi.XmlDocumentContext; import org.hibernate.internal.util.StringHelper; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -29,7 +29,7 @@ public class FilterAnnotation implements Filter, FilterDetails { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public FilterAnnotation(SourceModelBuildingContext modelContext) { + public FilterAnnotation(ModelsContext modelContext) { this.condition = ""; this.deduceAliasInjectionPoints = true; this.aliases = new org.hibernate.annotations.SqlFragmentAlias[0]; @@ -38,7 +38,7 @@ public FilterAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public FilterAnnotation(Filter annotation, SourceModelBuildingContext modelContext) { + public FilterAnnotation(Filter annotation, ModelsContext modelContext) { this.name = annotation.name(); this.condition = annotation.condition(); this.deduceAliasInjectionPoints = annotation.deduceAliasInjectionPoints(); @@ -48,7 +48,7 @@ public FilterAnnotation(Filter annotation, SourceModelBuildingContext modelConte /** * Used in creating annotation instances from Jandex variant */ - public FilterAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public FilterAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.condition = (String) attributeValues.get( "condition" ); this.deduceAliasInjectionPoints = (boolean) attributeValues.get( "deduceAliasInjectionPoints" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterDefAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterDefAnnotation.java index ee6630dd721f..8f0fe4bfc45d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterDefAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterDefAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.FilterDef; import org.hibernate.boot.models.HibernateAnnotations; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -25,7 +25,7 @@ public class FilterDefAnnotation implements FilterDef { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public FilterDefAnnotation(SourceModelBuildingContext modelContext) { + public FilterDefAnnotation(ModelsContext modelContext) { this.defaultCondition = ""; this.parameters = new org.hibernate.annotations.ParamDef[0]; this.autoEnabled = false; @@ -34,7 +34,7 @@ public FilterDefAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public FilterDefAnnotation(FilterDef annotation, SourceModelBuildingContext modelContext) { + public FilterDefAnnotation(FilterDef annotation, ModelsContext modelContext) { this.name = annotation.name(); this.defaultCondition = annotation.defaultCondition(); this.autoEnabled = annotation.autoEnabled(); @@ -45,7 +45,7 @@ public FilterDefAnnotation(FilterDef annotation, SourceModelBuildingContext mode /** * Used in creating annotation instances from Jandex variant */ - public FilterDefAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public FilterDefAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.defaultCondition = (String) attributeValues.get( "defaultCondition" ); this.autoEnabled = (boolean) attributeValues.get( "autoEnabled" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterDefsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterDefsAnnotation.java index f19350936d23..ca2c78b5b243 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterDefsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterDefsAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.FilterDefs; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -23,20 +23,20 @@ public class FilterDefsAnnotation implements FilterDefs, RepeatableContainer attributeValues, SourceModelBuildingContext modelContext) { + public FilterDefsAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (FilterDef[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterJoinTableAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterJoinTableAnnotation.java index 0ba9bfb63422..922de3e4eba3 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterJoinTableAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterJoinTableAnnotation.java @@ -13,7 +13,7 @@ import org.hibernate.boot.models.xml.internal.FilterProcessing; import org.hibernate.boot.models.xml.spi.XmlDocumentContext; import org.hibernate.internal.util.StringHelper; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.HibernateAnnotations.FILTER_JOIN_TABLE; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -29,7 +29,7 @@ public class FilterJoinTableAnnotation implements FilterJoinTable, FilterDetails /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public FilterJoinTableAnnotation(SourceModelBuildingContext modelContext) { + public FilterJoinTableAnnotation(ModelsContext modelContext) { this.condition = ""; this.deduceAliasInjectionPoints = true; this.aliases = new org.hibernate.annotations.SqlFragmentAlias[0]; @@ -38,7 +38,7 @@ public FilterJoinTableAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public FilterJoinTableAnnotation(FilterJoinTable annotation, SourceModelBuildingContext modelContext) { + public FilterJoinTableAnnotation(FilterJoinTable annotation, ModelsContext modelContext) { this.name = annotation.name(); this.condition = annotation.condition(); this.deduceAliasInjectionPoints = annotation.deduceAliasInjectionPoints(); @@ -48,7 +48,7 @@ public FilterJoinTableAnnotation(FilterJoinTable annotation, SourceModelBuilding /** * Used in creating annotation instances from Jandex variant */ - public FilterJoinTableAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public FilterJoinTableAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.condition = (String) attributeValues.get( "condition" ); this.deduceAliasInjectionPoints = (boolean) attributeValues.get( "deduceAliasInjectionPoints" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterJoinTablesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterJoinTablesAnnotation.java index 84b2793ca5bf..62c6cd09b74a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterJoinTablesAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FilterJoinTablesAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.FilterJoinTables; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -23,20 +23,20 @@ public class FilterJoinTablesAnnotation implements FilterJoinTables, RepeatableC /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public FilterJoinTablesAnnotation(SourceModelBuildingContext modelContext) { + public FilterJoinTablesAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public FilterJoinTablesAnnotation(FilterJoinTables annotation, SourceModelBuildingContext modelContext) { + public FilterJoinTablesAnnotation(FilterJoinTables annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, HibernateAnnotations.FILTER_JOIN_TABLES, "value", modelContext ); } /** * Used in creating annotation instances from Jandex variant */ - public FilterJoinTablesAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public FilterJoinTablesAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (FilterJoinTable[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FiltersAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FiltersAnnotation.java index 0fb2ac6519af..7411fdee3ff4 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FiltersAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FiltersAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.Filters; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -23,20 +23,20 @@ public class FiltersAnnotation implements Filters, RepeatableContainer { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public FiltersAnnotation(SourceModelBuildingContext modelContext) { + public FiltersAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public FiltersAnnotation(Filters annotation, SourceModelBuildingContext modelContext) { + public FiltersAnnotation(Filters annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, HibernateAnnotations.FILTERS, "value", modelContext ); } /** * Used in creating annotation instances from Jandex variant */ - public FiltersAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public FiltersAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Filter[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ForeignKeyJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ForeignKeyJpaAnnotation.java index 223ff70b8d08..c74fa461cfc7 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ForeignKeyJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ForeignKeyJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.ForeignKey; @@ -22,7 +22,7 @@ public class ForeignKeyJpaAnnotation implements ForeignKey { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ForeignKeyJpaAnnotation(SourceModelBuildingContext modelContext) { + public ForeignKeyJpaAnnotation(ModelsContext modelContext) { this.name = ""; this.value = jakarta.persistence.ConstraintMode.CONSTRAINT; this.foreignKeyDefinition = ""; @@ -32,7 +32,7 @@ public ForeignKeyJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public ForeignKeyJpaAnnotation(ForeignKey annotation, SourceModelBuildingContext modelContext) { + public ForeignKeyJpaAnnotation(ForeignKey annotation, ModelsContext modelContext) { this.name = annotation.name(); this.value = annotation.value(); this.foreignKeyDefinition = annotation.foreignKeyDefinition(); @@ -42,7 +42,7 @@ public ForeignKeyJpaAnnotation(ForeignKey annotation, SourceModelBuildingContext /** * Used in creating annotation instances from Jandex variant */ - public ForeignKeyJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ForeignKeyJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.value = (jakarta.persistence.ConstraintMode) attributeValues.get( "value" ); this.foreignKeyDefinition = (String) attributeValues.get( "foreignKeyDefinition" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FormulaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FormulaAnnotation.java index 33eacd017c70..937be56b79b1 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FormulaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FormulaAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.Formula; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class FormulaAnnotation implements Formula { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public FormulaAnnotation(SourceModelBuildingContext modelContext) { + public FormulaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public FormulaAnnotation(Formula annotation, SourceModelBuildingContext modelContext) { + public FormulaAnnotation(Formula annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public FormulaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public FormulaAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (String) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FractionalSecondsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FractionalSecondsAnnotation.java index b4e61334e622..cfae043c1654 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FractionalSecondsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/FractionalSecondsAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.FractionalSeconds; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class FractionalSecondsAnnotation implements FractionalSeconds { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public FractionalSecondsAnnotation(SourceModelBuildingContext modelContext) { + public FractionalSecondsAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public FractionalSecondsAnnotation(FractionalSeconds annotation, SourceModelBuildingContext modelContext) { + public FractionalSecondsAnnotation(FractionalSeconds annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public FractionalSecondsAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public FractionalSecondsAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (int) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedAnnotation.java index dd1b16b3e474..33cb97f90c5a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.Generated; import org.hibernate.generator.EventType; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -21,7 +21,7 @@ public class GeneratedAnnotation implements Generated { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public GeneratedAnnotation(SourceModelBuildingContext modelContext) { + public GeneratedAnnotation(ModelsContext modelContext) { this.event = new org.hibernate.generator.EventType[] { EventType.INSERT }; this.sql = ""; this.writable = false; @@ -30,7 +30,7 @@ public GeneratedAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public GeneratedAnnotation(Generated annotation, SourceModelBuildingContext modelContext) { + public GeneratedAnnotation(Generated annotation, ModelsContext modelContext) { this.event = annotation.event(); this.sql = annotation.sql(); this.writable = annotation.writable(); @@ -39,7 +39,7 @@ public GeneratedAnnotation(Generated annotation, SourceModelBuildingContext mode /** * Used in creating annotation instances from Jandex variant */ - public GeneratedAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public GeneratedAnnotation(Map attributeValues, ModelsContext modelContext) { this.event = (EventType[]) attributeValues.get( "event" ); this.sql = (String) attributeValues.get( "sql" ); this.writable = (boolean) attributeValues.get( "writable" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedColumnAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedColumnAnnotation.java index 0f4c796ee651..9f4639ea5b09 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedColumnAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedColumnAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.GeneratedColumn; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class GeneratedColumnAnnotation implements GeneratedColumn { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public GeneratedColumnAnnotation(SourceModelBuildingContext modelContext) { + public GeneratedColumnAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public GeneratedColumnAnnotation(GeneratedColumn annotation, SourceModelBuildingContext modelContext) { + public GeneratedColumnAnnotation(GeneratedColumn annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public GeneratedColumnAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public GeneratedColumnAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (String) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedValueJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedValueJpaAnnotation.java index 600d2e0505cc..a2cac0e5f7fa 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedValueJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GeneratedValueJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.GeneratedValue; @@ -20,7 +20,7 @@ public class GeneratedValueJpaAnnotation implements GeneratedValue { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public GeneratedValueJpaAnnotation(SourceModelBuildingContext modelContext) { + public GeneratedValueJpaAnnotation(ModelsContext modelContext) { this.strategy = jakarta.persistence.GenerationType.AUTO; this.generator = ""; } @@ -28,7 +28,7 @@ public GeneratedValueJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public GeneratedValueJpaAnnotation(GeneratedValue annotation, SourceModelBuildingContext modelContext) { + public GeneratedValueJpaAnnotation(GeneratedValue annotation, ModelsContext modelContext) { this.strategy = annotation.strategy(); this.generator = annotation.generator(); } @@ -36,7 +36,7 @@ public GeneratedValueJpaAnnotation(GeneratedValue annotation, SourceModelBuildin /** * Used in creating annotation instances from Jandex variant */ - public GeneratedValueJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public GeneratedValueJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.strategy = (jakarta.persistence.GenerationType) attributeValues.get( "strategy" ); this.generator = (String) attributeValues.get( "generator" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GenericGeneratorAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GenericGeneratorAnnotation.java index 13e843d75a00..cc060890fb29 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GenericGeneratorAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GenericGeneratorAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.GenericGenerator; import org.hibernate.boot.models.HibernateAnnotations; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -24,7 +24,7 @@ public class GenericGeneratorAnnotation implements GenericGenerator { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public GenericGeneratorAnnotation(SourceModelBuildingContext modelContext) { + public GenericGeneratorAnnotation(ModelsContext modelContext) { this.type = org.hibernate.generator.Generator.class; this.strategy = "native"; this.parameters = new org.hibernate.annotations.Parameter[0]; @@ -33,7 +33,7 @@ public GenericGeneratorAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public GenericGeneratorAnnotation(GenericGenerator annotation, SourceModelBuildingContext modelContext) { + public GenericGeneratorAnnotation(GenericGenerator annotation, ModelsContext modelContext) { this.name = annotation.name(); this.type = annotation.type(); this.strategy = annotation.strategy(); @@ -48,7 +48,7 @@ public GenericGeneratorAnnotation(GenericGenerator annotation, SourceModelBuildi /** * Used in creating annotation instances from Jandex variant */ - public GenericGeneratorAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public GenericGeneratorAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.type = (Class) attributeValues.get( "type" ); this.strategy = (String) attributeValues.get( "strategy" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GenericGeneratorsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GenericGeneratorsAnnotation.java index 46387ef205ca..e3cc66fb5eec 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GenericGeneratorsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/GenericGeneratorsAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.GenericGenerators; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -23,20 +23,20 @@ public class GenericGeneratorsAnnotation implements GenericGenerators, Repeatabl /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public GenericGeneratorsAnnotation(SourceModelBuildingContext modelContext) { + public GenericGeneratorsAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public GenericGeneratorsAnnotation(GenericGenerators annotation, SourceModelBuildingContext modelContext) { + public GenericGeneratorsAnnotation(GenericGenerators annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, HibernateAnnotations.GENERIC_GENERATORS, "value", modelContext ); } /** * Used in creating annotation instances from Jandex variant */ - public GenericGeneratorsAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public GenericGeneratorsAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (GenericGenerator[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/HQLSelectAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/HQLSelectAnnotation.java index f08a4c32fac8..472ee403edfa 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/HQLSelectAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/HQLSelectAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.HQLSelect; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -20,20 +20,20 @@ public class HQLSelectAnnotation implements HQLSelect { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public HQLSelectAnnotation(SourceModelBuildingContext modelContext) { + public HQLSelectAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public HQLSelectAnnotation(HQLSelect annotation, SourceModelBuildingContext modelContext) { + public HQLSelectAnnotation(HQLSelect annotation, ModelsContext modelContext) { this.query = annotation.query(); } /** * Used in creating annotation instances from Jandex variant */ - public HQLSelectAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public HQLSelectAnnotation(Map attributeValues, ModelsContext modelContext) { this.query = (String) attributeValues.get( "query" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdClassJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdClassJpaAnnotation.java index e93aaed38c77..5229e0125d45 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdClassJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdClassJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.IdClass; @@ -19,20 +19,20 @@ public class IdClassJpaAnnotation implements IdClass { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public IdClassJpaAnnotation(SourceModelBuildingContext modelContext) { + public IdClassJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public IdClassJpaAnnotation(IdClass annotation, SourceModelBuildingContext modelContext) { + public IdClassJpaAnnotation(IdClass annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public IdClassJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public IdClassJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdGeneratorTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdGeneratorTypeAnnotation.java index 629234f4b04d..37b160188574 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdGeneratorTypeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdGeneratorTypeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.IdGeneratorType; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class IdGeneratorTypeAnnotation implements IdGeneratorType { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public IdGeneratorTypeAnnotation(SourceModelBuildingContext modelContext) { + public IdGeneratorTypeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public IdGeneratorTypeAnnotation(IdGeneratorType annotation, SourceModelBuildingContext modelContext) { + public IdGeneratorTypeAnnotation(IdGeneratorType annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public IdGeneratorTypeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public IdGeneratorTypeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdJpaAnnotation.java index 782344cb61d2..f782e2b4634d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IdJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.Id; @@ -17,19 +17,19 @@ public class IdJpaAnnotation implements Id { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public IdJpaAnnotation(SourceModelBuildingContext modelContext) { + public IdJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public IdJpaAnnotation(Id annotation, SourceModelBuildingContext modelContext) { + public IdJpaAnnotation(Id annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public IdJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public IdJpaAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ImmutableAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ImmutableAnnotation.java index 583d87ecfc16..50a3c416399c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ImmutableAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ImmutableAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.Immutable; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -17,19 +17,19 @@ public class ImmutableAnnotation implements Immutable { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ImmutableAnnotation(SourceModelBuildingContext modelContext) { + public ImmutableAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public ImmutableAnnotation(Immutable annotation, SourceModelBuildingContext modelContext) { + public ImmutableAnnotation(Immutable annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public ImmutableAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ImmutableAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ImportedAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ImportedAnnotation.java index bf0055963f19..010d72c67795 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ImportedAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ImportedAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.Imported; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,21 +18,21 @@ public class ImportedAnnotation implements Imported { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ImportedAnnotation(SourceModelBuildingContext modelContext) { + public ImportedAnnotation(ModelsContext modelContext) { this.rename = ""; } /** * Used in creating annotation instances from JDK variant */ - public ImportedAnnotation(Imported annotation, SourceModelBuildingContext modelContext) { + public ImportedAnnotation(Imported annotation, ModelsContext modelContext) { this.rename = annotation.rename(); } /** * Used in creating annotation instances from Jandex variant */ - public ImportedAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ImportedAnnotation(Map attributeValues, ModelsContext modelContext) { this.rename = (String) attributeValues.get( "rename" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IndexJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IndexJpaAnnotation.java index 5bf939a5c00d..5869b00433fc 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IndexJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/IndexJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.Index; @@ -22,7 +22,7 @@ public class IndexJpaAnnotation implements Index { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public IndexJpaAnnotation(SourceModelBuildingContext modelContext) { + public IndexJpaAnnotation(ModelsContext modelContext) { this.name = ""; this.unique = false; this.options = ""; @@ -31,7 +31,7 @@ public IndexJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public IndexJpaAnnotation(Index annotation, SourceModelBuildingContext modelContext) { + public IndexJpaAnnotation(Index annotation, ModelsContext modelContext) { this.name = annotation.name(); this.columnList = annotation.columnList(); this.unique = annotation.unique(); @@ -41,7 +41,7 @@ public IndexJpaAnnotation(Index annotation, SourceModelBuildingContext modelCont /** * Used in creating annotation instances from Jandex variant */ - public IndexJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public IndexJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.columnList = (String) attributeValues.get( "columnList" ); this.unique = (boolean) attributeValues.get( "unique" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/InheritanceJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/InheritanceJpaAnnotation.java index 731b1ee3ee65..21088cf6a42c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/InheritanceJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/InheritanceJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.Inheritance; @@ -19,21 +19,21 @@ public class InheritanceJpaAnnotation implements Inheritance { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public InheritanceJpaAnnotation(SourceModelBuildingContext modelContext) { + public InheritanceJpaAnnotation(ModelsContext modelContext) { this.strategy = jakarta.persistence.InheritanceType.SINGLE_TABLE; } /** * Used in creating annotation instances from JDK variant */ - public InheritanceJpaAnnotation(Inheritance annotation, SourceModelBuildingContext modelContext) { + public InheritanceJpaAnnotation(Inheritance annotation, ModelsContext modelContext) { this.strategy = annotation.strategy(); } /** * Used in creating annotation instances from Jandex variant */ - public InheritanceJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public InheritanceJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.strategy = (jakarta.persistence.InheritanceType) attributeValues.get( "strategy" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/InstantiatorAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/InstantiatorAnnotation.java index b9d8f250d67f..65b5652faf8f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/InstantiatorAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/InstantiatorAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.Instantiator; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class InstantiatorAnnotation implements Instantiator { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public InstantiatorAnnotation(SourceModelBuildingContext modelContext) { + public InstantiatorAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public InstantiatorAnnotation(Instantiator annotation, SourceModelBuildingContext modelContext) { + public InstantiatorAnnotation(Instantiator annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public InstantiatorAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public InstantiatorAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (String[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeAnnotation.java index 04a20631547f..506e57805b07 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.JavaType; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class JavaTypeAnnotation implements JavaType { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public JavaTypeAnnotation(SourceModelBuildingContext modelContext) { + public JavaTypeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public JavaTypeAnnotation(JavaType annotation, SourceModelBuildingContext modelContext) { + public JavaTypeAnnotation(JavaType annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public JavaTypeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public JavaTypeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class>) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeRegistrationAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeRegistrationAnnotation.java index fa6fdaad13fd..7238252838e3 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeRegistrationAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeRegistrationAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.JavaTypeRegistration; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -19,13 +19,13 @@ public class JavaTypeRegistrationAnnotation implements JavaTypeRegistration { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public JavaTypeRegistrationAnnotation(SourceModelBuildingContext modelContext) { + public JavaTypeRegistrationAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public JavaTypeRegistrationAnnotation(JavaTypeRegistration annotation, SourceModelBuildingContext modelContext) { + public JavaTypeRegistrationAnnotation(JavaTypeRegistration annotation, ModelsContext modelContext) { this.javaType = annotation.javaType(); this.descriptorClass = annotation.descriptorClass(); } @@ -35,7 +35,7 @@ public JavaTypeRegistrationAnnotation(JavaTypeRegistration annotation, SourceMod */ public JavaTypeRegistrationAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.javaType = (Class) attributeValues.get( "javaType" ); this.descriptorClass = (Class>) attributeValues .get( "descriptorClass" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeRegistrationsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeRegistrationsAnnotation.java index 7a616a1e8bd1..f5d791937c49 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeRegistrationsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JavaTypeRegistrationsAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.JavaTypeRegistrations; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -24,13 +24,13 @@ public class JavaTypeRegistrationsAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public JavaTypeRegistrationsAnnotation(SourceModelBuildingContext modelContext) { + public JavaTypeRegistrationsAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public JavaTypeRegistrationsAnnotation(JavaTypeRegistrations annotation, SourceModelBuildingContext modelContext) { + public JavaTypeRegistrationsAnnotation(JavaTypeRegistrations annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, HibernateAnnotations.JAVA_TYPE_REGISTRATIONS, "value", modelContext ); } @@ -39,7 +39,7 @@ public JavaTypeRegistrationsAnnotation(JavaTypeRegistrations annotation, SourceM */ public JavaTypeRegistrationsAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (JavaTypeRegistration[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeAnnotation.java index 22af9614ff95..67a7fbc690a5 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.JdbcType; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class JdbcTypeAnnotation implements JdbcType { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public JdbcTypeAnnotation(SourceModelBuildingContext modelContext) { + public JdbcTypeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public JdbcTypeAnnotation(JdbcType annotation, SourceModelBuildingContext modelContext) { + public JdbcTypeAnnotation(JdbcType annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public JdbcTypeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public JdbcTypeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeCodeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeCodeAnnotation.java index 624753997e45..17b2b8454058 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeCodeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeCodeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.JdbcTypeCode; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class JdbcTypeCodeAnnotation implements JdbcTypeCode { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public JdbcTypeCodeAnnotation(SourceModelBuildingContext modelContext) { + public JdbcTypeCodeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public JdbcTypeCodeAnnotation(JdbcTypeCode annotation, SourceModelBuildingContext modelContext) { + public JdbcTypeCodeAnnotation(JdbcTypeCode annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public JdbcTypeCodeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public JdbcTypeCodeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (int) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeRegistrationAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeRegistrationAnnotation.java index 028342116470..a9f75e8a40d7 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeRegistrationAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeRegistrationAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.JdbcTypeRegistration; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -19,14 +19,14 @@ public class JdbcTypeRegistrationAnnotation implements JdbcTypeRegistration { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public JdbcTypeRegistrationAnnotation(SourceModelBuildingContext modelContext) { + public JdbcTypeRegistrationAnnotation(ModelsContext modelContext) { this.registrationCode = -2147483648; } /** * Used in creating annotation instances from JDK variant */ - public JdbcTypeRegistrationAnnotation(JdbcTypeRegistration annotation, SourceModelBuildingContext modelContext) { + public JdbcTypeRegistrationAnnotation(JdbcTypeRegistration annotation, ModelsContext modelContext) { this.value = annotation.value(); this.registrationCode = annotation.registrationCode(); } @@ -36,7 +36,7 @@ public JdbcTypeRegistrationAnnotation(JdbcTypeRegistration annotation, SourceMod */ public JdbcTypeRegistrationAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (Class) attributeValues.get( "value" ); this.registrationCode = (int) attributeValues.get( "registrationCode" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeRegistrationsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeRegistrationsAnnotation.java index ebf3740d11fa..a870cdfdada0 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeRegistrationsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JdbcTypeRegistrationsAnnotation.java @@ -10,7 +10,7 @@ import org.hibernate.annotations.JdbcTypeRegistrations; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -23,13 +23,13 @@ public class JdbcTypeRegistrationsAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public JdbcTypeRegistrationsAnnotation(SourceModelBuildingContext modelContext) { + public JdbcTypeRegistrationsAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public JdbcTypeRegistrationsAnnotation(JdbcTypeRegistrations annotation, SourceModelBuildingContext modelContext) { + public JdbcTypeRegistrationsAnnotation(JdbcTypeRegistrations annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, HibernateAnnotations.JDBC_TYPE_REGISTRATIONS, "value", modelContext ); } @@ -38,7 +38,7 @@ public JdbcTypeRegistrationsAnnotation(JdbcTypeRegistrations annotation, SourceM */ public JdbcTypeRegistrationsAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (org.hibernate.annotations.JdbcTypeRegistration[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnJpaAnnotation.java index e43cc49509a1..51711acc1de8 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnJpaAnnotation.java @@ -14,7 +14,7 @@ import org.hibernate.boot.models.xml.internal.db.ForeignKeyProcessing; import org.hibernate.boot.models.xml.spi.XmlDocumentContext; import org.hibernate.internal.util.StringHelper; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.JoinColumn; @@ -42,7 +42,7 @@ public class JoinColumnJpaAnnotation implements JoinColumn { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public JoinColumnJpaAnnotation(SourceModelBuildingContext modelContext) { + public JoinColumnJpaAnnotation(ModelsContext modelContext) { this.name = ""; this.referencedColumnName = ""; this.unique = false; @@ -60,7 +60,7 @@ public JoinColumnJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public JoinColumnJpaAnnotation(JoinColumn annotation, SourceModelBuildingContext modelContext) { + public JoinColumnJpaAnnotation(JoinColumn annotation, ModelsContext modelContext) { this.name = annotation.name(); this.referencedColumnName = annotation.referencedColumnName(); this.unique = annotation.unique(); @@ -78,7 +78,7 @@ public JoinColumnJpaAnnotation(JoinColumn annotation, SourceModelBuildingContext /** * Used in creating annotation instances from Jandex variant */ - public JoinColumnJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public JoinColumnJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.referencedColumnName = (String) attributeValues.get( "referencedColumnName" ); this.unique = (boolean) attributeValues.get( "unique" ); @@ -309,8 +309,8 @@ public void apply(JaxbColumnImpl jaxbColumn, XmlDocumentContext xmlDocumentConte public static JoinColumn toJoinColumn( PrimaryKeyJoinColumn pkJoinColumn, - SourceModelBuildingContext sourceModelBuildingContext) { - final JoinColumnJpaAnnotation joinColumn = JpaAnnotations.JOIN_COLUMN.createUsage( sourceModelBuildingContext ); + ModelsContext ModelsContext) { + final JoinColumnJpaAnnotation joinColumn = JpaAnnotations.JOIN_COLUMN.createUsage( ModelsContext ); joinColumn.name( pkJoinColumn.name() ); joinColumn.referencedColumnName( pkJoinColumn.referencedColumnName() ); joinColumn.columnDefinition( pkJoinColumn.columnDefinition() ); @@ -321,8 +321,8 @@ public static JoinColumn toJoinColumn( public static JoinColumn toJoinColumn( MapKeyJoinColumn mapKeyJoinColumn, - SourceModelBuildingContext sourceModelBuildingContext) { - final JoinColumnJpaAnnotation joinColumn = JpaAnnotations.JOIN_COLUMN.createUsage( sourceModelBuildingContext ); + ModelsContext ModelsContext) { + final JoinColumnJpaAnnotation joinColumn = JpaAnnotations.JOIN_COLUMN.createUsage( ModelsContext ); joinColumn.name( mapKeyJoinColumn.name() ); joinColumn.table( mapKeyJoinColumn.table() ); joinColumn.referencedColumnName( mapKeyJoinColumn.referencedColumnName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnOrFormulaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnOrFormulaAnnotation.java index 072a87f7b371..fe6119573f7a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnOrFormulaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnOrFormulaAnnotation.java @@ -10,7 +10,7 @@ import org.hibernate.annotations.JoinColumnOrFormula; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.JpaAnnotations; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.HibernateAnnotations.JOIN_COLUMN_OR_FORMULA; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -24,7 +24,7 @@ public class JoinColumnOrFormulaAnnotation implements JoinColumnOrFormula { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public JoinColumnOrFormulaAnnotation(SourceModelBuildingContext modelContext) { + public JoinColumnOrFormulaAnnotation(ModelsContext modelContext) { this.formula = HibernateAnnotations.JOIN_FORMULA.createUsage( modelContext ); this.column = JpaAnnotations.JOIN_COLUMN.createUsage( modelContext ); } @@ -32,7 +32,7 @@ public JoinColumnOrFormulaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public JoinColumnOrFormulaAnnotation(JoinColumnOrFormula annotation, SourceModelBuildingContext modelContext) { + public JoinColumnOrFormulaAnnotation(JoinColumnOrFormula annotation, ModelsContext modelContext) { this.formula = extractJdkValue( annotation, JOIN_COLUMN_OR_FORMULA, "formula", modelContext ); this.column = extractJdkValue( annotation, JOIN_COLUMN_OR_FORMULA, "column", modelContext ); } @@ -40,7 +40,7 @@ public JoinColumnOrFormulaAnnotation(JoinColumnOrFormula annotation, SourceModel /** * Used in creating annotation instances from Jandex variant */ - public JoinColumnOrFormulaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public JoinColumnOrFormulaAnnotation(Map attributeValues, ModelsContext modelContext) { this.formula = (org.hibernate.annotations.JoinFormula) attributeValues.get( "formula" ); this.column = (jakarta.persistence.JoinColumn) attributeValues.get( "column" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnsJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnsJpaAnnotation.java index 3089865a7ccb..2af70e904a11 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnsJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnsJpaAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.boot.models.JpaAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.JoinColumn; @@ -26,14 +26,14 @@ public class JoinColumnsJpaAnnotation implements JoinColumns, RepeatableContaine /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public JoinColumnsJpaAnnotation(SourceModelBuildingContext modelContext) { + public JoinColumnsJpaAnnotation(ModelsContext modelContext) { this.foreignKey = JpaAnnotations.FOREIGN_KEY.createUsage( modelContext ); } /** * Used in creating annotation instances from JDK variant */ - public JoinColumnsJpaAnnotation(JoinColumns annotation, SourceModelBuildingContext modelContext) { + public JoinColumnsJpaAnnotation(JoinColumns annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, JpaAnnotations.JOIN_COLUMNS, "value", modelContext ); this.foreignKey = extractJdkValue( annotation, JpaAnnotations.JOIN_COLUMNS, "foreignKey", modelContext ); } @@ -41,7 +41,7 @@ public JoinColumnsJpaAnnotation(JoinColumns annotation, SourceModelBuildingConte /** * Used in creating annotation instances from Jandex variant */ - public JoinColumnsJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public JoinColumnsJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (JoinColumn[]) attributeValues.get( "value" ); this.foreignKey = (jakarta.persistence.ForeignKey) attributeValues.get( "foreignKey" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnsOrFormulasAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnsOrFormulasAnnotation.java index 18e2b97e60f2..6b3e0e961749 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnsOrFormulasAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinColumnsOrFormulasAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.JoinColumnsOrFormulas; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -24,13 +24,13 @@ public class JoinColumnsOrFormulasAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public JoinColumnsOrFormulasAnnotation(SourceModelBuildingContext modelContext) { + public JoinColumnsOrFormulasAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public JoinColumnsOrFormulasAnnotation(JoinColumnsOrFormulas annotation, SourceModelBuildingContext modelContext) { + public JoinColumnsOrFormulasAnnotation(JoinColumnsOrFormulas annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, HibernateAnnotations.JOIN_COLUMNS_OR_FORMULAS, @@ -44,7 +44,7 @@ public JoinColumnsOrFormulasAnnotation(JoinColumnsOrFormulas annotation, SourceM */ public JoinColumnsOrFormulasAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (JoinColumnOrFormula[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinFormulaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinFormulaAnnotation.java index bc577d5b7db1..4278d64a68d0 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinFormulaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinFormulaAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.JoinFormula; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -19,14 +19,14 @@ public class JoinFormulaAnnotation implements JoinFormula { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public JoinFormulaAnnotation(SourceModelBuildingContext modelContext) { + public JoinFormulaAnnotation(ModelsContext modelContext) { this.referencedColumnName = ""; } /** * Used in creating annotation instances from JDK variant */ - public JoinFormulaAnnotation(JoinFormula annotation, SourceModelBuildingContext modelContext) { + public JoinFormulaAnnotation(JoinFormula annotation, ModelsContext modelContext) { this.value = annotation.value(); this.referencedColumnName = annotation.referencedColumnName(); } @@ -34,7 +34,7 @@ public JoinFormulaAnnotation(JoinFormula annotation, SourceModelBuildingContext /** * Used in creating annotation instances from Jandex variant */ - public JoinFormulaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public JoinFormulaAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (String) attributeValues.get( "value" ); this.referencedColumnName = (String) attributeValues.get( "referencedColumnName" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinTableJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinTableJpaAnnotation.java index 20f408c83a2c..374ec25d9ea4 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinTableJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/JoinTableJpaAnnotation.java @@ -16,7 +16,7 @@ import org.hibernate.boot.models.xml.internal.db.JoinColumnProcessing; import org.hibernate.boot.models.xml.spi.XmlDocumentContext; import org.hibernate.internal.util.collections.CollectionHelper; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.JoinTable; @@ -47,7 +47,7 @@ public class JoinTableJpaAnnotation implements JoinTable, CommonTableDetails { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public JoinTableJpaAnnotation(SourceModelBuildingContext modelContext) { + public JoinTableJpaAnnotation(ModelsContext modelContext) { this.name = ""; this.catalog = ""; this.schema = ""; @@ -65,7 +65,7 @@ public JoinTableJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public JoinTableJpaAnnotation(JoinTable annotation, SourceModelBuildingContext modelContext) { + public JoinTableJpaAnnotation(JoinTable annotation, ModelsContext modelContext) { this.name = annotation.name(); this.catalog = annotation.catalog(); this.schema = annotation.schema(); @@ -98,7 +98,7 @@ public JoinTableJpaAnnotation(JoinTable annotation, SourceModelBuildingContext m /** * Used in creating annotation instances from Jandex variant */ - public JoinTableJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public JoinTableJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.catalog = (String) attributeValues.get( "catalog" ); this.schema = (String) attributeValues.get( "schema" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/LazyGroupAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/LazyGroupAnnotation.java index 745f14940a76..cc12b68ce58a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/LazyGroupAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/LazyGroupAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.LazyGroup; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class LazyGroupAnnotation implements LazyGroup { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public LazyGroupAnnotation(SourceModelBuildingContext modelContext) { + public LazyGroupAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public LazyGroupAnnotation(LazyGroup annotation, SourceModelBuildingContext modelContext) { + public LazyGroupAnnotation(LazyGroup annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public LazyGroupAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public LazyGroupAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (String) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexBaseAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexBaseAnnotation.java index 4c8819e201b5..c36f5793d889 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexBaseAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexBaseAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.ListIndexBase; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,21 +18,21 @@ public class ListIndexBaseAnnotation implements ListIndexBase { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ListIndexBaseAnnotation(SourceModelBuildingContext modelContext) { + public ListIndexBaseAnnotation(ModelsContext modelContext) { this.value = 0; } /** * Used in creating annotation instances from JDK variant */ - public ListIndexBaseAnnotation(ListIndexBase annotation, SourceModelBuildingContext modelContext) { + public ListIndexBaseAnnotation(ListIndexBase annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public ListIndexBaseAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ListIndexBaseAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (int) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJavaTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJavaTypeAnnotation.java index 7a8c2c018e6f..da138b950967 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJavaTypeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJavaTypeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.ListIndexJavaType; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class ListIndexJavaTypeAnnotation implements ListIndexJavaType { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ListIndexJavaTypeAnnotation(SourceModelBuildingContext modelContext) { + public ListIndexJavaTypeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public ListIndexJavaTypeAnnotation(ListIndexJavaType annotation, SourceModelBuildingContext modelContext) { + public ListIndexJavaTypeAnnotation(ListIndexJavaType annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public ListIndexJavaTypeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ListIndexJavaTypeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class>) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJdbcTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJdbcTypeAnnotation.java index 5796122d4e3a..210c77882c0b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJdbcTypeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJdbcTypeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.ListIndexJdbcType; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class ListIndexJdbcTypeAnnotation implements ListIndexJdbcType { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ListIndexJdbcTypeAnnotation(SourceModelBuildingContext modelContext) { + public ListIndexJdbcTypeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public ListIndexJdbcTypeAnnotation(ListIndexJdbcType annotation, SourceModelBuildingContext modelContext) { + public ListIndexJdbcTypeAnnotation(ListIndexJdbcType annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public ListIndexJdbcTypeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ListIndexJdbcTypeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJdbcTypeCodeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJdbcTypeCodeAnnotation.java index e511cc36bd39..1c626040b8c6 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJdbcTypeCodeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ListIndexJdbcTypeCodeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.ListIndexJdbcTypeCode; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,13 +18,13 @@ public class ListIndexJdbcTypeCodeAnnotation implements ListIndexJdbcTypeCode { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ListIndexJdbcTypeCodeAnnotation(SourceModelBuildingContext modelContext) { + public ListIndexJdbcTypeCodeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public ListIndexJdbcTypeCodeAnnotation(ListIndexJdbcTypeCode annotation, SourceModelBuildingContext modelContext) { + public ListIndexJdbcTypeCodeAnnotation(ListIndexJdbcTypeCode annotation, ModelsContext modelContext) { this.value = annotation.value(); } @@ -33,7 +33,7 @@ public ListIndexJdbcTypeCodeAnnotation(ListIndexJdbcTypeCode annotation, SourceM */ public ListIndexJdbcTypeCodeAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (int) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/LobJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/LobJpaAnnotation.java index 265046415b67..d1d22765d25b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/LobJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/LobJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.Lob; @@ -18,19 +18,19 @@ public class LobJpaAnnotation implements Lob { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public LobJpaAnnotation(SourceModelBuildingContext modelContext) { + public LobJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public LobJpaAnnotation(Lob annotation, SourceModelBuildingContext modelContext) { + public LobJpaAnnotation(Lob annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public LobJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public LobJpaAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToAnyAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToAnyAnnotation.java index e11cb4c1843e..df2aebc1c8ce 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToAnyAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToAnyAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.ManyToAny; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,21 +18,21 @@ public class ManyToAnyAnnotation implements ManyToAny { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ManyToAnyAnnotation(SourceModelBuildingContext modelContext) { + public ManyToAnyAnnotation(ModelsContext modelContext) { this.fetch = jakarta.persistence.FetchType.EAGER; } /** * Used in creating annotation instances from JDK variant */ - public ManyToAnyAnnotation(ManyToAny annotation, SourceModelBuildingContext modelContext) { + public ManyToAnyAnnotation(ManyToAny annotation, ModelsContext modelContext) { this.fetch = annotation.fetch(); } /** * Used in creating annotation instances from Jandex variant */ - public ManyToAnyAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ManyToAnyAnnotation(Map attributeValues, ModelsContext modelContext) { this.fetch = (jakarta.persistence.FetchType) attributeValues.get( "fetch" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToManyJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToManyJpaAnnotation.java index 3e29907d70ca..4b2848b838a6 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToManyJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToManyJpaAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.boot.models.annotations.spi.AttributeMarker; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.ManyToMany; @@ -26,7 +26,7 @@ public class ManyToManyJpaAnnotation implements ManyToMany, /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ManyToManyJpaAnnotation(SourceModelBuildingContext modelContext) { + public ManyToManyJpaAnnotation(ModelsContext modelContext) { this.targetEntity = void.class; this.cascade = new jakarta.persistence.CascadeType[0]; this.fetch = jakarta.persistence.FetchType.LAZY; @@ -36,7 +36,7 @@ public ManyToManyJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public ManyToManyJpaAnnotation(ManyToMany annotation, SourceModelBuildingContext modelContext) { + public ManyToManyJpaAnnotation(ManyToMany annotation, ModelsContext modelContext) { this.targetEntity = annotation.targetEntity(); this.cascade = annotation.cascade(); this.fetch = annotation.fetch(); @@ -46,7 +46,7 @@ public ManyToManyJpaAnnotation(ManyToMany annotation, SourceModelBuildingContext /** * Used in creating annotation instances from Jandex variant */ - public ManyToManyJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ManyToManyJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.targetEntity = (Class) attributeValues.get( "targetEntity" ); this.cascade = (jakarta.persistence.CascadeType[]) attributeValues.get( "cascade" ); this.fetch = (jakarta.persistence.FetchType) attributeValues.get( "fetch" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToOneJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToOneJpaAnnotation.java index 0d8616984c66..f8cf0836403f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToOneJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ManyToOneJpaAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.boot.models.annotations.spi.AttributeMarker; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.ManyToOne; @@ -27,7 +27,7 @@ public class ManyToOneJpaAnnotation implements ManyToOne, /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ManyToOneJpaAnnotation(SourceModelBuildingContext modelContext) { + public ManyToOneJpaAnnotation(ModelsContext modelContext) { this.targetEntity = void.class; this.cascade = new jakarta.persistence.CascadeType[0]; this.fetch = jakarta.persistence.FetchType.EAGER; @@ -37,7 +37,7 @@ public ManyToOneJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public ManyToOneJpaAnnotation(ManyToOne annotation, SourceModelBuildingContext modelContext) { + public ManyToOneJpaAnnotation(ManyToOne annotation, ModelsContext modelContext) { this.targetEntity = annotation.targetEntity(); this.cascade = annotation.cascade(); this.fetch = annotation.fetch(); @@ -47,7 +47,7 @@ public ManyToOneJpaAnnotation(ManyToOne annotation, SourceModelBuildingContext m /** * Used in creating annotation instances from Jandex variant */ - public ManyToOneJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ManyToOneJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.targetEntity = (Class) attributeValues.get( "targetEntity" ); this.cascade = (jakarta.persistence.CascadeType[]) attributeValues.get( "cascade" ); this.fetch = (jakarta.persistence.FetchType) attributeValues.get( "fetch" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyClassJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyClassJpaAnnotation.java index 6ff065ca7a4c..301363645586 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyClassJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyClassJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.MapKeyClass; @@ -19,20 +19,20 @@ public class MapKeyClassJpaAnnotation implements MapKeyClass { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public MapKeyClassJpaAnnotation(SourceModelBuildingContext modelContext) { + public MapKeyClassJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public MapKeyClassJpaAnnotation(MapKeyClass annotation, SourceModelBuildingContext modelContext) { + public MapKeyClassJpaAnnotation(MapKeyClass annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public MapKeyClassJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public MapKeyClassJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyColumnJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyColumnJpaAnnotation.java index e6019c5aaa49..59a28c78a36e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyColumnJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyColumnJpaAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.boot.models.annotations.spi.ColumnDetails; import org.hibernate.boot.models.xml.spi.XmlDocumentContext; import org.hibernate.internal.util.StringHelper; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.Column; import jakarta.persistence.MapKeyColumn; @@ -40,7 +40,7 @@ public class MapKeyColumnJpaAnnotation implements MapKeyColumn, /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public MapKeyColumnJpaAnnotation(SourceModelBuildingContext modelContext) { + public MapKeyColumnJpaAnnotation(ModelsContext modelContext) { this.name = ""; this.unique = false; this.nullable = false; @@ -57,7 +57,7 @@ public MapKeyColumnJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public MapKeyColumnJpaAnnotation(MapKeyColumn annotation, SourceModelBuildingContext modelContext) { + public MapKeyColumnJpaAnnotation(MapKeyColumn annotation, ModelsContext modelContext) { this.name = annotation.name(); this.unique = annotation.unique(); this.nullable = annotation.nullable(); @@ -74,7 +74,7 @@ public MapKeyColumnJpaAnnotation(MapKeyColumn annotation, SourceModelBuildingCon /** * Used in creating annotation instances from Jandex variant */ - public MapKeyColumnJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public MapKeyColumnJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.unique = (boolean) attributeValues.get( "unique" ); this.nullable = (boolean) attributeValues.get( "nullable" ); @@ -251,8 +251,8 @@ public void apply(JaxbMapKeyColumnImpl jaxbColumn, XmlDocumentContext xmlDocumen public static Column toColumnAnnotation( MapKeyColumn mapKeyColumn, - SourceModelBuildingContext sourceModelBuildingContext) { - final ColumnJpaAnnotation column = new ColumnJpaAnnotation( sourceModelBuildingContext ); + ModelsContext ModelsContext) { + final ColumnJpaAnnotation column = new ColumnJpaAnnotation( ModelsContext ); column.name( mapKeyColumn.name() ); column.table( mapKeyColumn.table() ); column.nullable( mapKeyColumn.nullable() ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyCompositeTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyCompositeTypeAnnotation.java index da0c0751ab26..5fef081e803d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyCompositeTypeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyCompositeTypeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.MapKeyCompositeType; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class MapKeyCompositeTypeAnnotation implements MapKeyCompositeType { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public MapKeyCompositeTypeAnnotation(SourceModelBuildingContext modelContext) { + public MapKeyCompositeTypeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public MapKeyCompositeTypeAnnotation(MapKeyCompositeType annotation, SourceModelBuildingContext modelContext) { + public MapKeyCompositeTypeAnnotation(MapKeyCompositeType annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public MapKeyCompositeTypeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public MapKeyCompositeTypeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class>) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyEnumeratedJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyEnumeratedJpaAnnotation.java index dbc95628a957..e72479e5f96c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyEnumeratedJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyEnumeratedJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.MapKeyEnumerated; @@ -19,21 +19,21 @@ public class MapKeyEnumeratedJpaAnnotation implements MapKeyEnumerated { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public MapKeyEnumeratedJpaAnnotation(SourceModelBuildingContext modelContext) { + public MapKeyEnumeratedJpaAnnotation(ModelsContext modelContext) { this.value = jakarta.persistence.EnumType.ORDINAL; } /** * Used in creating annotation instances from JDK variant */ - public MapKeyEnumeratedJpaAnnotation(MapKeyEnumerated annotation, SourceModelBuildingContext modelContext) { + public MapKeyEnumeratedJpaAnnotation(MapKeyEnumerated annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public MapKeyEnumeratedJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public MapKeyEnumeratedJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (jakarta.persistence.EnumType) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJavaTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJavaTypeAnnotation.java index 5f2b0fa5ee7a..2f2608d9f3c9 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJavaTypeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJavaTypeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.MapKeyJavaType; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class MapKeyJavaTypeAnnotation implements MapKeyJavaType { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public MapKeyJavaTypeAnnotation(SourceModelBuildingContext modelContext) { + public MapKeyJavaTypeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public MapKeyJavaTypeAnnotation(MapKeyJavaType annotation, SourceModelBuildingContext modelContext) { + public MapKeyJavaTypeAnnotation(MapKeyJavaType annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public MapKeyJavaTypeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public MapKeyJavaTypeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class>) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJdbcTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJdbcTypeAnnotation.java index dbd6024294b4..a57d4e309ed9 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJdbcTypeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJdbcTypeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.MapKeyJdbcType; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class MapKeyJdbcTypeAnnotation implements MapKeyJdbcType { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public MapKeyJdbcTypeAnnotation(SourceModelBuildingContext modelContext) { + public MapKeyJdbcTypeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public MapKeyJdbcTypeAnnotation(MapKeyJdbcType annotation, SourceModelBuildingContext modelContext) { + public MapKeyJdbcTypeAnnotation(MapKeyJdbcType annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public MapKeyJdbcTypeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public MapKeyJdbcTypeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJdbcTypeCodeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJdbcTypeCodeAnnotation.java index e965b9c49711..959140cffb3a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJdbcTypeCodeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJdbcTypeCodeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.MapKeyJdbcTypeCode; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class MapKeyJdbcTypeCodeAnnotation implements MapKeyJdbcTypeCode { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public MapKeyJdbcTypeCodeAnnotation(SourceModelBuildingContext modelContext) { + public MapKeyJdbcTypeCodeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public MapKeyJdbcTypeCodeAnnotation(MapKeyJdbcTypeCode annotation, SourceModelBuildingContext modelContext) { + public MapKeyJdbcTypeCodeAnnotation(MapKeyJdbcTypeCode annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public MapKeyJdbcTypeCodeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public MapKeyJdbcTypeCodeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (int) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJoinColumnJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJoinColumnJpaAnnotation.java index e348dcde3441..097a0f52a482 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJoinColumnJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJoinColumnJpaAnnotation.java @@ -12,7 +12,7 @@ import org.hibernate.boot.models.xml.internal.db.ForeignKeyProcessing; import org.hibernate.boot.models.xml.spi.XmlDocumentContext; import org.hibernate.internal.util.StringHelper; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.MapKeyJoinColumn; @@ -35,7 +35,7 @@ public class MapKeyJoinColumnJpaAnnotation implements MapKeyJoinColumn { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public MapKeyJoinColumnJpaAnnotation(SourceModelBuildingContext modelContext) { + public MapKeyJoinColumnJpaAnnotation(ModelsContext modelContext) { this.name = ""; this.referencedColumnName = ""; this.unique = false; @@ -51,7 +51,7 @@ public MapKeyJoinColumnJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public MapKeyJoinColumnJpaAnnotation(MapKeyJoinColumn annotation, SourceModelBuildingContext modelContext) { + public MapKeyJoinColumnJpaAnnotation(MapKeyJoinColumn annotation, ModelsContext modelContext) { this.name = annotation.name(); this.referencedColumnName = annotation.referencedColumnName(); this.unique = annotation.unique(); @@ -67,7 +67,7 @@ public MapKeyJoinColumnJpaAnnotation(MapKeyJoinColumn annotation, SourceModelBui /** * Used in creating annotation instances from Jandex variant */ - public MapKeyJoinColumnJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public MapKeyJoinColumnJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.referencedColumnName = (String) attributeValues.get( "referencedColumnName" ); this.unique = (boolean) attributeValues.get( "unique" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJoinColumnsJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJoinColumnsJpaAnnotation.java index 9bcae0bc96a0..0a3dc1d0f10b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJoinColumnsJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJoinColumnsJpaAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.boot.models.JpaAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.MapKeyJoinColumn; import jakarta.persistence.MapKeyJoinColumns; @@ -25,14 +25,14 @@ public class MapKeyJoinColumnsJpaAnnotation implements MapKeyJoinColumns, Repeat /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public MapKeyJoinColumnsJpaAnnotation(SourceModelBuildingContext modelContext) { + public MapKeyJoinColumnsJpaAnnotation(ModelsContext modelContext) { this.foreignKey = JpaAnnotations.FOREIGN_KEY.createUsage( modelContext ); } /** * Used in creating annotation instances from JDK variant */ - public MapKeyJoinColumnsJpaAnnotation(MapKeyJoinColumns annotation, SourceModelBuildingContext modelContext) { + public MapKeyJoinColumnsJpaAnnotation(MapKeyJoinColumns annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, JpaAnnotations.MAP_KEY_JOIN_COLUMNS, "value", modelContext ); this.foreignKey = extractJdkValue( annotation, @@ -47,7 +47,7 @@ public MapKeyJoinColumnsJpaAnnotation(MapKeyJoinColumns annotation, SourceModelB */ public MapKeyJoinColumnsJpaAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (MapKeyJoinColumn[]) attributeValues.get( "value" ); this.foreignKey = (jakarta.persistence.ForeignKey) attributeValues.get( "foreignKey" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJpaAnnotation.java index 84ac63bc60e7..c65186a11f53 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.MapKey; @@ -19,21 +19,21 @@ public class MapKeyJpaAnnotation implements MapKey { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public MapKeyJpaAnnotation(SourceModelBuildingContext modelContext) { + public MapKeyJpaAnnotation(ModelsContext modelContext) { this.name = ""; } /** * Used in creating annotation instances from JDK variant */ - public MapKeyJpaAnnotation(MapKey annotation, SourceModelBuildingContext modelContext) { + public MapKeyJpaAnnotation(MapKey annotation, ModelsContext modelContext) { this.name = annotation.name(); } /** * Used in creating annotation instances from Jandex variant */ - public MapKeyJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public MapKeyJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyMutabilityAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyMutabilityAnnotation.java index a27ed6b76ef3..a11d7e8abad2 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyMutabilityAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyMutabilityAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.MapKeyMutability; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class MapKeyMutabilityAnnotation implements MapKeyMutability { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public MapKeyMutabilityAnnotation(SourceModelBuildingContext modelContext) { + public MapKeyMutabilityAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public MapKeyMutabilityAnnotation(MapKeyMutability annotation, SourceModelBuildingContext modelContext) { + public MapKeyMutabilityAnnotation(MapKeyMutability annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public MapKeyMutabilityAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public MapKeyMutabilityAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class>) attributeValues .get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyTemporalJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyTemporalJpaAnnotation.java index 9d629769e30a..6f15c3f04eaa 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyTemporalJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyTemporalJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.MapKeyTemporal; @@ -19,20 +19,20 @@ public class MapKeyTemporalJpaAnnotation implements MapKeyTemporal { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public MapKeyTemporalJpaAnnotation(SourceModelBuildingContext modelContext) { + public MapKeyTemporalJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public MapKeyTemporalJpaAnnotation(MapKeyTemporal annotation, SourceModelBuildingContext modelContext) { + public MapKeyTemporalJpaAnnotation(MapKeyTemporal annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public MapKeyTemporalJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public MapKeyTemporalJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (jakarta.persistence.TemporalType) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyTypeAnnotation.java index 14d6d72a6348..63fccb9f5399 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyTypeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapKeyTypeAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.MapKeyType; import org.hibernate.boot.models.HibernateAnnotations; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -22,14 +22,14 @@ public class MapKeyTypeAnnotation implements MapKeyType { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public MapKeyTypeAnnotation(SourceModelBuildingContext modelContext) { + public MapKeyTypeAnnotation(ModelsContext modelContext) { this.parameters = new org.hibernate.annotations.Parameter[0]; } /** * Used in creating annotation instances from JDK variant */ - public MapKeyTypeAnnotation(MapKeyType annotation, SourceModelBuildingContext modelContext) { + public MapKeyTypeAnnotation(MapKeyType annotation, ModelsContext modelContext) { this.value = annotation.value(); this.parameters = extractJdkValue( annotation, HibernateAnnotations.MAP_KEY_TYPE, "parameters", modelContext ); } @@ -37,7 +37,7 @@ public MapKeyTypeAnnotation(MapKeyType annotation, SourceModelBuildingContext mo /** * Used in creating annotation instances from Jandex variant */ - public MapKeyTypeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public MapKeyTypeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class>) attributeValues.get( "value" ); this.parameters = (org.hibernate.annotations.Parameter[]) attributeValues.get( "parameters" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MappedSuperclassJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MappedSuperclassJpaAnnotation.java index cad6d33fbd02..3074edbf52fa 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MappedSuperclassJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MappedSuperclassJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.MappedSuperclass; @@ -19,19 +19,19 @@ public class MappedSuperclassJpaAnnotation implements MappedSuperclass { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public MappedSuperclassJpaAnnotation(SourceModelBuildingContext modelContext) { + public MappedSuperclassJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public MappedSuperclassJpaAnnotation(MappedSuperclass annotation, SourceModelBuildingContext modelContext) { + public MappedSuperclassJpaAnnotation(MappedSuperclass annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public MappedSuperclassJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public MappedSuperclassJpaAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapsIdJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapsIdJpaAnnotation.java index 3136382bdf2b..805a5e346b79 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapsIdJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MapsIdJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.MapsId; @@ -19,21 +19,21 @@ public class MapsIdJpaAnnotation implements MapsId { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public MapsIdJpaAnnotation(SourceModelBuildingContext modelContext) { + public MapsIdJpaAnnotation(ModelsContext modelContext) { this.value = ""; } /** * Used in creating annotation instances from JDK variant */ - public MapsIdJpaAnnotation(MapsId annotation, SourceModelBuildingContext modelContext) { + public MapsIdJpaAnnotation(MapsId annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public MapsIdJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public MapsIdJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (String) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MutabilityAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MutabilityAnnotation.java index 0909f28f6a46..88cb3a4df643 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MutabilityAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/MutabilityAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.Mutability; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class MutabilityAnnotation implements Mutability { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public MutabilityAnnotation(SourceModelBuildingContext modelContext) { + public MutabilityAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public MutabilityAnnotation(Mutability annotation, SourceModelBuildingContext modelContext) { + public MutabilityAnnotation(Mutability annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public MutabilityAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public MutabilityAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class>) attributeValues .get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedAttributeNodeJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedAttributeNodeJpaAnnotation.java index d40605d11c30..2c70ed224ef6 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedAttributeNodeJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedAttributeNodeJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.NamedAttributeNode; @@ -21,7 +21,7 @@ public class NamedAttributeNodeJpaAnnotation implements NamedAttributeNode { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public NamedAttributeNodeJpaAnnotation(SourceModelBuildingContext modelContext) { + public NamedAttributeNodeJpaAnnotation(ModelsContext modelContext) { this.subgraph = ""; this.keySubgraph = ""; } @@ -29,7 +29,7 @@ public NamedAttributeNodeJpaAnnotation(SourceModelBuildingContext modelContext) /** * Used in creating annotation instances from JDK variant */ - public NamedAttributeNodeJpaAnnotation(NamedAttributeNode annotation, SourceModelBuildingContext modelContext) { + public NamedAttributeNodeJpaAnnotation(NamedAttributeNode annotation, ModelsContext modelContext) { this.value = annotation.value(); this.subgraph = annotation.subgraph(); this.keySubgraph = annotation.keySubgraph(); @@ -40,7 +40,7 @@ public NamedAttributeNodeJpaAnnotation(NamedAttributeNode annotation, SourceMode */ public NamedAttributeNodeJpaAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (String) attributeValues.get( "value" ); this.subgraph = (String) attributeValues.get( "subgraph" ); this.keySubgraph = (String) attributeValues.get( "keySubgraph" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphAnnotation.java index b96e6f2315b7..488734b42b83 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphAnnotation.java @@ -5,7 +5,7 @@ package org.hibernate.boot.models.annotations.internal; import org.hibernate.annotations.NamedEntityGraph; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import java.lang.annotation.Annotation; import java.util.Map; @@ -21,14 +21,14 @@ public class NamedEntityGraphAnnotation implements NamedEntityGraph { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public NamedEntityGraphAnnotation(SourceModelBuildingContext modelContext) { + public NamedEntityGraphAnnotation(ModelsContext modelContext) { name = ""; } /** * Used in creating annotation instances from JDK variant */ - public NamedEntityGraphAnnotation(NamedEntityGraph annotation, SourceModelBuildingContext modelContext) { + public NamedEntityGraphAnnotation(NamedEntityGraph annotation, ModelsContext modelContext) { this.name = annotation.name(); this.graph = annotation.graph(); } @@ -36,7 +36,7 @@ public NamedEntityGraphAnnotation(NamedEntityGraph annotation, SourceModelBuildi /** * Used in creating annotation instances from Jandex variant */ - public NamedEntityGraphAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public NamedEntityGraphAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.graph = (String) attributeValues.get( "graph" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphJpaAnnotation.java index b3b3099fed91..12f2bbcad2bd 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.NamedEntityGraph; @@ -26,7 +26,7 @@ public class NamedEntityGraphJpaAnnotation implements NamedEntityGraph { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public NamedEntityGraphJpaAnnotation(SourceModelBuildingContext modelContext) { + public NamedEntityGraphJpaAnnotation(ModelsContext modelContext) { this.name = ""; this.attributeNodes = new jakarta.persistence.NamedAttributeNode[0]; this.includeAllAttributes = false; @@ -37,7 +37,7 @@ public NamedEntityGraphJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public NamedEntityGraphJpaAnnotation(NamedEntityGraph annotation, SourceModelBuildingContext modelContext) { + public NamedEntityGraphJpaAnnotation(NamedEntityGraph annotation, ModelsContext modelContext) { this.name = annotation.name(); this.attributeNodes = extractJdkValue( annotation, NAMED_ENTITY_GRAPH, "attributeNodes", modelContext ); this.includeAllAttributes = annotation.includeAllAttributes(); @@ -48,7 +48,7 @@ public NamedEntityGraphJpaAnnotation(NamedEntityGraph annotation, SourceModelBui /** * Used in creating annotation instances from Jandex variant */ - public NamedEntityGraphJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public NamedEntityGraphJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.attributeNodes = (jakarta.persistence.NamedAttributeNode[]) attributeValues.get( "attributeNodes" ); this.includeAllAttributes = (boolean) attributeValues.get( "includeAllAttributes" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphsAnnotation.java index 202d56958aeb..dd514a4cddad 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphsAnnotation.java @@ -7,7 +7,7 @@ import org.hibernate.annotations.NamedEntityGraph; import org.hibernate.annotations.NamedEntityGraphs; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import java.lang.annotation.Annotation; import java.util.Map; @@ -24,20 +24,20 @@ public class NamedEntityGraphsAnnotation implements NamedEntityGraphs, Repeatabl /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public NamedEntityGraphsAnnotation(SourceModelBuildingContext modelContext) { + public NamedEntityGraphsAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public NamedEntityGraphsAnnotation(NamedEntityGraphs annotation, SourceModelBuildingContext modelContext) { + public NamedEntityGraphsAnnotation(NamedEntityGraphs annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, NAMED_ENTITY_GRAPHS, "value", modelContext ); } /** * Used in creating annotation instances from Jandex variant */ - public NamedEntityGraphsAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public NamedEntityGraphsAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (NamedEntityGraph[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphsJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphsJpaAnnotation.java index f61be5c2d8ab..672ed8f9d0d6 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphsJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedEntityGraphsJpaAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.boot.models.JpaAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.NamedEntityGraph; import jakarta.persistence.NamedEntityGraphs; @@ -24,13 +24,13 @@ public class NamedEntityGraphsJpaAnnotation implements NamedEntityGraphs, Repeat /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public NamedEntityGraphsJpaAnnotation(SourceModelBuildingContext modelContext) { + public NamedEntityGraphsJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public NamedEntityGraphsJpaAnnotation(NamedEntityGraphs annotation, SourceModelBuildingContext modelContext) { + public NamedEntityGraphsJpaAnnotation(NamedEntityGraphs annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, JpaAnnotations.NAMED_ENTITY_GRAPHS, "value", modelContext ); } @@ -39,7 +39,7 @@ public NamedEntityGraphsJpaAnnotation(NamedEntityGraphs annotation, SourceModelB */ public NamedEntityGraphsJpaAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (NamedEntityGraph[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueriesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueriesAnnotation.java index ccb7818339aa..4cd2a3d55b59 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueriesAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueriesAnnotation.java @@ -10,7 +10,7 @@ import org.hibernate.annotations.NamedNativeQueries; import org.hibernate.annotations.NamedNativeQuery; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.HibernateAnnotations.NAMED_NATIVE_QUERIES; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -23,20 +23,20 @@ public class NamedNativeQueriesAnnotation implements NamedNativeQueries, Repeata /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public NamedNativeQueriesAnnotation(SourceModelBuildingContext modelContext) { + public NamedNativeQueriesAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public NamedNativeQueriesAnnotation(NamedNativeQueries annotation, SourceModelBuildingContext modelContext) { + public NamedNativeQueriesAnnotation(NamedNativeQueries annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, NAMED_NATIVE_QUERIES, "value", modelContext ); } /** * Used in creating annotation instances from Jandex variant */ - public NamedNativeQueriesAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public NamedNativeQueriesAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (NamedNativeQuery[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueriesJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueriesJpaAnnotation.java index b614aeaa1c5d..b89ba1a8773f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueriesJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueriesJpaAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.boot.models.JpaAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.NamedNativeQueries; import jakarta.persistence.NamedNativeQuery; @@ -24,13 +24,13 @@ public class NamedNativeQueriesJpaAnnotation implements NamedNativeQueries, Repe /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public NamedNativeQueriesJpaAnnotation(SourceModelBuildingContext modelContext) { + public NamedNativeQueriesJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public NamedNativeQueriesJpaAnnotation(NamedNativeQueries annotation, SourceModelBuildingContext modelContext) { + public NamedNativeQueriesJpaAnnotation(NamedNativeQueries annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, JpaAnnotations.NAMED_NATIVE_QUERIES, "value", modelContext ); } @@ -39,7 +39,7 @@ public NamedNativeQueriesJpaAnnotation(NamedNativeQueries annotation, SourceMode */ public NamedNativeQueriesJpaAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (NamedNativeQuery[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueryAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueryAnnotation.java index 7477235674fc..71979ad43525 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueryAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueryAnnotation.java @@ -18,7 +18,7 @@ import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.collections.CollectionHelper; import org.hibernate.models.spi.MutableClassDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.CacheRetrieveMode; import jakarta.persistence.CacheStoreMode; @@ -46,7 +46,7 @@ public class NamedNativeQueryAnnotation implements NamedNativeQuery { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public NamedNativeQueryAnnotation(SourceModelBuildingContext modelContext) { + public NamedNativeQueryAnnotation(ModelsContext modelContext) { resultClass = void.class; resultSetMapping = ""; flushMode = FlushModeType.PERSISTENCE_CONTEXT; @@ -65,7 +65,7 @@ public NamedNativeQueryAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public NamedNativeQueryAnnotation(NamedNativeQuery annotation, SourceModelBuildingContext modelContext) { + public NamedNativeQueryAnnotation(NamedNativeQuery annotation, ModelsContext modelContext) { this.name = annotation.name(); this.query = annotation.query(); this.resultClass = annotation.resultClass(); @@ -90,7 +90,7 @@ public NamedNativeQueryAnnotation(NamedNativeQuery annotation, SourceModelBuildi /** * Used in creating annotation instances from Jandex variant */ - public NamedNativeQueryAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public NamedNativeQueryAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.query = (String) attributeValues.get( "query" ); this.resultClass = (Class) attributeValues.get( "resultClass" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueryJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueryJpaAnnotation.java index c10a32e23943..5ea936764c04 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueryJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedNativeQueryJpaAnnotation.java @@ -13,7 +13,7 @@ import org.hibernate.boot.models.xml.spi.XmlDocumentContext; import org.hibernate.internal.util.StringHelper; import org.hibernate.models.spi.MutableClassDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.NamedNativeQuery; @@ -34,7 +34,7 @@ public class NamedNativeQueryJpaAnnotation implements NamedNativeQuery { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public NamedNativeQueryJpaAnnotation(SourceModelBuildingContext modelContext) { + public NamedNativeQueryJpaAnnotation(ModelsContext modelContext) { this.hints = new jakarta.persistence.QueryHint[0]; this.resultClass = void.class; this.resultSetMapping = ""; @@ -46,7 +46,7 @@ public NamedNativeQueryJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public NamedNativeQueryJpaAnnotation(NamedNativeQuery annotation, SourceModelBuildingContext modelContext) { + public NamedNativeQueryJpaAnnotation(NamedNativeQuery annotation, ModelsContext modelContext) { this.name = annotation.name(); this.query = annotation.query(); this.hints = extractJdkValue( annotation, JpaAnnotations.NAMED_NATIVE_QUERY, "hints", modelContext ); @@ -60,7 +60,7 @@ public NamedNativeQueryJpaAnnotation(NamedNativeQuery annotation, SourceModelBui /** * Used in creating annotation instances from Jandex variant */ - public NamedNativeQueryJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public NamedNativeQueryJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.query = (String) attributeValues.get( "query" ); this.hints = (jakarta.persistence.QueryHint[]) attributeValues.get( "hints" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueriesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueriesAnnotation.java index 06d74fd6eb4f..1a9e0d55b791 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueriesAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueriesAnnotation.java @@ -10,7 +10,7 @@ import org.hibernate.annotations.NamedQueries; import org.hibernate.annotations.NamedQuery; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.HibernateAnnotations.NAMED_QUERIES; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -23,20 +23,20 @@ public class NamedQueriesAnnotation implements NamedQueries, RepeatableContainer /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public NamedQueriesAnnotation(SourceModelBuildingContext modelContext) { + public NamedQueriesAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public NamedQueriesAnnotation(NamedQueries annotation, SourceModelBuildingContext modelContext) { + public NamedQueriesAnnotation(NamedQueries annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, NAMED_QUERIES, "value", modelContext ); } /** * Used in creating annotation instances from Jandex variant */ - public NamedQueriesAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public NamedQueriesAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (NamedQuery[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueriesJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueriesJpaAnnotation.java index 484451ac30d2..d7748d8ff966 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueriesJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueriesJpaAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.boot.models.JpaAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; @@ -24,20 +24,20 @@ public class NamedQueriesJpaAnnotation implements NamedQueries, RepeatableContai /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public NamedQueriesJpaAnnotation(SourceModelBuildingContext modelContext) { + public NamedQueriesJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public NamedQueriesJpaAnnotation(NamedQueries annotation, SourceModelBuildingContext modelContext) { + public NamedQueriesJpaAnnotation(NamedQueries annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, JpaAnnotations.NAMED_QUERIES, "value", modelContext ); } /** * Used in creating annotation instances from Jandex variant */ - public NamedQueriesJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public NamedQueriesJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (NamedQuery[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueryAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueryAnnotation.java index 66aa30d8c3cf..af75f99e527c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueryAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueryAnnotation.java @@ -13,7 +13,7 @@ import org.hibernate.boot.jaxb.mapping.spi.JaxbNamedHqlQueryImpl; import org.hibernate.boot.models.xml.spi.XmlDocumentContext; import org.hibernate.internal.util.StringHelper; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.CacheRetrieveMode; import jakarta.persistence.CacheStoreMode; @@ -41,7 +41,7 @@ public class NamedQueryAnnotation implements NamedQuery { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public NamedQueryAnnotation(SourceModelBuildingContext modelContext) { + public NamedQueryAnnotation(ModelsContext modelContext) { resultClass = void.class; flushMode = FlushModeType.PERSISTENCE_CONTEXT; flush = QueryFlushMode.DEFAULT; @@ -58,7 +58,7 @@ public NamedQueryAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK and Jandes variant */ - public NamedQueryAnnotation(NamedQuery annotation, SourceModelBuildingContext modelContext) { + public NamedQueryAnnotation(NamedQuery annotation, ModelsContext modelContext) { this.name = annotation.name(); this.query = annotation.query(); this.resultClass = annotation.resultClass(); @@ -81,7 +81,7 @@ public NamedQueryAnnotation(NamedQuery annotation, SourceModelBuildingContext mo /** * Used in creating annotation instances from Jandex variant */ - public NamedQueryAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public NamedQueryAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.query = (String) attributeValues.get( "query" ); this.resultClass = (Class) attributeValues.get( "resultClass" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueryJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueryJpaAnnotation.java index 0199f63bdfb2..916a9038cd7a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueryJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedQueryJpaAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.boot.models.JpaAnnotations; import org.hibernate.boot.models.xml.internal.QueryProcessing; import org.hibernate.boot.models.xml.spi.XmlDocumentContext; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.NamedQuery; @@ -30,7 +30,7 @@ public class NamedQueryJpaAnnotation implements NamedQuery { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public NamedQueryJpaAnnotation(SourceModelBuildingContext modelContext) { + public NamedQueryJpaAnnotation(ModelsContext modelContext) { this.resultClass = void.class; this.lockMode = jakarta.persistence.LockModeType.NONE; this.hints = new jakarta.persistence.QueryHint[0]; @@ -39,7 +39,7 @@ public NamedQueryJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public NamedQueryJpaAnnotation(NamedQuery annotation, SourceModelBuildingContext modelContext) { + public NamedQueryJpaAnnotation(NamedQuery annotation, ModelsContext modelContext) { this.name = annotation.name(); this.query = annotation.query(); this.resultClass = annotation.resultClass(); @@ -50,7 +50,7 @@ public NamedQueryJpaAnnotation(NamedQuery annotation, SourceModelBuildingContext /** * Used in creating annotation instances from Jandex variant */ - public NamedQueryJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public NamedQueryJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.query = (String) attributeValues.get( "query" ); this.resultClass = (Class) attributeValues.get( "resultClass" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedStoredProcedureQueriesJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedStoredProcedureQueriesJpaAnnotation.java index 244d52f847ac..ecc863752f35 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedStoredProcedureQueriesJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedStoredProcedureQueriesJpaAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.boot.models.JpaAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.NamedStoredProcedureQueries; import jakarta.persistence.NamedStoredProcedureQuery; @@ -25,7 +25,7 @@ public class NamedStoredProcedureQueriesJpaAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public NamedStoredProcedureQueriesJpaAnnotation(SourceModelBuildingContext modelContext) { + public NamedStoredProcedureQueriesJpaAnnotation(ModelsContext modelContext) { } /** @@ -33,7 +33,7 @@ public NamedStoredProcedureQueriesJpaAnnotation(SourceModelBuildingContext model */ public NamedStoredProcedureQueriesJpaAnnotation( NamedStoredProcedureQueries annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = extractJdkValue( annotation, JpaAnnotations.NAMED_STORED_PROCEDURE_QUERIES, @@ -47,7 +47,7 @@ public NamedStoredProcedureQueriesJpaAnnotation( */ public NamedStoredProcedureQueriesJpaAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (NamedStoredProcedureQuery[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedStoredProcedureQueryJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedStoredProcedureQueryJpaAnnotation.java index dc5416668dc7..74802b06d99f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedStoredProcedureQueryJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedStoredProcedureQueryJpaAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.boot.models.JpaAnnotations; import org.hibernate.boot.models.xml.internal.QueryProcessing; import org.hibernate.boot.models.xml.spi.XmlDocumentContext; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.NamedStoredProcedureQuery; @@ -30,7 +30,7 @@ public class NamedStoredProcedureQueryJpaAnnotation implements NamedStoredProced /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public NamedStoredProcedureQueryJpaAnnotation(SourceModelBuildingContext modelContext) { + public NamedStoredProcedureQueryJpaAnnotation(ModelsContext modelContext) { this.parameters = new jakarta.persistence.StoredProcedureParameter[0]; this.resultClasses = new java.lang.Class[0]; this.resultSetMappings = new String[0]; @@ -42,7 +42,7 @@ public NamedStoredProcedureQueryJpaAnnotation(SourceModelBuildingContext modelCo */ public NamedStoredProcedureQueryJpaAnnotation( NamedStoredProcedureQuery annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.name = annotation.name(); this.procedureName = annotation.procedureName(); this.parameters = extractJdkValue( @@ -61,7 +61,7 @@ public NamedStoredProcedureQueryJpaAnnotation( */ public NamedStoredProcedureQueryJpaAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.procedureName = (String) attributeValues.get( "procedureName" ); this.parameters = (jakarta.persistence.StoredProcedureParameter[]) attributeValues.get( "parameters" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedSubgraphJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedSubgraphJpaAnnotation.java index 7944fd4200f0..bedeadf53afe 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedSubgraphJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NamedSubgraphJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.NamedSubgraph; @@ -24,14 +24,14 @@ public class NamedSubgraphJpaAnnotation implements NamedSubgraph { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public NamedSubgraphJpaAnnotation(SourceModelBuildingContext modelContext) { + public NamedSubgraphJpaAnnotation(ModelsContext modelContext) { this.type = void.class; } /** * Used in creating annotation instances from JDK variant */ - public NamedSubgraphJpaAnnotation(NamedSubgraph annotation, SourceModelBuildingContext modelContext) { + public NamedSubgraphJpaAnnotation(NamedSubgraph annotation, ModelsContext modelContext) { this.name = annotation.name(); this.type = annotation.type(); this.attributeNodes = extractJdkValue( annotation, NAMED_SUBGRAPH, "attributeNodes", modelContext ); @@ -40,7 +40,7 @@ public NamedSubgraphJpaAnnotation(NamedSubgraph annotation, SourceModelBuildingC /** * Used in creating annotation instances from Jandex variant */ - public NamedSubgraphJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public NamedSubgraphJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.type = (Class) attributeValues.get( "type" ); this.attributeNodes = (jakarta.persistence.NamedAttributeNode[]) attributeValues.get( "attributeNodes" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NationalizedAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NationalizedAnnotation.java index 51a708371078..13977fe1ad18 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NationalizedAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NationalizedAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.Nationalized; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -17,19 +17,19 @@ public class NationalizedAnnotation implements Nationalized { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public NationalizedAnnotation(SourceModelBuildingContext modelContext) { + public NationalizedAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public NationalizedAnnotation(Nationalized annotation, SourceModelBuildingContext modelContext) { + public NationalizedAnnotation(Nationalized annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public NationalizedAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public NationalizedAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NativeGeneratorAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NativeGeneratorAnnotation.java index e9d41896ee3a..90c6f7ad56c1 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NativeGeneratorAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NativeGeneratorAnnotation.java @@ -8,7 +8,7 @@ import jakarta.persistence.TableGenerator; import org.hibernate.annotations.NativeGenerator; import org.hibernate.boot.model.internal.GeneratorStrategies; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import java.lang.annotation.Annotation; import java.util.Map; @@ -30,7 +30,7 @@ public NativeGeneratorAnnotation() { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public NativeGeneratorAnnotation(SourceModelBuildingContext modelContext) { + public NativeGeneratorAnnotation(ModelsContext modelContext) { this.sequenceForm = new SequenceGeneratorJpaAnnotation( modelContext ); this.tableForm = new TableGeneratorJpaAnnotation( modelContext ); } @@ -38,7 +38,7 @@ public NativeGeneratorAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public NativeGeneratorAnnotation(NativeGenerator annotation, SourceModelBuildingContext modelContext) { + public NativeGeneratorAnnotation(NativeGenerator annotation, ModelsContext modelContext) { this.sequenceForm = annotation.sequenceForm(); this.tableForm = annotation.tableForm(); } @@ -46,7 +46,7 @@ public NativeGeneratorAnnotation(NativeGenerator annotation, SourceModelBuilding /** * Used in creating annotation instances from Jandex variant */ - public NativeGeneratorAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public NativeGeneratorAnnotation(Map attributeValues, ModelsContext modelContext) { this.sequenceForm = (SequenceGenerator) attributeValues.get( "sequenceForm" ); this.tableForm = (TableGenerator) attributeValues.get( "tableForm" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NaturalIdAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NaturalIdAnnotation.java index c359b476cda4..2c9bbe3850a0 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NaturalIdAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NaturalIdAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.NaturalId; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,21 +18,21 @@ public class NaturalIdAnnotation implements NaturalId { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public NaturalIdAnnotation(SourceModelBuildingContext modelContext) { + public NaturalIdAnnotation(ModelsContext modelContext) { this.mutable = false; } /** * Used in creating annotation instances from JDK variant */ - public NaturalIdAnnotation(NaturalId annotation, SourceModelBuildingContext modelContext) { + public NaturalIdAnnotation(NaturalId annotation, ModelsContext modelContext) { this.mutable = annotation.mutable(); } /** * Used in creating annotation instances from Jandex variant */ - public NaturalIdAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public NaturalIdAnnotation(Map attributeValues, ModelsContext modelContext) { this.mutable = (boolean) attributeValues.get( "mutable" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NaturalIdCacheAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NaturalIdCacheAnnotation.java index 139bf9b94810..a402535b56b5 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NaturalIdCacheAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NaturalIdCacheAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.NaturalIdCache; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,21 +18,21 @@ public class NaturalIdCacheAnnotation implements NaturalIdCache { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public NaturalIdCacheAnnotation(SourceModelBuildingContext modelContext) { + public NaturalIdCacheAnnotation(ModelsContext modelContext) { this.region = ""; } /** * Used in creating annotation instances from JDK variant */ - public NaturalIdCacheAnnotation(NaturalIdCache annotation, SourceModelBuildingContext modelContext) { + public NaturalIdCacheAnnotation(NaturalIdCache annotation, ModelsContext modelContext) { this.region = annotation.region(); } /** * Used in creating annotation instances from Jandex variant */ - public NaturalIdCacheAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public NaturalIdCacheAnnotation(Map attributeValues, ModelsContext modelContext) { this.region = (String) attributeValues.get( "region" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NotFoundAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NotFoundAnnotation.java index 6859f632f9fc..d518a2bac4d3 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NotFoundAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/NotFoundAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.NotFound; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,21 +18,21 @@ public class NotFoundAnnotation implements NotFound { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public NotFoundAnnotation(SourceModelBuildingContext modelContext) { + public NotFoundAnnotation(ModelsContext modelContext) { this.action = org.hibernate.annotations.NotFoundAction.EXCEPTION; } /** * Used in creating annotation instances from JDK variant */ - public NotFoundAnnotation(NotFound annotation, SourceModelBuildingContext modelContext) { + public NotFoundAnnotation(NotFound annotation, ModelsContext modelContext) { this.action = annotation.action(); } /** * Used in creating annotation instances from Jandex variant */ - public NotFoundAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public NotFoundAnnotation(Map attributeValues, ModelsContext modelContext) { this.action = (org.hibernate.annotations.NotFoundAction) attributeValues.get( "action" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OnDeleteAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OnDeleteAnnotation.java index 5666ffc71b44..8067de788146 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OnDeleteAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OnDeleteAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.OnDelete; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class OnDeleteAnnotation implements OnDelete { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OnDeleteAnnotation(SourceModelBuildingContext modelContext) { + public OnDeleteAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public OnDeleteAnnotation(OnDelete annotation, SourceModelBuildingContext modelContext) { + public OnDeleteAnnotation(OnDelete annotation, ModelsContext modelContext) { this.action = annotation.action(); } /** * Used in creating annotation instances from Jandex variant */ - public OnDeleteAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public OnDeleteAnnotation(Map attributeValues, ModelsContext modelContext) { this.action = (org.hibernate.annotations.OnDeleteAction) attributeValues.get( "action" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OneToManyJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OneToManyJpaAnnotation.java index 067019dc0246..2f006808167b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OneToManyJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OneToManyJpaAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.boot.models.annotations.spi.AttributeMarker; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.OneToMany; @@ -24,7 +24,7 @@ public class OneToManyJpaAnnotation implements OneToMany, AttributeMarker.Fetcha /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OneToManyJpaAnnotation(SourceModelBuildingContext modelContext) { + public OneToManyJpaAnnotation(ModelsContext modelContext) { this.targetEntity = void.class; this.cascade = new jakarta.persistence.CascadeType[0]; this.fetch = jakarta.persistence.FetchType.LAZY; @@ -35,7 +35,7 @@ public OneToManyJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public OneToManyJpaAnnotation(OneToMany annotation, SourceModelBuildingContext modelContext) { + public OneToManyJpaAnnotation(OneToMany annotation, ModelsContext modelContext) { this.targetEntity = annotation.targetEntity(); this.cascade = annotation.cascade(); this.fetch = annotation.fetch(); @@ -46,7 +46,7 @@ public OneToManyJpaAnnotation(OneToMany annotation, SourceModelBuildingContext m /** * Used in creating annotation instances from Jandex variant */ - public OneToManyJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public OneToManyJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.targetEntity = (Class) attributeValues.get( "targetEntity" ); this.cascade = (jakarta.persistence.CascadeType[]) attributeValues.get( "cascade" ); this.fetch = (jakarta.persistence.FetchType) attributeValues.get( "fetch" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OneToOneJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OneToOneJpaAnnotation.java index 153b64367c25..d756ed55d562 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OneToOneJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OneToOneJpaAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.boot.models.annotations.spi.AttributeMarker; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.OneToOne; @@ -26,7 +26,7 @@ public class OneToOneJpaAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OneToOneJpaAnnotation(SourceModelBuildingContext modelContext) { + public OneToOneJpaAnnotation(ModelsContext modelContext) { this.targetEntity = void.class; this.cascade = new jakarta.persistence.CascadeType[0]; this.fetch = jakarta.persistence.FetchType.EAGER; @@ -38,7 +38,7 @@ public OneToOneJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public OneToOneJpaAnnotation(OneToOne annotation, SourceModelBuildingContext modelContext) { + public OneToOneJpaAnnotation(OneToOne annotation, ModelsContext modelContext) { this.targetEntity = annotation.targetEntity(); this.cascade = annotation.cascade(); this.fetch = annotation.fetch(); @@ -50,7 +50,7 @@ public OneToOneJpaAnnotation(OneToOne annotation, SourceModelBuildingContext mod /** * Used in creating annotation instances from Jandex variant */ - public OneToOneJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public OneToOneJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.targetEntity = (Class) attributeValues.get( "targetEntity" ); this.cascade = (jakarta.persistence.CascadeType[]) attributeValues.get( "cascade" ); this.fetch = (jakarta.persistence.FetchType) attributeValues.get( "fetch" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OptimisticLockAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OptimisticLockAnnotation.java index 709ec0dc9e0d..66726b3e2022 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OptimisticLockAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OptimisticLockAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.OptimisticLock; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class OptimisticLockAnnotation implements OptimisticLock { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OptimisticLockAnnotation(SourceModelBuildingContext modelContext) { + public OptimisticLockAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public OptimisticLockAnnotation(OptimisticLock annotation, SourceModelBuildingContext modelContext) { + public OptimisticLockAnnotation(OptimisticLock annotation, ModelsContext modelContext) { this.excluded = annotation.excluded(); } /** * Used in creating annotation instances from Jandex variant */ - public OptimisticLockAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public OptimisticLockAnnotation(Map attributeValues, ModelsContext modelContext) { this.excluded = (boolean) attributeValues.get( "excluded" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OptimisticLockingAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OptimisticLockingAnnotation.java index 2f6cf79719a8..94e2a70b8d58 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OptimisticLockingAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OptimisticLockingAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.OptimisticLocking; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,21 +18,21 @@ public class OptimisticLockingAnnotation implements OptimisticLocking { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OptimisticLockingAnnotation(SourceModelBuildingContext modelContext) { + public OptimisticLockingAnnotation(ModelsContext modelContext) { this.type = org.hibernate.annotations.OptimisticLockType.VERSION; } /** * Used in creating annotation instances from JDK variant */ - public OptimisticLockingAnnotation(OptimisticLocking annotation, SourceModelBuildingContext modelContext) { + public OptimisticLockingAnnotation(OptimisticLocking annotation, ModelsContext modelContext) { this.type = annotation.type(); } /** * Used in creating annotation instances from Jandex variant */ - public OptimisticLockingAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public OptimisticLockingAnnotation(Map attributeValues, ModelsContext modelContext) { this.type = (org.hibernate.annotations.OptimisticLockType) attributeValues.get( "type" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OrderByJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OrderByJpaAnnotation.java index bf9b6047324e..788356cd89ce 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OrderByJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OrderByJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.OrderBy; @@ -19,21 +19,21 @@ public class OrderByJpaAnnotation implements OrderBy { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OrderByJpaAnnotation(SourceModelBuildingContext modelContext) { + public OrderByJpaAnnotation(ModelsContext modelContext) { this.value = ""; } /** * Used in creating annotation instances from JDK variant */ - public OrderByJpaAnnotation(OrderBy annotation, SourceModelBuildingContext modelContext) { + public OrderByJpaAnnotation(OrderBy annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public OrderByJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public OrderByJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (String) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OrderColumnJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OrderColumnJpaAnnotation.java index 75c2235da74f..9de1cb39c3b5 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OrderColumnJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OrderColumnJpaAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.boot.models.annotations.spi.ColumnDetails; import org.hibernate.boot.models.xml.spi.XmlDocumentContext; import org.hibernate.internal.util.StringHelper; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.OrderColumn; @@ -32,7 +32,7 @@ public class OrderColumnJpaAnnotation implements OrderColumn, /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OrderColumnJpaAnnotation(SourceModelBuildingContext modelContext) { + public OrderColumnJpaAnnotation(ModelsContext modelContext) { this.name = ""; this.nullable = true; this.insertable = true; @@ -44,7 +44,7 @@ public OrderColumnJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public OrderColumnJpaAnnotation(OrderColumn annotation, SourceModelBuildingContext modelContext) { + public OrderColumnJpaAnnotation(OrderColumn annotation, ModelsContext modelContext) { this.name = annotation.name(); this.nullable = annotation.nullable(); this.insertable = annotation.insertable(); @@ -56,7 +56,7 @@ public OrderColumnJpaAnnotation(OrderColumn annotation, SourceModelBuildingConte /** * Used in creating annotation instances from Jandex variant */ - public OrderColumnJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public OrderColumnJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.nullable = (boolean) attributeValues.get( "nullable" ); this.insertable = (boolean) attributeValues.get( "insertable" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenCheckAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenCheckAnnotation.java index 7db3b7b1a64b..9bbbf39847a5 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenCheckAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenCheckAnnotation.java @@ -13,7 +13,7 @@ import org.hibernate.boot.models.annotations.spi.AbstractOverrider; import org.hibernate.boot.models.annotations.spi.DialectOverrider; import org.hibernate.models.spi.AnnotationDescriptor; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_CHECK; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -30,13 +30,13 @@ public class OverriddenCheckAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenCheckAnnotation(SourceModelBuildingContext modelContext) { + public OverriddenCheckAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public OverriddenCheckAnnotation(DialectOverride.Check annotation, SourceModelBuildingContext modelContext) { + public OverriddenCheckAnnotation(DialectOverride.Check annotation, ModelsContext modelContext) { dialect( annotation.dialect() ); before( annotation.before() ); sameOrAfter( annotation.sameOrAfter() ); @@ -46,7 +46,7 @@ public OverriddenCheckAnnotation(DialectOverride.Check annotation, SourceModelBu /** * Used in creating annotation instances from Jandex variant */ - public OverriddenCheckAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public OverriddenCheckAnnotation(Map attributeValues, ModelsContext modelContext) { super( attributeValues, DIALECT_OVERRIDE_CHECK, modelContext ); override( (Check) attributeValues.get( "override" ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenChecksAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenChecksAnnotation.java index c0ffa1026d6c..5337cd3aeee8 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenChecksAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenChecksAnnotation.java @@ -10,7 +10,7 @@ import org.hibernate.annotations.DialectOverride; import org.hibernate.boot.models.DialectOverrideAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -25,20 +25,20 @@ public class OverriddenChecksAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenChecksAnnotation(SourceModelBuildingContext modelContext) { + public OverriddenChecksAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public OverriddenChecksAnnotation(DialectOverride.Checks annotation, SourceModelBuildingContext modelContext) { + public OverriddenChecksAnnotation(DialectOverride.Checks annotation, ModelsContext modelContext) { value( extractJdkValue( annotation, DialectOverrideAnnotations.DIALECT_OVERRIDE_CHECKS, "value", modelContext ) ); } /** * Used in creating annotation instances from Jandex variant */ - public OverriddenChecksAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public OverriddenChecksAnnotation(Map attributeValues, ModelsContext modelContext) { value( (DialectOverride.Check[]) attributeValues.get( "value" ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenColumnDefaultAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenColumnDefaultAnnotation.java index 0e34640b607e..1d6d1ec36029 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenColumnDefaultAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenColumnDefaultAnnotation.java @@ -13,7 +13,7 @@ import org.hibernate.boot.models.annotations.spi.AbstractOverrider; import org.hibernate.boot.models.annotations.spi.DialectOverrider; import org.hibernate.models.spi.AnnotationDescriptor; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_COLUMN_DEFAULT; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -30,7 +30,7 @@ public class OverriddenColumnDefaultAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenColumnDefaultAnnotation(SourceModelBuildingContext modelContext) { + public OverriddenColumnDefaultAnnotation(ModelsContext modelContext) { } /** @@ -38,7 +38,7 @@ public OverriddenColumnDefaultAnnotation(SourceModelBuildingContext modelContext */ public OverriddenColumnDefaultAnnotation( DialectOverride.ColumnDefault annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { dialect( annotation.dialect() ); before( annotation.before() ); sameOrAfter( annotation.sameOrAfter() ); @@ -50,7 +50,7 @@ public OverriddenColumnDefaultAnnotation( */ public OverriddenColumnDefaultAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { super( attributeValues, DIALECT_OVERRIDE_COLUMN_DEFAULT, modelContext ); override( (ColumnDefault) attributeValues.get( "override" ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenColumnDefaultsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenColumnDefaultsAnnotation.java index a0c4e4a61495..2290923ee9aa 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenColumnDefaultsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenColumnDefaultsAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.DialectOverride; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_COLUMN_DEFAULTS; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -26,7 +26,7 @@ public class OverriddenColumnDefaultsAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenColumnDefaultsAnnotation(SourceModelBuildingContext modelContext) { + public OverriddenColumnDefaultsAnnotation(ModelsContext modelContext) { } /** @@ -34,7 +34,7 @@ public OverriddenColumnDefaultsAnnotation(SourceModelBuildingContext modelContex */ public OverriddenColumnDefaultsAnnotation( DialectOverride.ColumnDefaults annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = extractJdkValue( annotation, DIALECT_OVERRIDE_COLUMN_DEFAULTS, "value", modelContext ); } @@ -43,7 +43,7 @@ public OverriddenColumnDefaultsAnnotation( */ public OverriddenColumnDefaultsAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (DialectOverride.ColumnDefault[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenDiscriminatorFormulaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenDiscriminatorFormulaAnnotation.java index 2e8692e97a89..174b4f468fe3 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenDiscriminatorFormulaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenDiscriminatorFormulaAnnotation.java @@ -13,7 +13,7 @@ import org.hibernate.boot.models.annotations.spi.AbstractOverrider; import org.hibernate.boot.models.annotations.spi.DialectOverrider; import org.hibernate.models.spi.AnnotationDescriptor; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_DISCRIMINATOR_FORMULA; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -30,7 +30,7 @@ public class OverriddenDiscriminatorFormulaAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenDiscriminatorFormulaAnnotation(SourceModelBuildingContext modelContext) { + public OverriddenDiscriminatorFormulaAnnotation(ModelsContext modelContext) { } /** @@ -38,7 +38,7 @@ public OverriddenDiscriminatorFormulaAnnotation(SourceModelBuildingContext model */ public OverriddenDiscriminatorFormulaAnnotation( DialectOverride.DiscriminatorFormula annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { dialect( annotation.dialect() ); before( annotation.before() ); sameOrAfter( annotation.sameOrAfter() ); @@ -50,7 +50,7 @@ public OverriddenDiscriminatorFormulaAnnotation( */ public OverriddenDiscriminatorFormulaAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { super( attributeValues, DIALECT_OVERRIDE_DISCRIMINATOR_FORMULA, modelContext ); override( (DiscriminatorFormula) attributeValues.get( "override" ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenDiscriminatorFormulasAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenDiscriminatorFormulasAnnotation.java index 16a521c5641a..57bc6a8add04 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenDiscriminatorFormulasAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenDiscriminatorFormulasAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.DialectOverride; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_DISCRIMINATOR_FORMULAS; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -26,7 +26,7 @@ public class OverriddenDiscriminatorFormulasAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenDiscriminatorFormulasAnnotation(SourceModelBuildingContext modelContext) { + public OverriddenDiscriminatorFormulasAnnotation(ModelsContext modelContext) { } /** @@ -34,7 +34,7 @@ public OverriddenDiscriminatorFormulasAnnotation(SourceModelBuildingContext mode */ public OverriddenDiscriminatorFormulasAnnotation( DialectOverride.DiscriminatorFormulas annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = extractJdkValue( annotation, DIALECT_OVERRIDE_DISCRIMINATOR_FORMULAS, "value", modelContext ); } @@ -43,7 +43,7 @@ public OverriddenDiscriminatorFormulasAnnotation( */ public OverriddenDiscriminatorFormulasAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (DialectOverride.DiscriminatorFormula[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterDefOverridesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterDefOverridesAnnotation.java index e8e9a80dbbc1..3ea54c2b7988 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterDefOverridesAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterDefOverridesAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.DialectOverride; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_FILTER_DEF_OVERRIDES; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -25,7 +25,7 @@ public class OverriddenFilterDefOverridesAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenFilterDefOverridesAnnotation(SourceModelBuildingContext modelContext) { + public OverriddenFilterDefOverridesAnnotation(ModelsContext modelContext) { } /** @@ -33,7 +33,7 @@ public OverriddenFilterDefOverridesAnnotation(SourceModelBuildingContext modelCo */ public OverriddenFilterDefOverridesAnnotation( DialectOverride.FilterDefOverrides annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = extractJdkValue( annotation, DIALECT_OVERRIDE_FILTER_DEF_OVERRIDES, "value", modelContext ); } @@ -42,7 +42,7 @@ public OverriddenFilterDefOverridesAnnotation( */ public OverriddenFilterDefOverridesAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (DialectOverride.FilterDefs[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterDefsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterDefsAnnotation.java index d00927fc8b9e..04650f25cbb3 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterDefsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterDefsAnnotation.java @@ -13,7 +13,7 @@ import org.hibernate.boot.models.annotations.spi.AbstractOverrider; import org.hibernate.boot.models.annotations.spi.DialectOverrider; import org.hibernate.models.spi.AnnotationDescriptor; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_FILTER_DEFS; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -30,7 +30,7 @@ public class OverriddenFilterDefsAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenFilterDefsAnnotation(SourceModelBuildingContext modelContext) { + public OverriddenFilterDefsAnnotation(ModelsContext modelContext) { } /** @@ -38,7 +38,7 @@ public OverriddenFilterDefsAnnotation(SourceModelBuildingContext modelContext) { */ public OverriddenFilterDefsAnnotation( DialectOverride.FilterDefs annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { dialect( annotation.dialect() ); before( annotation.before() ); sameOrAfter( annotation.sameOrAfter() ); @@ -50,7 +50,7 @@ public OverriddenFilterDefsAnnotation( */ public OverriddenFilterDefsAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { super( attributeValues, DIALECT_OVERRIDE_FILTER_DEFS, modelContext ); override( (FilterDefs) attributeValues.get( "override" ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterOverridesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterOverridesAnnotation.java index d6f74f3968da..b2913d3ef1cb 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterOverridesAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFilterOverridesAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.DialectOverride; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_FILTER_OVERRIDES; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -25,7 +25,7 @@ public class OverriddenFilterOverridesAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenFilterOverridesAnnotation(SourceModelBuildingContext modelContext) { + public OverriddenFilterOverridesAnnotation(ModelsContext modelContext) { } /** @@ -33,7 +33,7 @@ public OverriddenFilterOverridesAnnotation(SourceModelBuildingContext modelConte */ public OverriddenFilterOverridesAnnotation( DialectOverride.FilterOverrides annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = extractJdkValue( annotation, DIALECT_OVERRIDE_FILTER_OVERRIDES, "value", modelContext ); } @@ -42,7 +42,7 @@ public OverriddenFilterOverridesAnnotation( */ public OverriddenFilterOverridesAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (DialectOverride.Filters[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFiltersAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFiltersAnnotation.java index b2fa630a65c1..193db875682f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFiltersAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFiltersAnnotation.java @@ -13,7 +13,7 @@ import org.hibernate.boot.models.annotations.spi.AbstractOverrider; import org.hibernate.boot.models.annotations.spi.DialectOverrider; import org.hibernate.models.spi.AnnotationDescriptor; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_FILTERS; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -30,7 +30,7 @@ public class OverriddenFiltersAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenFiltersAnnotation(SourceModelBuildingContext sourceModelContext) { + public OverriddenFiltersAnnotation(ModelsContext sourceModelContext) { } /** @@ -38,7 +38,7 @@ public OverriddenFiltersAnnotation(SourceModelBuildingContext sourceModelContext */ public OverriddenFiltersAnnotation( DialectOverride.Filters annotation, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { dialect( annotation.dialect() ); before( annotation.before() ); sameOrAfter( annotation.sameOrAfter() ); @@ -50,7 +50,7 @@ public OverriddenFiltersAnnotation( */ public OverriddenFiltersAnnotation( Map attributeValues, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { super( attributeValues, DIALECT_OVERRIDE_FILTERS, sourceModelContext ); override( (Filters) attributeValues.get( "override" ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFormulaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFormulaAnnotation.java index 25e821632500..f14b706facec 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFormulaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFormulaAnnotation.java @@ -13,7 +13,7 @@ import org.hibernate.boot.models.annotations.spi.AbstractOverrider; import org.hibernate.boot.models.annotations.spi.DialectOverrider; import org.hibernate.models.spi.AnnotationDescriptor; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_FORMULA; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -30,7 +30,7 @@ public class OverriddenFormulaAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenFormulaAnnotation(SourceModelBuildingContext sourceModelContext) { + public OverriddenFormulaAnnotation(ModelsContext sourceModelContext) { } /** @@ -38,7 +38,7 @@ public OverriddenFormulaAnnotation(SourceModelBuildingContext sourceModelContext */ public OverriddenFormulaAnnotation( DialectOverride.Formula annotation, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { dialect( annotation.dialect() ); before( annotation.before() ); sameOrAfter( annotation.sameOrAfter() ); @@ -50,7 +50,7 @@ public OverriddenFormulaAnnotation( */ public OverriddenFormulaAnnotation( Map attributeValues, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { super( attributeValues, DIALECT_OVERRIDE_FORMULA, sourceModelContext ); override( (Formula) attributeValues.get( "override" ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFormulasAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFormulasAnnotation.java index 1895968ea3d5..0e0a11a99a5d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFormulasAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenFormulasAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.DialectOverride; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_FORMULAS; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -25,20 +25,20 @@ public class OverriddenFormulasAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenFormulasAnnotation(SourceModelBuildingContext modelContext) { + public OverriddenFormulasAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public OverriddenFormulasAnnotation(DialectOverride.Formulas annotation, SourceModelBuildingContext modelContext) { + public OverriddenFormulasAnnotation(DialectOverride.Formulas annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, DIALECT_OVERRIDE_FORMULAS, "value", modelContext ); } /** * Used in creating annotation instances from Jandex variant */ - public OverriddenFormulasAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public OverriddenFormulasAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (DialectOverride.Formula[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenGeneratedColumnAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenGeneratedColumnAnnotation.java index 96c56ee0ee9b..439701c50b29 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenGeneratedColumnAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenGeneratedColumnAnnotation.java @@ -13,7 +13,7 @@ import org.hibernate.boot.models.annotations.spi.AbstractOverrider; import org.hibernate.boot.models.annotations.spi.DialectOverrider; import org.hibernate.models.spi.AnnotationDescriptor; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_GENERATED_COLUMN; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -30,7 +30,7 @@ public class OverriddenGeneratedColumnAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenGeneratedColumnAnnotation(SourceModelBuildingContext sourceModelContext) { + public OverriddenGeneratedColumnAnnotation(ModelsContext sourceModelContext) { } /** @@ -38,7 +38,7 @@ public OverriddenGeneratedColumnAnnotation(SourceModelBuildingContext sourceMode */ public OverriddenGeneratedColumnAnnotation( DialectOverride.GeneratedColumn annotation, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { dialect( annotation.dialect() ); before( annotation.before() ); sameOrAfter( annotation.sameOrAfter() ); @@ -50,7 +50,7 @@ public OverriddenGeneratedColumnAnnotation( */ public OverriddenGeneratedColumnAnnotation( Map attributeValues, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { super( attributeValues, DIALECT_OVERRIDE_GENERATED_COLUMN, sourceModelContext ); override( (GeneratedColumn) attributeValues.get( "override" ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenGeneratedColumnsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenGeneratedColumnsAnnotation.java index 778639eec371..ca137ddd677e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenGeneratedColumnsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenGeneratedColumnsAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.DialectOverride; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_GENERATED_COLUMNS; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -25,7 +25,7 @@ public class OverriddenGeneratedColumnsAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenGeneratedColumnsAnnotation(SourceModelBuildingContext modelContext) { + public OverriddenGeneratedColumnsAnnotation(ModelsContext modelContext) { } /** @@ -33,7 +33,7 @@ public OverriddenGeneratedColumnsAnnotation(SourceModelBuildingContext modelCont */ public OverriddenGeneratedColumnsAnnotation( DialectOverride.GeneratedColumns annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = extractJdkValue( annotation, DIALECT_OVERRIDE_GENERATED_COLUMNS, "value", modelContext ); } @@ -42,7 +42,7 @@ public OverriddenGeneratedColumnsAnnotation( */ public OverriddenGeneratedColumnsAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (DialectOverride.GeneratedColumn[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenJoinFormulaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenJoinFormulaAnnotation.java index 421279444299..679a92d15c66 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenJoinFormulaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenJoinFormulaAnnotation.java @@ -13,7 +13,7 @@ import org.hibernate.boot.models.annotations.spi.AbstractOverrider; import org.hibernate.boot.models.annotations.spi.DialectOverrider; import org.hibernate.models.spi.AnnotationDescriptor; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_JOIN_FORMULA; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -30,7 +30,7 @@ public class OverriddenJoinFormulaAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenJoinFormulaAnnotation(SourceModelBuildingContext sourceModelContext) { + public OverriddenJoinFormulaAnnotation(ModelsContext sourceModelContext) { } /** @@ -38,7 +38,7 @@ public OverriddenJoinFormulaAnnotation(SourceModelBuildingContext sourceModelCon */ public OverriddenJoinFormulaAnnotation( DialectOverride.JoinFormula annotation, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { dialect( annotation.dialect() ); before( annotation.before() ); sameOrAfter( annotation.sameOrAfter() ); @@ -50,7 +50,7 @@ public OverriddenJoinFormulaAnnotation( */ public OverriddenJoinFormulaAnnotation( Map attributeValues, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { super( attributeValues, DIALECT_OVERRIDE_JOIN_FORMULA, sourceModelContext ); override( (JoinFormula) attributeValues.get( "override" ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenJoinFormulasAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenJoinFormulasAnnotation.java index c464241f3806..482217b8ff10 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenJoinFormulasAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenJoinFormulasAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.DialectOverride; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_JOIN_FORMULAS; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -25,7 +25,7 @@ public class OverriddenJoinFormulasAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenJoinFormulasAnnotation(SourceModelBuildingContext modelContext) { + public OverriddenJoinFormulasAnnotation(ModelsContext modelContext) { } /** @@ -33,7 +33,7 @@ public OverriddenJoinFormulasAnnotation(SourceModelBuildingContext modelContext) */ public OverriddenJoinFormulasAnnotation( DialectOverride.JoinFormulas annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = extractJdkValue( annotation, DIALECT_OVERRIDE_JOIN_FORMULAS, "value", modelContext ); } @@ -42,7 +42,7 @@ public OverriddenJoinFormulasAnnotation( */ public OverriddenJoinFormulasAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (DialectOverride.JoinFormula[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAllAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAllAnnotation.java index a70a9d5ec2a0..cffb49417b1e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAllAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAllAnnotation.java @@ -13,7 +13,7 @@ import org.hibernate.boot.models.annotations.spi.AbstractOverrider; import org.hibernate.boot.models.annotations.spi.DialectOverrider; import org.hibernate.models.spi.AnnotationDescriptor; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_SQL_DELETE_ALL; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -30,7 +30,7 @@ public class OverriddenSQLDeleteAllAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenSQLDeleteAllAnnotation(SourceModelBuildingContext sourceModelContext) { + public OverriddenSQLDeleteAllAnnotation(ModelsContext sourceModelContext) { } /** @@ -38,7 +38,7 @@ public OverriddenSQLDeleteAllAnnotation(SourceModelBuildingContext sourceModelCo */ public OverriddenSQLDeleteAllAnnotation( DialectOverride.SQLDeleteAll annotation, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { dialect( annotation.dialect() ); before( annotation.before() ); sameOrAfter( annotation.sameOrAfter() ); @@ -50,7 +50,7 @@ public OverriddenSQLDeleteAllAnnotation( */ public OverriddenSQLDeleteAllAnnotation( Map attributeValues, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { super( attributeValues, DIALECT_OVERRIDE_SQL_DELETE_ALL, sourceModelContext ); override( (SQLDeleteAll) attributeValues.get( "override" ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAllsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAllsAnnotation.java index 770d00e3b14f..d46d5385e28f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAllsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAllsAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.DialectOverride; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_SQL_DELETE_ALLS; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -25,7 +25,7 @@ public class OverriddenSQLDeleteAllsAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenSQLDeleteAllsAnnotation(SourceModelBuildingContext modelContext) { + public OverriddenSQLDeleteAllsAnnotation(ModelsContext modelContext) { } /** @@ -33,7 +33,7 @@ public OverriddenSQLDeleteAllsAnnotation(SourceModelBuildingContext modelContext */ public OverriddenSQLDeleteAllsAnnotation( DialectOverride.SQLDeleteAlls annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = extractJdkValue( annotation, DIALECT_OVERRIDE_SQL_DELETE_ALLS, "value", modelContext ); } @@ -42,7 +42,7 @@ public OverriddenSQLDeleteAllsAnnotation( */ public OverriddenSQLDeleteAllsAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (DialectOverride.SQLDeleteAll[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAnnotation.java index 595f48d1d678..c6411be76c2f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeleteAnnotation.java @@ -13,7 +13,7 @@ import org.hibernate.boot.models.annotations.spi.AbstractOverrider; import org.hibernate.boot.models.annotations.spi.DialectOverrider; import org.hibernate.models.spi.AnnotationDescriptor; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_SQL_DELETE; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -30,7 +30,7 @@ public class OverriddenSQLDeleteAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenSQLDeleteAnnotation(SourceModelBuildingContext sourceModelContext) { + public OverriddenSQLDeleteAnnotation(ModelsContext sourceModelContext) { } /** @@ -38,7 +38,7 @@ public OverriddenSQLDeleteAnnotation(SourceModelBuildingContext sourceModelConte */ public OverriddenSQLDeleteAnnotation( DialectOverride.SQLDelete annotation, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { dialect( annotation.dialect() ); before( annotation.before() ); sameOrAfter( annotation.sameOrAfter() ); @@ -50,7 +50,7 @@ public OverriddenSQLDeleteAnnotation( */ public OverriddenSQLDeleteAnnotation( Map attributeValues, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { super( attributeValues, DIALECT_OVERRIDE_SQL_DELETE, sourceModelContext ); override( (SQLDelete) attributeValues.get( "override" ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeletesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeletesAnnotation.java index 18dcb40d707b..0097fabd730d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeletesAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLDeletesAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.DialectOverride; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_SQL_DELETES; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -25,7 +25,7 @@ public class OverriddenSQLDeletesAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenSQLDeletesAnnotation(SourceModelBuildingContext modelContext) { + public OverriddenSQLDeletesAnnotation(ModelsContext modelContext) { } /** @@ -33,7 +33,7 @@ public OverriddenSQLDeletesAnnotation(SourceModelBuildingContext modelContext) { */ public OverriddenSQLDeletesAnnotation( DialectOverride.SQLDeletes annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = extractJdkValue( annotation, DIALECT_OVERRIDE_SQL_DELETES, "value", modelContext ); } @@ -42,7 +42,7 @@ public OverriddenSQLDeletesAnnotation( */ public OverriddenSQLDeletesAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (DialectOverride.SQLDelete[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLInsertAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLInsertAnnotation.java index 40c71d34f341..978ac4e7e7c4 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLInsertAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLInsertAnnotation.java @@ -13,7 +13,7 @@ import org.hibernate.boot.models.annotations.spi.AbstractOverrider; import org.hibernate.boot.models.annotations.spi.DialectOverrider; import org.hibernate.models.spi.AnnotationDescriptor; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_SQL_INSERT; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -30,7 +30,7 @@ public class OverriddenSQLInsertAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenSQLInsertAnnotation(SourceModelBuildingContext sourceModelContext) { + public OverriddenSQLInsertAnnotation(ModelsContext sourceModelContext) { } /** @@ -38,7 +38,7 @@ public OverriddenSQLInsertAnnotation(SourceModelBuildingContext sourceModelConte */ public OverriddenSQLInsertAnnotation( DialectOverride.SQLInsert annotation, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { dialect( annotation.dialect() ); before( annotation.before() ); sameOrAfter( annotation.sameOrAfter() ); @@ -50,7 +50,7 @@ public OverriddenSQLInsertAnnotation( */ public OverriddenSQLInsertAnnotation( Map attributeValues, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { super( attributeValues, DIALECT_OVERRIDE_SQL_INSERT, sourceModelContext ); override( (SQLInsert) attributeValues.get( "override" ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLInsertsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLInsertsAnnotation.java index b937744ffa55..9abff273d8ad 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLInsertsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLInsertsAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.DialectOverride; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_SQL_INSERTS; @@ -26,7 +26,7 @@ public class OverriddenSQLInsertsAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenSQLInsertsAnnotation(SourceModelBuildingContext sourceModelBuildingContext) { + public OverriddenSQLInsertsAnnotation(ModelsContext ModelsContext) { } /** @@ -34,7 +34,7 @@ public OverriddenSQLInsertsAnnotation(SourceModelBuildingContext sourceModelBuil */ public OverriddenSQLInsertsAnnotation( DialectOverride.SQLInserts annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = extractJdkValue( annotation, DIALECT_OVERRIDE_SQL_INSERTS, "value", modelContext ); } @@ -43,7 +43,7 @@ public OverriddenSQLInsertsAnnotation( */ public OverriddenSQLInsertsAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (DialectOverride.SQLInsert[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLOrderAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLOrderAnnotation.java index f3f421f65e42..cdb69011abc0 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLOrderAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLOrderAnnotation.java @@ -13,7 +13,7 @@ import org.hibernate.boot.models.annotations.spi.AbstractOverrider; import org.hibernate.boot.models.annotations.spi.DialectOverrider; import org.hibernate.models.spi.AnnotationDescriptor; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_SQL_ORDER; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -30,7 +30,7 @@ public class OverriddenSQLOrderAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenSQLOrderAnnotation(SourceModelBuildingContext sourceModelContext) { + public OverriddenSQLOrderAnnotation(ModelsContext sourceModelContext) { } /** @@ -38,7 +38,7 @@ public OverriddenSQLOrderAnnotation(SourceModelBuildingContext sourceModelContex */ public OverriddenSQLOrderAnnotation( DialectOverride.SQLOrder annotation, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { dialect( annotation.dialect() ); before( annotation.before() ); sameOrAfter( annotation.sameOrAfter() ); @@ -50,7 +50,7 @@ public OverriddenSQLOrderAnnotation( */ public OverriddenSQLOrderAnnotation( Map attributeValues, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { super( attributeValues, DIALECT_OVERRIDE_SQL_ORDER, sourceModelContext ); override( (SQLOrder) attributeValues.get( "override" ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLOrdersAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLOrdersAnnotation.java index 1b5ea9e944dc..0697f8bf7e79 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLOrdersAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLOrdersAnnotation.java @@ -10,7 +10,7 @@ import org.hibernate.annotations.DialectOverride; import org.hibernate.annotations.DialectOverride.SQLOrders; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_SQL_ORDERS; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -24,20 +24,20 @@ public class OverriddenSQLOrdersAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenSQLOrdersAnnotation(SourceModelBuildingContext modelContext) { + public OverriddenSQLOrdersAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public OverriddenSQLOrdersAnnotation(SQLOrders annotation, SourceModelBuildingContext modelContext) { + public OverriddenSQLOrdersAnnotation(SQLOrders annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, DIALECT_OVERRIDE_SQL_ORDERS, "value", modelContext ); } /** * Used in creating annotation instances from Jandex variant */ - public OverriddenSQLOrdersAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public OverriddenSQLOrdersAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (DialectOverride.SQLOrder[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLRestrictionAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLRestrictionAnnotation.java index 7393fb73ea69..39b38973f490 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLRestrictionAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLRestrictionAnnotation.java @@ -13,7 +13,7 @@ import org.hibernate.boot.models.annotations.spi.AbstractOverrider; import org.hibernate.boot.models.annotations.spi.DialectOverrider; import org.hibernate.models.spi.AnnotationDescriptor; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_SQL_ORDER; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_SQL_RESTRICTION; @@ -31,7 +31,7 @@ public class OverriddenSQLRestrictionAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenSQLRestrictionAnnotation(SourceModelBuildingContext sourceModelContext) { + public OverriddenSQLRestrictionAnnotation(ModelsContext sourceModelContext) { } /** @@ -39,7 +39,7 @@ public OverriddenSQLRestrictionAnnotation(SourceModelBuildingContext sourceModel */ public OverriddenSQLRestrictionAnnotation( DialectOverride.SQLRestriction annotation, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { dialect( annotation.dialect() ); before( annotation.before() ); sameOrAfter( annotation.sameOrAfter() ); @@ -51,7 +51,7 @@ public OverriddenSQLRestrictionAnnotation( */ public OverriddenSQLRestrictionAnnotation( Map attributeValues, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { super( attributeValues, DIALECT_OVERRIDE_SQL_ORDER, sourceModelContext ); override( (SQLRestriction) attributeValues.get( "override" ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLRestrictionsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLRestrictionsAnnotation.java index b8b1c98ec7e0..89421c6335d3 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLRestrictionsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLRestrictionsAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.DialectOverride.SQLRestrictions; import org.hibernate.boot.models.DialectOverrideAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -24,13 +24,13 @@ public class OverriddenSQLRestrictionsAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenSQLRestrictionsAnnotation(SourceModelBuildingContext modelContext) { + public OverriddenSQLRestrictionsAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public OverriddenSQLRestrictionsAnnotation(SQLRestrictions annotation, SourceModelBuildingContext modelContext) { + public OverriddenSQLRestrictionsAnnotation(SQLRestrictions annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, DialectOverrideAnnotations.DIALECT_OVERRIDE_SQL_RESTRICTIONS, @@ -44,7 +44,7 @@ public OverriddenSQLRestrictionsAnnotation(SQLRestrictions annotation, SourceMod */ public OverriddenSQLRestrictionsAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (DialectOverride.SQLRestriction[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLSelectAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLSelectAnnotation.java index 65bff0185013..5cd78a0c2ebb 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLSelectAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLSelectAnnotation.java @@ -13,7 +13,7 @@ import org.hibernate.boot.models.annotations.spi.AbstractOverrider; import org.hibernate.boot.models.annotations.spi.DialectOverrider; import org.hibernate.models.spi.AnnotationDescriptor; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_SQL_SELECT; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -30,7 +30,7 @@ public class OverriddenSQLSelectAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenSQLSelectAnnotation(SourceModelBuildingContext modelContext) { + public OverriddenSQLSelectAnnotation(ModelsContext modelContext) { } /** @@ -38,7 +38,7 @@ public OverriddenSQLSelectAnnotation(SourceModelBuildingContext modelContext) { */ public OverriddenSQLSelectAnnotation( DialectOverride.SQLSelect annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { dialect( annotation.dialect() ); before( annotation.before() ); sameOrAfter( annotation.sameOrAfter() ); @@ -48,7 +48,7 @@ public OverriddenSQLSelectAnnotation( /** * Used in creating annotation instances from Jandex variant */ - public OverriddenSQLSelectAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public OverriddenSQLSelectAnnotation(Map attributeValues, ModelsContext modelContext) { super( attributeValues, DIALECT_OVERRIDE_SQL_SELECT, modelContext ); override( (SQLSelect) attributeValues.get( "override" ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLSelectsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLSelectsAnnotation.java index a2ea10130d4e..de0a20b32b9b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLSelectsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLSelectsAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.DialectOverride.SQLRestrictions; import org.hibernate.boot.models.DialectOverrideAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -24,13 +24,13 @@ public class OverriddenSQLSelectsAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenSQLSelectsAnnotation(SourceModelBuildingContext modelContext) { + public OverriddenSQLSelectsAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public OverriddenSQLSelectsAnnotation(SQLRestrictions annotation, SourceModelBuildingContext modelContext) { + public OverriddenSQLSelectsAnnotation(SQLRestrictions annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, DialectOverrideAnnotations.DIALECT_OVERRIDE_SQL_RESTRICTIONS, @@ -44,7 +44,7 @@ public OverriddenSQLSelectsAnnotation(SQLRestrictions annotation, SourceModelBui */ public OverriddenSQLSelectsAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (DialectOverride.SQLSelect[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLUpdateAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLUpdateAnnotation.java index d7835fec2e6c..1a694d5ec519 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLUpdateAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLUpdateAnnotation.java @@ -13,7 +13,7 @@ import org.hibernate.boot.models.annotations.spi.AbstractOverrider; import org.hibernate.boot.models.annotations.spi.DialectOverrider; import org.hibernate.models.spi.AnnotationDescriptor; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_SQL_UPDATE; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -30,7 +30,7 @@ public class OverriddenSQLUpdateAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenSQLUpdateAnnotation(SourceModelBuildingContext sourceModelContext) { + public OverriddenSQLUpdateAnnotation(ModelsContext sourceModelContext) { } /** @@ -38,7 +38,7 @@ public OverriddenSQLUpdateAnnotation(SourceModelBuildingContext sourceModelConte */ public OverriddenSQLUpdateAnnotation( DialectOverride.SQLUpdate annotation, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { dialect( annotation.dialect() ); before( annotation.before() ); sameOrAfter( annotation.sameOrAfter() ); @@ -50,7 +50,7 @@ public OverriddenSQLUpdateAnnotation( */ public OverriddenSQLUpdateAnnotation( Map attributeValues, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { super( attributeValues, DIALECT_OVERRIDE_SQL_UPDATE, sourceModelContext ); override( (SQLUpdate) attributeValues.get( "override" ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLUpdatesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLUpdatesAnnotation.java index 4f652351f71b..149b3ebfef80 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLUpdatesAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverriddenSQLUpdatesAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.DialectOverride; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.DialectOverrideAnnotations.DIALECT_OVERRIDE_SQL_UPDATES; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -25,7 +25,7 @@ public class OverriddenSQLUpdatesAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverriddenSQLUpdatesAnnotation(SourceModelBuildingContext sourceModelBuildingContext) { + public OverriddenSQLUpdatesAnnotation(ModelsContext ModelsContext) { } /** @@ -33,7 +33,7 @@ public OverriddenSQLUpdatesAnnotation(SourceModelBuildingContext sourceModelBuil */ public OverriddenSQLUpdatesAnnotation( DialectOverride.SQLUpdates annotation, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { this.value = extractJdkValue( annotation, DIALECT_OVERRIDE_SQL_UPDATES, "value", sourceModelContext ); } @@ -42,7 +42,7 @@ public OverriddenSQLUpdatesAnnotation( */ public OverriddenSQLUpdatesAnnotation( Map attributeValues, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { this.value = (DialectOverride.SQLUpdate[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverrideVersionAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverrideVersionAnnotation.java index 80cdbe3fb78f..0851af2ca015 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverrideVersionAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/OverrideVersionAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.DialectOverride; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -19,14 +19,14 @@ public class OverrideVersionAnnotation implements DialectOverride.Version { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public OverrideVersionAnnotation(SourceModelBuildingContext modelContext) { + public OverrideVersionAnnotation(ModelsContext modelContext) { this.minor = 0; } /** * Used in creating annotation instances from JDK variant */ - public OverrideVersionAnnotation(DialectOverride.Version annotation, SourceModelBuildingContext modelContext) { + public OverrideVersionAnnotation(DialectOverride.Version annotation, ModelsContext modelContext) { major( annotation.major() ); minor( annotation.minor() ); } @@ -34,7 +34,7 @@ public OverrideVersionAnnotation(DialectOverride.Version annotation, SourceModel /** * Used in creating annotation instances from Jandex variant */ - public OverrideVersionAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public OverrideVersionAnnotation(Map attributeValues, ModelsContext modelContext) { major( (Integer) attributeValues.get( "major" ) ); minor( (Integer) attributeValues.get( "minor" ) ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParamDefAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParamDefAnnotation.java index bb53d4231c17..e244e0bd86cd 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParamDefAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParamDefAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.ParamDef; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -20,14 +20,14 @@ public class ParamDefAnnotation implements ParamDef { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ParamDefAnnotation(SourceModelBuildingContext modelContext) { + public ParamDefAnnotation(ModelsContext modelContext) { this.resolver = java.util.function.Supplier.class; } /** * Used in creating annotation instances from JDK variant */ - public ParamDefAnnotation(ParamDef annotation, SourceModelBuildingContext modelContext) { + public ParamDefAnnotation(ParamDef annotation, ModelsContext modelContext) { this.name = annotation.name(); this.type = annotation.type(); this.resolver = annotation.resolver(); @@ -36,7 +36,7 @@ public ParamDefAnnotation(ParamDef annotation, SourceModelBuildingContext modelC /** * Used in creating annotation instances from Jandex variant */ - public ParamDefAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ParamDefAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.type = (Class) attributeValues.get( "type" ); this.resolver = (Class) attributeValues.get( "resolver" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParameterAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParameterAnnotation.java index af688717b8c7..d20308dd03d9 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParameterAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParameterAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.Parameter; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -19,13 +19,13 @@ public class ParameterAnnotation implements Parameter { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ParameterAnnotation(SourceModelBuildingContext modelContext) { + public ParameterAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public ParameterAnnotation(Parameter annotation, SourceModelBuildingContext modelContext) { + public ParameterAnnotation(Parameter annotation, ModelsContext modelContext) { this.name = annotation.name(); this.value = annotation.value(); } @@ -33,7 +33,7 @@ public ParameterAnnotation(Parameter annotation, SourceModelBuildingContext mode /** * Used in creating annotation instances from Jandex variant */ - public ParameterAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ParameterAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.value = (String) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParentAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParentAnnotation.java index 4b602f7f0419..9e3607647935 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParentAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ParentAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.Parent; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -17,19 +17,19 @@ public class ParentAnnotation implements Parent { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ParentAnnotation(SourceModelBuildingContext modelContext) { + public ParentAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public ParentAnnotation(Parent annotation, SourceModelBuildingContext modelContext) { + public ParentAnnotation(Parent annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public ParentAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ParentAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PartitionKeyAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PartitionKeyAnnotation.java index d96382f8089d..48eee25d158c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PartitionKeyAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PartitionKeyAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.PartitionKey; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -17,19 +17,19 @@ public class PartitionKeyAnnotation implements PartitionKey { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public PartitionKeyAnnotation(SourceModelBuildingContext modelContext) { + public PartitionKeyAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public PartitionKeyAnnotation(PartitionKey annotation, SourceModelBuildingContext modelContext) { + public PartitionKeyAnnotation(PartitionKey annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public PartitionKeyAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public PartitionKeyAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostLoadJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostLoadJpaAnnotation.java index 44440862c0c0..e8a31da1c079 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostLoadJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostLoadJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.PostLoad; @@ -18,19 +18,19 @@ public class PostLoadJpaAnnotation implements PostLoad { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public PostLoadJpaAnnotation(SourceModelBuildingContext modelContext) { + public PostLoadJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public PostLoadJpaAnnotation(PostLoad annotation, SourceModelBuildingContext modelContext) { + public PostLoadJpaAnnotation(PostLoad annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public PostLoadJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public PostLoadJpaAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostPersistJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostPersistJpaAnnotation.java index 6b081847e502..bd5f4b601b0f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostPersistJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostPersistJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.PostPersist; @@ -18,19 +18,19 @@ public class PostPersistJpaAnnotation implements PostPersist { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public PostPersistJpaAnnotation(SourceModelBuildingContext modelContext) { + public PostPersistJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public PostPersistJpaAnnotation(PostPersist annotation, SourceModelBuildingContext modelContext) { + public PostPersistJpaAnnotation(PostPersist annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public PostPersistJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public PostPersistJpaAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostRemoveJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostRemoveJpaAnnotation.java index bba6c90bff34..33f6dbe44c4b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostRemoveJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostRemoveJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.PostRemove; @@ -17,19 +17,19 @@ public class PostRemoveJpaAnnotation implements PostRemove { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public PostRemoveJpaAnnotation(SourceModelBuildingContext modelContext) { + public PostRemoveJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public PostRemoveJpaAnnotation(PostRemove annotation, SourceModelBuildingContext modelContext) { + public PostRemoveJpaAnnotation(PostRemove annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public PostRemoveJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public PostRemoveJpaAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostUpdateJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostUpdateJpaAnnotation.java index 939dd7bf169b..0e4738729666 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostUpdateJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PostUpdateJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.PostUpdate; @@ -18,19 +18,19 @@ public class PostUpdateJpaAnnotation implements PostUpdate { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public PostUpdateJpaAnnotation(SourceModelBuildingContext modelContext) { + public PostUpdateJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public PostUpdateJpaAnnotation(PostUpdate annotation, SourceModelBuildingContext modelContext) { + public PostUpdateJpaAnnotation(PostUpdate annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public PostUpdateJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public PostUpdateJpaAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrePersistJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrePersistJpaAnnotation.java index 21a4426a27f4..3a0a252aeafb 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrePersistJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrePersistJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.PrePersist; @@ -18,19 +18,19 @@ public class PrePersistJpaAnnotation implements PrePersist { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public PrePersistJpaAnnotation(SourceModelBuildingContext modelContext) { + public PrePersistJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public PrePersistJpaAnnotation(PrePersist annotation, SourceModelBuildingContext modelContext) { + public PrePersistJpaAnnotation(PrePersist annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public PrePersistJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public PrePersistJpaAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PreRemoveJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PreRemoveJpaAnnotation.java index db38f7f3da8d..3d3b5cdb9e9a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PreRemoveJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PreRemoveJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.PreRemove; @@ -18,19 +18,19 @@ public class PreRemoveJpaAnnotation implements PreRemove { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public PreRemoveJpaAnnotation(SourceModelBuildingContext modelContext) { + public PreRemoveJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public PreRemoveJpaAnnotation(PreRemove annotation, SourceModelBuildingContext modelContext) { + public PreRemoveJpaAnnotation(PreRemove annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public PreRemoveJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public PreRemoveJpaAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PreUpdateJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PreUpdateJpaAnnotation.java index 12b99357aea3..3e8ea12a643d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PreUpdateJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PreUpdateJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.PreUpdate; @@ -17,19 +17,19 @@ public class PreUpdateJpaAnnotation implements PreUpdate { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public PreUpdateJpaAnnotation(SourceModelBuildingContext modelContext) { + public PreUpdateJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public PreUpdateJpaAnnotation(PreUpdate annotation, SourceModelBuildingContext modelContext) { + public PreUpdateJpaAnnotation(PreUpdate annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public PreUpdateJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public PreUpdateJpaAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrimaryKeyJoinColumnJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrimaryKeyJoinColumnJpaAnnotation.java index 0d460dffee62..3b131dff2eac 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrimaryKeyJoinColumnJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrimaryKeyJoinColumnJpaAnnotation.java @@ -13,7 +13,7 @@ import org.hibernate.boot.models.xml.internal.db.ForeignKeyProcessing; import org.hibernate.boot.models.xml.spi.XmlDocumentContext; import org.hibernate.internal.util.StringHelper; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.PrimaryKeyJoinColumn; @@ -32,7 +32,7 @@ public class PrimaryKeyJoinColumnJpaAnnotation implements PrimaryKeyJoinColumn, /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public PrimaryKeyJoinColumnJpaAnnotation(SourceModelBuildingContext modelContext) { + public PrimaryKeyJoinColumnJpaAnnotation(ModelsContext modelContext) { this.name = ""; this.referencedColumnName = ""; this.columnDefinition = ""; @@ -43,7 +43,7 @@ public PrimaryKeyJoinColumnJpaAnnotation(SourceModelBuildingContext modelContext /** * Used in creating annotation instances from JDK variant */ - public PrimaryKeyJoinColumnJpaAnnotation(PrimaryKeyJoinColumn annotation, SourceModelBuildingContext modelContext) { + public PrimaryKeyJoinColumnJpaAnnotation(PrimaryKeyJoinColumn annotation, ModelsContext modelContext) { this.name = annotation.name(); this.referencedColumnName = annotation.referencedColumnName(); this.columnDefinition = annotation.columnDefinition(); @@ -56,7 +56,7 @@ public PrimaryKeyJoinColumnJpaAnnotation(PrimaryKeyJoinColumn annotation, Source */ public PrimaryKeyJoinColumnJpaAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.referencedColumnName = (String) attributeValues.get( "referencedColumnName" ); this.columnDefinition = (String) attributeValues.get( "columnDefinition" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrimaryKeyJoinColumnsJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrimaryKeyJoinColumnsJpaAnnotation.java index 8896577dde53..46868d9c0698 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrimaryKeyJoinColumnsJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PrimaryKeyJoinColumnsJpaAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.boot.models.JpaAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.PrimaryKeyJoinColumn; import jakarta.persistence.PrimaryKeyJoinColumns; @@ -26,7 +26,7 @@ public class PrimaryKeyJoinColumnsJpaAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public PrimaryKeyJoinColumnsJpaAnnotation(SourceModelBuildingContext modelContext) { + public PrimaryKeyJoinColumnsJpaAnnotation(ModelsContext modelContext) { this.foreignKey = modelContext.getAnnotationDescriptorRegistry() .getDescriptor( jakarta.persistence.ForeignKey.class ) .createUsage( modelContext ); @@ -37,7 +37,7 @@ public PrimaryKeyJoinColumnsJpaAnnotation(SourceModelBuildingContext modelContex */ public PrimaryKeyJoinColumnsJpaAnnotation( PrimaryKeyJoinColumns annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = extractJdkValue( annotation, JpaAnnotations.PRIMARY_KEY_JOIN_COLUMNS, "value", modelContext ); this.foreignKey = extractJdkValue( annotation, @@ -52,7 +52,7 @@ public PrimaryKeyJoinColumnsJpaAnnotation( */ public PrimaryKeyJoinColumnsJpaAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (PrimaryKeyJoinColumn[]) attributeValues.get( "value" ); this.foreignKey = (jakarta.persistence.ForeignKey) attributeValues.get( "foreignKey" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PropertyRefAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PropertyRefAnnotation.java index 78047e0a042e..0d8ed409a4b4 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PropertyRefAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/PropertyRefAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.PropertyRef; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class PropertyRefAnnotation implements PropertyRef { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public PropertyRefAnnotation(SourceModelBuildingContext modelContext) { + public PropertyRefAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public PropertyRefAnnotation(PropertyRef annotation, SourceModelBuildingContext modelContext) { + public PropertyRefAnnotation(PropertyRef annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public PropertyRefAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public PropertyRefAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (String) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/QueryCacheLayoutAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/QueryCacheLayoutAnnotation.java index d18fb1f0cd3d..3697b375276f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/QueryCacheLayoutAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/QueryCacheLayoutAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.QueryCacheLayout; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,21 +18,21 @@ public class QueryCacheLayoutAnnotation implements QueryCacheLayout { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public QueryCacheLayoutAnnotation(SourceModelBuildingContext modelContext) { + public QueryCacheLayoutAnnotation(ModelsContext modelContext) { this.layout = org.hibernate.annotations.CacheLayout.AUTO; } /** * Used in creating annotation instances from JDK variant */ - public QueryCacheLayoutAnnotation(QueryCacheLayout annotation, SourceModelBuildingContext modelContext) { + public QueryCacheLayoutAnnotation(QueryCacheLayout annotation, ModelsContext modelContext) { this.layout = annotation.layout(); } /** * Used in creating annotation instances from Jandex variant */ - public QueryCacheLayoutAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public QueryCacheLayoutAnnotation(Map attributeValues, ModelsContext modelContext) { this.layout = (org.hibernate.annotations.CacheLayout) attributeValues.get( "layout" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/QueryHintJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/QueryHintJpaAnnotation.java index 87dcb504eab9..ac78db619fa4 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/QueryHintJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/QueryHintJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.QueryHint; @@ -20,13 +20,13 @@ public class QueryHintJpaAnnotation implements QueryHint { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public QueryHintJpaAnnotation(SourceModelBuildingContext modelContext) { + public QueryHintJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public QueryHintJpaAnnotation(QueryHint annotation, SourceModelBuildingContext modelContext) { + public QueryHintJpaAnnotation(QueryHint annotation, ModelsContext modelContext) { this.name = annotation.name(); this.value = annotation.value(); } @@ -34,7 +34,7 @@ public QueryHintJpaAnnotation(QueryHint annotation, SourceModelBuildingContext m /** * Used in creating annotation instances from Jandex variant */ - public QueryHintJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public QueryHintJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.value = (String) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/RowIdAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/RowIdAnnotation.java index 22d8eccbbb9a..3b268369dc8e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/RowIdAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/RowIdAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.RowId; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,21 +18,21 @@ public class RowIdAnnotation implements RowId { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public RowIdAnnotation(SourceModelBuildingContext modelContext) { + public RowIdAnnotation(ModelsContext modelContext) { this.value = ""; } /** * Used in creating annotation instances from JDK variant */ - public RowIdAnnotation(RowId annotation, SourceModelBuildingContext modelContext) { + public RowIdAnnotation(RowId annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public RowIdAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public RowIdAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (String) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeleteAllAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeleteAllAnnotation.java index 67904864bfa7..08905b0d9d62 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeleteAllAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeleteAllAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.SQLDeleteAll; import org.hibernate.boot.models.annotations.spi.CustomSqlDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -23,7 +23,7 @@ public class SQLDeleteAllAnnotation implements SQLDeleteAll, CustomSqlDetails { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SQLDeleteAllAnnotation(SourceModelBuildingContext modelContext) { + public SQLDeleteAllAnnotation(ModelsContext modelContext) { this.callable = false; this.verify = org.hibernate.jdbc.Expectation.class; this.check = org.hibernate.annotations.ResultCheckStyle.NONE; @@ -33,7 +33,7 @@ public SQLDeleteAllAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public SQLDeleteAllAnnotation(SQLDeleteAll annotation, SourceModelBuildingContext modelContext) { + public SQLDeleteAllAnnotation(SQLDeleteAll annotation, ModelsContext modelContext) { this.sql = annotation.sql(); this.callable = annotation.callable(); this.verify = annotation.verify(); @@ -44,7 +44,7 @@ public SQLDeleteAllAnnotation(SQLDeleteAll annotation, SourceModelBuildingContex /** * Used in creating annotation instances from Jandex variant */ - public SQLDeleteAllAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public SQLDeleteAllAnnotation(Map attributeValues, ModelsContext modelContext) { this.sql = (String) attributeValues.get( "sql" ); this.callable = (boolean) attributeValues.get( "callable" ); this.verify = (Class) attributeValues.get( "verify" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeleteAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeleteAnnotation.java index 9673943a65f5..a692b46ad7ac 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeleteAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeleteAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.SQLDelete; import org.hibernate.boot.models.annotations.spi.CustomSqlDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -23,7 +23,7 @@ public class SQLDeleteAnnotation implements SQLDelete, CustomSqlDetails { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SQLDeleteAnnotation(SourceModelBuildingContext modelContext) { + public SQLDeleteAnnotation(ModelsContext modelContext) { this.callable = false; this.verify = org.hibernate.jdbc.Expectation.class; this.check = org.hibernate.annotations.ResultCheckStyle.NONE; @@ -33,7 +33,7 @@ public SQLDeleteAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public SQLDeleteAnnotation(SQLDelete annotation, SourceModelBuildingContext modelContext) { + public SQLDeleteAnnotation(SQLDelete annotation, ModelsContext modelContext) { this.sql = annotation.sql(); this.callable = annotation.callable(); this.verify = annotation.verify(); @@ -44,7 +44,7 @@ public SQLDeleteAnnotation(SQLDelete annotation, SourceModelBuildingContext mode /** * Used in creating annotation instances from Jandex variant */ - public SQLDeleteAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public SQLDeleteAnnotation(Map attributeValues, ModelsContext modelContext) { this.sql = (String) attributeValues.get( "sql" ); this.callable = (boolean) attributeValues.get( "callable" ); this.verify = (Class) attributeValues.get( "verify" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeletesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeletesAnnotation.java index 4c3673d99db6..e417673075b7 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeletesAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLDeletesAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.SQLDeletes; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -23,20 +23,20 @@ public class SQLDeletesAnnotation implements SQLDeletes, RepeatableContainer attributeValues, SourceModelBuildingContext modelContext) { + public SQLDeletesAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (SQLDelete[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLInsertAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLInsertAnnotation.java index 6b4e2a6edbba..2263e7a79f22 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLInsertAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLInsertAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.SQLInsert; import org.hibernate.boot.models.annotations.spi.CustomSqlDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -23,7 +23,7 @@ public class SQLInsertAnnotation implements SQLInsert, CustomSqlDetails { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SQLInsertAnnotation(SourceModelBuildingContext modelContext) { + public SQLInsertAnnotation(ModelsContext modelContext) { this.callable = false; this.verify = org.hibernate.jdbc.Expectation.class; this.check = org.hibernate.annotations.ResultCheckStyle.NONE; @@ -33,7 +33,7 @@ public SQLInsertAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public SQLInsertAnnotation(SQLInsert annotation, SourceModelBuildingContext modelContext) { + public SQLInsertAnnotation(SQLInsert annotation, ModelsContext modelContext) { this.sql = annotation.sql(); this.callable = annotation.callable(); this.verify = annotation.verify(); @@ -44,7 +44,7 @@ public SQLInsertAnnotation(SQLInsert annotation, SourceModelBuildingContext mode /** * Used in creating annotation instances from Jandex variant */ - public SQLInsertAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public SQLInsertAnnotation(Map attributeValues, ModelsContext modelContext) { this.sql = (String) attributeValues.get( "sql" ); this.callable = (boolean) attributeValues.get( "callable" ); this.verify = (Class) attributeValues.get( "verify" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLInsertsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLInsertsAnnotation.java index bc150dac4d3e..551f9605051d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLInsertsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLInsertsAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.SQLInserts; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -23,20 +23,20 @@ public class SQLInsertsAnnotation implements SQLInserts, RepeatableContainer attributeValues, SourceModelBuildingContext modelContext) { + public SQLInsertsAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (SQLInsert[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLJoinTableRestrictionAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLJoinTableRestrictionAnnotation.java index 2605766a3646..16d1ba851481 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLJoinTableRestrictionAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLJoinTableRestrictionAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.SQLJoinTableRestriction; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,7 +18,7 @@ public class SQLJoinTableRestrictionAnnotation implements SQLJoinTableRestrictio /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SQLJoinTableRestrictionAnnotation(SourceModelBuildingContext modelContext) { + public SQLJoinTableRestrictionAnnotation(ModelsContext modelContext) { } /** @@ -26,7 +26,7 @@ public SQLJoinTableRestrictionAnnotation(SourceModelBuildingContext modelContext */ public SQLJoinTableRestrictionAnnotation( SQLJoinTableRestriction annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = annotation.value(); } @@ -35,7 +35,7 @@ public SQLJoinTableRestrictionAnnotation( */ public SQLJoinTableRestrictionAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (String) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLOrderAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLOrderAnnotation.java index 298fc3c0d11a..a1d1e3301410 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLOrderAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLOrderAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.SQLOrder; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class SQLOrderAnnotation implements SQLOrder { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SQLOrderAnnotation(SourceModelBuildingContext modelContext) { + public SQLOrderAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public SQLOrderAnnotation(SQLOrder annotation, SourceModelBuildingContext modelContext) { + public SQLOrderAnnotation(SQLOrder annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public SQLOrderAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public SQLOrderAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (String) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLRestrictionAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLRestrictionAnnotation.java index dd879aaf7b8c..ac3e1b085445 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLRestrictionAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLRestrictionAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.SQLRestriction; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class SQLRestrictionAnnotation implements SQLRestriction { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SQLRestrictionAnnotation(SourceModelBuildingContext modelContext) { + public SQLRestrictionAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public SQLRestrictionAnnotation(SQLRestriction annotation, SourceModelBuildingContext modelContext) { + public SQLRestrictionAnnotation(SQLRestriction annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public SQLRestrictionAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public SQLRestrictionAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (String) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLSelectAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLSelectAnnotation.java index a406ff80b417..baddffa8f40b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLSelectAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLSelectAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.SQLSelect; import org.hibernate.boot.models.JpaAnnotations; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.HibernateAnnotations.SQL_SELECT; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -25,7 +25,7 @@ public class SQLSelectAnnotation implements SQLSelect { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SQLSelectAnnotation(SourceModelBuildingContext modelContext) { + public SQLSelectAnnotation(ModelsContext modelContext) { this.resultSetMapping = JpaAnnotations.SQL_RESULT_SET_MAPPING.createUsage( modelContext ); this.querySpaces = new String[0]; } @@ -33,7 +33,7 @@ public SQLSelectAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public SQLSelectAnnotation(SQLSelect annotation, SourceModelBuildingContext modelContext) { + public SQLSelectAnnotation(SQLSelect annotation, ModelsContext modelContext) { this.sql = annotation.sql(); this.resultSetMapping = extractJdkValue( annotation, SQL_SELECT, "resultSetMapping", modelContext ); this.querySpaces = annotation.querySpaces(); @@ -42,7 +42,7 @@ public SQLSelectAnnotation(SQLSelect annotation, SourceModelBuildingContext mode /** * Used in creating annotation instances from Jandex variant */ - public SQLSelectAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public SQLSelectAnnotation(Map attributeValues, ModelsContext modelContext) { this.sql = (String) attributeValues.get( "sql" ); this.resultSetMapping = (jakarta.persistence.SqlResultSetMapping) attributeValues.get( "resultSetMapping" ); this.querySpaces = (String[]) attributeValues.get( "querySpaces" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLUpdateAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLUpdateAnnotation.java index de30b3010bc5..acf90e90b971 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLUpdateAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLUpdateAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.SQLUpdate; import org.hibernate.boot.models.annotations.spi.CustomSqlDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -23,7 +23,7 @@ public class SQLUpdateAnnotation implements SQLUpdate, CustomSqlDetails { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SQLUpdateAnnotation(SourceModelBuildingContext modelContext) { + public SQLUpdateAnnotation(ModelsContext modelContext) { this.callable = false; this.verify = org.hibernate.jdbc.Expectation.class; this.check = org.hibernate.annotations.ResultCheckStyle.NONE; @@ -33,7 +33,7 @@ public SQLUpdateAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public SQLUpdateAnnotation(SQLUpdate annotation, SourceModelBuildingContext modelContext) { + public SQLUpdateAnnotation(SQLUpdate annotation, ModelsContext modelContext) { this.sql = annotation.sql(); this.callable = annotation.callable(); this.verify = annotation.verify(); @@ -44,7 +44,7 @@ public SQLUpdateAnnotation(SQLUpdate annotation, SourceModelBuildingContext mode /** * Used in creating annotation instances from Jandex variant */ - public SQLUpdateAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public SQLUpdateAnnotation(Map attributeValues, ModelsContext modelContext) { this.sql = (String) attributeValues.get( "sql" ); this.callable = (boolean) attributeValues.get( "callable" ); this.verify = (Class) attributeValues.get( "verify" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLUpdatesAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLUpdatesAnnotation.java index 3b51570f42f0..bbc61c55c209 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLUpdatesAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SQLUpdatesAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.SQLUpdates; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -23,20 +23,20 @@ public class SQLUpdatesAnnotation implements SQLUpdates, RepeatableContainer attributeValues, SourceModelBuildingContext modelContext) { + public SQLUpdatesAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (SQLUpdate[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryRowAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryRowAnnotation.java index 72b67360ae29..dd37c11c263c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryRowAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryRowAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.SecondaryRow; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -20,7 +20,7 @@ public class SecondaryRowAnnotation implements SecondaryRow { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SecondaryRowAnnotation(SourceModelBuildingContext modelContext) { + public SecondaryRowAnnotation(ModelsContext modelContext) { this.table = ""; this.owned = true; this.optional = true; @@ -29,7 +29,7 @@ public SecondaryRowAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public SecondaryRowAnnotation(SecondaryRow annotation, SourceModelBuildingContext modelContext) { + public SecondaryRowAnnotation(SecondaryRow annotation, ModelsContext modelContext) { this.table = annotation.table(); this.owned = annotation.owned(); this.optional = annotation.optional(); @@ -38,7 +38,7 @@ public SecondaryRowAnnotation(SecondaryRow annotation, SourceModelBuildingContex /** * Used in creating annotation instances from Jandex variant */ - public SecondaryRowAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public SecondaryRowAnnotation(Map attributeValues, ModelsContext modelContext) { this.table = (String) attributeValues.get( "table" ); this.owned = (boolean) attributeValues.get( "owned" ); this.optional = (boolean) attributeValues.get( "optional" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryRowsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryRowsAnnotation.java index b02a9eb2d9d1..96a3ae249320 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryRowsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryRowsAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.SecondaryRows; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -23,20 +23,20 @@ public class SecondaryRowsAnnotation implements SecondaryRows, RepeatableContain /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SecondaryRowsAnnotation(SourceModelBuildingContext modelContext) { + public SecondaryRowsAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public SecondaryRowsAnnotation(SecondaryRows annotation, SourceModelBuildingContext modelContext) { + public SecondaryRowsAnnotation(SecondaryRows annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, HibernateAnnotations.SECONDARY_ROWS, "value", modelContext ); } /** * Used in creating annotation instances from Jandex variant */ - public SecondaryRowsAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public SecondaryRowsAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (SecondaryRow[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryTableJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryTableJpaAnnotation.java index fcaee0a9d97c..aa8727f6fc21 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryTableJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryTableJpaAnnotation.java @@ -13,7 +13,7 @@ import org.hibernate.boot.models.xml.internal.db.ForeignKeyProcessing; import org.hibernate.boot.models.xml.internal.db.JoinColumnProcessing; import org.hibernate.boot.models.xml.spi.XmlDocumentContext; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.SecondaryTable; @@ -40,7 +40,7 @@ public class SecondaryTableJpaAnnotation implements SecondaryTable, CommonTableD /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SecondaryTableJpaAnnotation(SourceModelBuildingContext modelContext) { + public SecondaryTableJpaAnnotation(ModelsContext modelContext) { this.catalog = ""; this.schema = ""; this.pkJoinColumns = new jakarta.persistence.PrimaryKeyJoinColumn[0]; @@ -55,7 +55,7 @@ public SecondaryTableJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public SecondaryTableJpaAnnotation(SecondaryTable annotation, SourceModelBuildingContext modelContext) { + public SecondaryTableJpaAnnotation(SecondaryTable annotation, ModelsContext modelContext) { this.name = annotation.name(); this.catalog = annotation.catalog(); this.schema = annotation.schema(); @@ -81,7 +81,7 @@ public SecondaryTableJpaAnnotation(SecondaryTable annotation, SourceModelBuildin /** * Used in creating annotation instances from Jandex variant */ - public SecondaryTableJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public SecondaryTableJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.catalog = (String) attributeValues.get( "catalog" ); this.schema = (String) attributeValues.get( "schema" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryTablesJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryTablesJpaAnnotation.java index 2804e4d92185..eb5ee9070b6a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryTablesJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SecondaryTablesJpaAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.boot.models.JpaAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.SecondaryTable; import jakarta.persistence.SecondaryTables; @@ -24,20 +24,20 @@ public class SecondaryTablesJpaAnnotation implements SecondaryTables, Repeatable /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SecondaryTablesJpaAnnotation(SourceModelBuildingContext modelContext) { + public SecondaryTablesJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public SecondaryTablesJpaAnnotation(SecondaryTables annotation, SourceModelBuildingContext modelContext) { + public SecondaryTablesJpaAnnotation(SecondaryTables annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, JpaAnnotations.SECONDARY_TABLES, "value", modelContext ); } /** * Used in creating annotation instances from Jandex variant */ - public SecondaryTablesJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public SecondaryTablesJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (SecondaryTable[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SequenceGeneratorJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SequenceGeneratorJpaAnnotation.java index 4b3efb2c413c..4220c2b36ce5 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SequenceGeneratorJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SequenceGeneratorJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.SequenceGenerator; @@ -25,7 +25,7 @@ public class SequenceGeneratorJpaAnnotation implements SequenceGenerator { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SequenceGeneratorJpaAnnotation(SourceModelBuildingContext modelContext) { + public SequenceGeneratorJpaAnnotation(ModelsContext modelContext) { this( "", modelContext ); } @@ -36,7 +36,7 @@ public SequenceGeneratorJpaAnnotation(SourceModelBuildingContext modelContext) { *
  • {@linkplain jakarta.persistence.GeneratedValue#generator()} set to a non-empty String, but with no matching {@linkplain SequenceGenerator}
    • * */ - public SequenceGeneratorJpaAnnotation(String name, SourceModelBuildingContext modelContext) { + public SequenceGeneratorJpaAnnotation(String name, ModelsContext modelContext) { this.name = name; this.sequenceName = ""; this.catalog = ""; @@ -49,7 +49,7 @@ public SequenceGeneratorJpaAnnotation(String name, SourceModelBuildingContext mo /** * Used in creating annotation instances from JDK variant */ - public SequenceGeneratorJpaAnnotation(SequenceGenerator annotation, SourceModelBuildingContext modelContext) { + public SequenceGeneratorJpaAnnotation(SequenceGenerator annotation, ModelsContext modelContext) { this.name = annotation.name(); this.sequenceName = annotation.sequenceName(); this.catalog = annotation.catalog(); @@ -64,7 +64,7 @@ public SequenceGeneratorJpaAnnotation(SequenceGenerator annotation, SourceModelB */ public SequenceGeneratorJpaAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.sequenceName = (String) attributeValues.get( "sequenceName" ); this.catalog = (String) attributeValues.get( "catalog" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SequenceGeneratorsJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SequenceGeneratorsJpaAnnotation.java index 38fcc18ea987..5d4e6b262800 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SequenceGeneratorsJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SequenceGeneratorsJpaAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.boot.models.JpaAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.SequenceGenerator; @@ -25,20 +25,20 @@ public class SequenceGeneratorsJpaAnnotation implements SequenceGenerators, Repe /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SequenceGeneratorsJpaAnnotation(SourceModelBuildingContext modelContext) { + public SequenceGeneratorsJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public SequenceGeneratorsJpaAnnotation(SequenceGenerators annotation, SourceModelBuildingContext modelContext) { + public SequenceGeneratorsJpaAnnotation(SequenceGenerators annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, JpaAnnotations.SEQUENCE_GENERATORS, "value", modelContext ); } /** * Used in creating annotation instances from Jandex variant */ - public SequenceGeneratorsJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public SequenceGeneratorsJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (SequenceGenerator[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SoftDeleteAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SoftDeleteAnnotation.java index 70261c3581b2..2a25f251cfbd 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SoftDeleteAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SoftDeleteAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.SoftDelete; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -22,7 +22,7 @@ public class SoftDeleteAnnotation implements SoftDelete { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SoftDeleteAnnotation(SourceModelBuildingContext modelContext) { + public SoftDeleteAnnotation(ModelsContext modelContext) { this.columnName = ""; this.strategy = org.hibernate.annotations.SoftDeleteType.DELETED; this.converter = org.hibernate.annotations.SoftDelete.UnspecifiedConversion.class; @@ -31,7 +31,7 @@ public SoftDeleteAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public SoftDeleteAnnotation(SoftDelete annotation, SourceModelBuildingContext modelContext) { + public SoftDeleteAnnotation(SoftDelete annotation, ModelsContext modelContext) { this.columnName = annotation.columnName(); this.strategy = annotation.strategy(); this.options = annotation.options(); @@ -42,7 +42,7 @@ public SoftDeleteAnnotation(SoftDelete annotation, SourceModelBuildingContext mo /** * Used in creating annotation instances from Jandex variant */ - public SoftDeleteAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public SoftDeleteAnnotation(Map attributeValues, ModelsContext modelContext) { this.columnName = (String) attributeValues.get( "columnName" ); this.strategy = (org.hibernate.annotations.SoftDeleteType) attributeValues.get( "strategy" ); this.options = (String) attributeValues.get( "options" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SortComparatorAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SortComparatorAnnotation.java index eb3c6130c523..65e797f925e6 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SortComparatorAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SortComparatorAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.SortComparator; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class SortComparatorAnnotation implements SortComparator { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SortComparatorAnnotation(SourceModelBuildingContext modelContext) { + public SortComparatorAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public SortComparatorAnnotation(SortComparator annotation, SourceModelBuildingContext modelContext) { + public SortComparatorAnnotation(SortComparator annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public SortComparatorAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public SortComparatorAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class>) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SortNaturalAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SortNaturalAnnotation.java index 8fdaf4213e57..46a605044596 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SortNaturalAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SortNaturalAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.SortNatural; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -17,19 +17,19 @@ public class SortNaturalAnnotation implements SortNatural { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SortNaturalAnnotation(SourceModelBuildingContext modelContext) { + public SortNaturalAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public SortNaturalAnnotation(SortNatural annotation, SourceModelBuildingContext modelContext) { + public SortNaturalAnnotation(SortNatural annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public SortNaturalAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public SortNaturalAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SourceAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SourceAnnotation.java index 3baaa8bfd92f..810aa2718169 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SourceAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SourceAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.Source; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,21 +18,21 @@ public class SourceAnnotation implements Source { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SourceAnnotation(SourceModelBuildingContext modelContext) { + public SourceAnnotation(ModelsContext modelContext) { this.value = org.hibernate.annotations.SourceType.VM; } /** * Used in creating annotation instances from JDK variant */ - public SourceAnnotation(Source annotation, SourceModelBuildingContext modelContext) { + public SourceAnnotation(Source annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public SourceAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public SourceAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (org.hibernate.annotations.SourceType) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlFragmentAliasAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlFragmentAliasAnnotation.java index 615f7af5bed1..51f893dfb66b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlFragmentAliasAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlFragmentAliasAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.SqlFragmentAlias; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -20,7 +20,7 @@ public class SqlFragmentAliasAnnotation implements SqlFragmentAlias { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SqlFragmentAliasAnnotation(SourceModelBuildingContext modelContext) { + public SqlFragmentAliasAnnotation(ModelsContext modelContext) { this.table = ""; this.entity = void.class; } @@ -28,7 +28,7 @@ public SqlFragmentAliasAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public SqlFragmentAliasAnnotation(SqlFragmentAlias annotation, SourceModelBuildingContext modelContext) { + public SqlFragmentAliasAnnotation(SqlFragmentAlias annotation, ModelsContext modelContext) { this.alias = annotation.alias(); this.table = annotation.table(); this.entity = annotation.entity(); @@ -37,7 +37,7 @@ public SqlFragmentAliasAnnotation(SqlFragmentAlias annotation, SourceModelBuildi /** * Used in creating annotation instances from Jandex variant */ - public SqlFragmentAliasAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public SqlFragmentAliasAnnotation(Map attributeValues, ModelsContext modelContext) { this.alias = (String) attributeValues.get( "alias" ); this.table = (String) attributeValues.get( "table" ); this.entity = (Class) attributeValues.get( "entity" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlResultSetMappingJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlResultSetMappingJpaAnnotation.java index ac12e08d7cef..4fbec131f6c9 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlResultSetMappingJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlResultSetMappingJpaAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.boot.models.JpaAnnotations; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.SqlResultSetMapping; @@ -25,7 +25,7 @@ public class SqlResultSetMappingJpaAnnotation implements SqlResultSetMapping { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SqlResultSetMappingJpaAnnotation(SourceModelBuildingContext modelContext) { + public SqlResultSetMappingJpaAnnotation(ModelsContext modelContext) { this.entities = new jakarta.persistence.EntityResult[0]; this.classes = new jakarta.persistence.ConstructorResult[0]; this.columns = new jakarta.persistence.ColumnResult[0]; @@ -34,7 +34,7 @@ public SqlResultSetMappingJpaAnnotation(SourceModelBuildingContext modelContext) /** * Used in creating annotation instances from JDK variant */ - public SqlResultSetMappingJpaAnnotation(SqlResultSetMapping annotation, SourceModelBuildingContext modelContext) { + public SqlResultSetMappingJpaAnnotation(SqlResultSetMapping annotation, ModelsContext modelContext) { this.name = annotation.name(); this.entities = extractJdkValue( annotation, JpaAnnotations.SQL_RESULT_SET_MAPPING, "entities", modelContext ); this.classes = extractJdkValue( annotation, JpaAnnotations.SQL_RESULT_SET_MAPPING, "classes", modelContext ); @@ -46,7 +46,7 @@ public SqlResultSetMappingJpaAnnotation(SqlResultSetMapping annotation, SourceMo */ public SqlResultSetMappingJpaAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.entities = (jakarta.persistence.EntityResult[]) attributeValues.get( "entities" ); this.classes = (jakarta.persistence.ConstructorResult[]) attributeValues.get( "classes" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlResultSetMappingsJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlResultSetMappingsJpaAnnotation.java index b47315512446..5e19f48c238c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlResultSetMappingsJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SqlResultSetMappingsJpaAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.boot.models.JpaAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.SqlResultSetMapping; import jakarta.persistence.SqlResultSetMappings; @@ -25,13 +25,13 @@ public class SqlResultSetMappingsJpaAnnotation /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SqlResultSetMappingsJpaAnnotation(SourceModelBuildingContext modelContext) { + public SqlResultSetMappingsJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public SqlResultSetMappingsJpaAnnotation(SqlResultSetMappings annotation, SourceModelBuildingContext modelContext) { + public SqlResultSetMappingsJpaAnnotation(SqlResultSetMappings annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, JpaAnnotations.SQL_RESULT_SET_MAPPINGS, "value", modelContext ); } @@ -40,7 +40,7 @@ public SqlResultSetMappingsJpaAnnotation(SqlResultSetMappings annotation, Source */ public SqlResultSetMappingsJpaAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.value = (SqlResultSetMapping[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/StoredProcedureParameterJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/StoredProcedureParameterJpaAnnotation.java index fc9267cbea4a..25480a5fde19 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/StoredProcedureParameterJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/StoredProcedureParameterJpaAnnotation.java @@ -10,7 +10,7 @@ import org.hibernate.boot.jaxb.mapping.spi.JaxbStoredProcedureParameterImpl; import org.hibernate.boot.models.xml.spi.XmlDocumentContext; import org.hibernate.internal.util.StringHelper; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.StoredProcedureParameter; @@ -24,7 +24,7 @@ public class StoredProcedureParameterJpaAnnotation implements StoredProcedurePar /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public StoredProcedureParameterJpaAnnotation(SourceModelBuildingContext modelContext) { + public StoredProcedureParameterJpaAnnotation(ModelsContext modelContext) { this.name = ""; this.mode = jakarta.persistence.ParameterMode.IN; } @@ -34,7 +34,7 @@ public StoredProcedureParameterJpaAnnotation(SourceModelBuildingContext modelCon */ public StoredProcedureParameterJpaAnnotation( StoredProcedureParameter annotation, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.name = annotation.name(); this.mode = annotation.mode(); this.type = annotation.type(); @@ -45,7 +45,7 @@ public StoredProcedureParameterJpaAnnotation( */ public StoredProcedureParameterJpaAnnotation( Map attributeValues, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.mode = (jakarta.persistence.ParameterMode) attributeValues.get( "mode" ); this.type = (Class) attributeValues.get( "type" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/StructAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/StructAnnotation.java index 2dc156ce109b..d76f44103efb 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/StructAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/StructAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.Struct; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -21,14 +21,14 @@ public class StructAnnotation implements Struct { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public StructAnnotation(SourceModelBuildingContext modelContext) { + public StructAnnotation(ModelsContext modelContext) { this.attributes = new String[0]; } /** * Used in creating annotation instances from JDK variant */ - public StructAnnotation(Struct annotation, SourceModelBuildingContext modelContext) { + public StructAnnotation(Struct annotation, ModelsContext modelContext) { this.name = annotation.name(); this.catalog = annotation.catalog(); this.schema = annotation.schema(); @@ -38,7 +38,7 @@ public StructAnnotation(Struct annotation, SourceModelBuildingContext modelConte /** * Used in creating annotation instances from Jandex variant */ - public StructAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public StructAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.catalog = (String) attributeValues.get( "catalog" ); this.schema = (String) attributeValues.get( "schema" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SubselectAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SubselectAnnotation.java index 5a38f963c727..55c21dc1bc51 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SubselectAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SubselectAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.Subselect; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class SubselectAnnotation implements Subselect { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SubselectAnnotation(SourceModelBuildingContext modelContext) { + public SubselectAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public SubselectAnnotation(Subselect annotation, SourceModelBuildingContext modelContext) { + public SubselectAnnotation(Subselect annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public SubselectAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public SubselectAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (String) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SynchronizeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SynchronizeAnnotation.java index 3334275a32c8..6ff1db1ab20e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SynchronizeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/SynchronizeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.Synchronize; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -19,14 +19,14 @@ public class SynchronizeAnnotation implements Synchronize { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public SynchronizeAnnotation(SourceModelBuildingContext modelContext) { + public SynchronizeAnnotation(ModelsContext modelContext) { this.logical = true; } /** * Used in creating annotation instances from JDK variant */ - public SynchronizeAnnotation(Synchronize annotation, SourceModelBuildingContext modelContext) { + public SynchronizeAnnotation(Synchronize annotation, ModelsContext modelContext) { this.value = annotation.value(); this.logical = annotation.logical(); } @@ -34,7 +34,7 @@ public SynchronizeAnnotation(Synchronize annotation, SourceModelBuildingContext /** * Used in creating annotation instances from Jandex variant */ - public SynchronizeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public SynchronizeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (String[]) attributeValues.get( "value" ); this.logical = (boolean) attributeValues.get( "logical" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableGeneratorJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableGeneratorJpaAnnotation.java index 572e00416cd8..bd13662c68c4 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableGeneratorJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableGeneratorJpaAnnotation.java @@ -12,7 +12,7 @@ import org.hibernate.boot.models.annotations.spi.UniqueConstraintCollector; import org.hibernate.boot.models.xml.spi.XmlDocumentContext; import org.hibernate.internal.util.StringHelper; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.TableGenerator; @@ -40,7 +40,7 @@ public class TableGeneratorJpaAnnotation implements TableGenerator, UniqueConstr /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public TableGeneratorJpaAnnotation(SourceModelBuildingContext modelContext) { + public TableGeneratorJpaAnnotation(ModelsContext modelContext) { this( "", modelContext ); } @@ -51,7 +51,7 @@ public TableGeneratorJpaAnnotation(SourceModelBuildingContext modelContext) { *
  • {@linkplain jakarta.persistence.GeneratedValue#generator()} set to a non-empty String, but with no matching {@linkplain TableGenerator}
    • * */ - public TableGeneratorJpaAnnotation(String name, SourceModelBuildingContext modelContext) { + public TableGeneratorJpaAnnotation(String name, ModelsContext modelContext) { this.name = name; this.table = ""; this.catalog = ""; @@ -69,7 +69,7 @@ public TableGeneratorJpaAnnotation(String name, SourceModelBuildingContext model /** * Used in creating annotation instances from JDK variant */ - public TableGeneratorJpaAnnotation(TableGenerator annotation, SourceModelBuildingContext modelContext) { + public TableGeneratorJpaAnnotation(TableGenerator annotation, ModelsContext modelContext) { this.name = annotation.name(); this.table = annotation.table(); this.catalog = annotation.catalog(); @@ -87,7 +87,7 @@ public TableGeneratorJpaAnnotation(TableGenerator annotation, SourceModelBuildin /** * Used in creating annotation instances from Jandex variant */ - public TableGeneratorJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public TableGeneratorJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.table = (String) attributeValues.get( "table" ); this.catalog = (String) attributeValues.get( "catalog" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableGeneratorsJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableGeneratorsJpaAnnotation.java index ee635329f0ca..b23acf5a0d91 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableGeneratorsJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableGeneratorsJpaAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.boot.models.JpaAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.TableGenerator; import jakarta.persistence.TableGenerators; @@ -24,20 +24,20 @@ public class TableGeneratorsJpaAnnotation implements TableGenerators, Repeatable /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public TableGeneratorsJpaAnnotation(SourceModelBuildingContext modelContext) { + public TableGeneratorsJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public TableGeneratorsJpaAnnotation(TableGenerators annotation, SourceModelBuildingContext modelContext) { + public TableGeneratorsJpaAnnotation(TableGenerators annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, JpaAnnotations.TABLE_GENERATORS, "value", modelContext ); } /** * Used in creating annotation instances from Jandex variant */ - public TableGeneratorsJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public TableGeneratorsJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (TableGenerator[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableJpaAnnotation.java index 9cbf03c491e2..fe72f8edc8a2 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TableJpaAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.boot.models.JpaAnnotations; import org.hibernate.boot.models.annotations.spi.CommonTableDetails; import org.hibernate.boot.models.xml.spi.XmlDocumentContext; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.Table; @@ -38,7 +38,7 @@ public class TableJpaAnnotation implements Table, CommonTableDetails { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public TableJpaAnnotation(SourceModelBuildingContext modelContext) { + public TableJpaAnnotation(ModelsContext modelContext) { this.name = ""; this.catalog = ""; this.schema = ""; @@ -52,7 +52,7 @@ public TableJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public TableJpaAnnotation(Table annotation, SourceModelBuildingContext modelContext) { + public TableJpaAnnotation(Table annotation, ModelsContext modelContext) { this.name = annotation.name(); this.catalog = annotation.catalog(); this.schema = annotation.schema(); @@ -66,7 +66,7 @@ public TableJpaAnnotation(Table annotation, SourceModelBuildingContext modelCont /** * Used in creating annotation instances from Jandex variant */ - public TableJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public TableJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.catalog = (String) attributeValues.get( "catalog" ); this.schema = (String) attributeValues.get( "schema" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TargetLegacyAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TargetLegacyAnnotation.java index 41b0d815c2fd..64c5f42a02de 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TargetLegacyAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TargetLegacyAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.Target; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class TargetLegacyAnnotation implements Target { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public TargetLegacyAnnotation(SourceModelBuildingContext modelContext) { + public TargetLegacyAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public TargetLegacyAnnotation(Target annotation, SourceModelBuildingContext modelContext) { + public TargetLegacyAnnotation(Target annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public TargetLegacyAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public TargetLegacyAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TargetXmlAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TargetXmlAnnotation.java index f7b27f653ccb..924e95123824 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TargetXmlAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TargetXmlAnnotation.java @@ -8,21 +8,21 @@ import java.util.Map; import org.hibernate.boot.internal.Target; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") public class TargetXmlAnnotation implements Target { private String value; - public TargetXmlAnnotation(SourceModelBuildingContext modelContext) { + public TargetXmlAnnotation(ModelsContext modelContext) { } - public TargetXmlAnnotation(Target annotation, SourceModelBuildingContext modelContext) { + public TargetXmlAnnotation(Target annotation, ModelsContext modelContext) { throw new UnsupportedOperationException( "Should only ever be sourced from XML" ); } - public TargetXmlAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public TargetXmlAnnotation(Map attributeValues, ModelsContext modelContext) { throw new UnsupportedOperationException( "Should only ever be sourced from XML" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TemporalJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TemporalJpaAnnotation.java index 01e8e2ca4e9c..a50b0f04875e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TemporalJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TemporalJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.Temporal; @@ -19,20 +19,20 @@ public class TemporalJpaAnnotation implements Temporal { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public TemporalJpaAnnotation(SourceModelBuildingContext modelContext) { + public TemporalJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public TemporalJpaAnnotation(Temporal annotation, SourceModelBuildingContext modelContext) { + public TemporalJpaAnnotation(Temporal annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public TemporalJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public TemporalJpaAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (jakarta.persistence.TemporalType) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TenantIdAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TenantIdAnnotation.java index 73c0b46979b4..55693b455437 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TenantIdAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TenantIdAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.TenantId; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -17,19 +17,19 @@ public class TenantIdAnnotation implements TenantId { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public TenantIdAnnotation(SourceModelBuildingContext modelContext) { + public TenantIdAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public TenantIdAnnotation(TenantId annotation, SourceModelBuildingContext modelContext) { + public TenantIdAnnotation(TenantId annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public TenantIdAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public TenantIdAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TimeZoneColumnAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TimeZoneColumnAnnotation.java index 491670322ece..3602fd9d1e4a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TimeZoneColumnAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TimeZoneColumnAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.TimeZoneColumn; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -24,7 +24,7 @@ public class TimeZoneColumnAnnotation implements TimeZoneColumn { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public TimeZoneColumnAnnotation(SourceModelBuildingContext modelContext) { + public TimeZoneColumnAnnotation(ModelsContext modelContext) { this.name = ""; this.insertable = true; this.updatable = true; @@ -37,7 +37,7 @@ public TimeZoneColumnAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public TimeZoneColumnAnnotation(TimeZoneColumn annotation, SourceModelBuildingContext modelContext) { + public TimeZoneColumnAnnotation(TimeZoneColumn annotation, ModelsContext modelContext) { this.name = annotation.name(); this.insertable = annotation.insertable(); this.updatable = annotation.updatable(); @@ -50,7 +50,7 @@ public TimeZoneColumnAnnotation(TimeZoneColumn annotation, SourceModelBuildingCo /** * Used in creating annotation instances from Jandex variant */ - public TimeZoneColumnAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public TimeZoneColumnAnnotation(Map attributeValues, ModelsContext modelContext) { this.name = (String) attributeValues.get( "name" ); this.insertable = (boolean) attributeValues.get( "insertable" ); this.updatable = (boolean) attributeValues.get( "updatable" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TimeZoneStorageAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TimeZoneStorageAnnotation.java index 16c32c056fa9..692c3dd18ecd 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TimeZoneStorageAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TimeZoneStorageAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.TimeZoneStorage; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,21 +18,21 @@ public class TimeZoneStorageAnnotation implements TimeZoneStorage { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public TimeZoneStorageAnnotation(SourceModelBuildingContext modelContext) { + public TimeZoneStorageAnnotation(ModelsContext modelContext) { this.value = org.hibernate.annotations.TimeZoneStorageType.AUTO; } /** * Used in creating annotation instances from JDK variant */ - public TimeZoneStorageAnnotation(TimeZoneStorage annotation, SourceModelBuildingContext modelContext) { + public TimeZoneStorageAnnotation(TimeZoneStorage annotation, ModelsContext modelContext) { this.value = annotation.value(); } /** * Used in creating annotation instances from Jandex variant */ - public TimeZoneStorageAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public TimeZoneStorageAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (org.hibernate.annotations.TimeZoneStorageType) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TransientJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TransientJpaAnnotation.java index a84fb198ac99..feff26f9cd10 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TransientJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TransientJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.Transient; @@ -17,19 +17,19 @@ public class TransientJpaAnnotation implements Transient { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public TransientJpaAnnotation(SourceModelBuildingContext modelContext) { + public TransientJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public TransientJpaAnnotation(Transient annotation, SourceModelBuildingContext modelContext) { + public TransientJpaAnnotation(Transient annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public TransientJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public TransientJpaAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeAnnotation.java index 2681cad61f15..75dd7d2049be 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.Type; import org.hibernate.boot.models.HibernateAnnotations; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -22,14 +22,14 @@ public class TypeAnnotation implements Type { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public TypeAnnotation(SourceModelBuildingContext modelContext) { + public TypeAnnotation(ModelsContext modelContext) { this.parameters = new org.hibernate.annotations.Parameter[0]; } /** * Used in creating annotation instances from JDK variant */ - public TypeAnnotation(Type annotation, SourceModelBuildingContext modelContext) { + public TypeAnnotation(Type annotation, ModelsContext modelContext) { this.value = annotation.value(); this.parameters = extractJdkValue( annotation, HibernateAnnotations.TYPE, "parameters", modelContext ); } @@ -37,7 +37,7 @@ public TypeAnnotation(Type annotation, SourceModelBuildingContext modelContext) /** * Used in creating annotation instances from Jandex variant */ - public TypeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public TypeAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (Class>) attributeValues.get( "value" ); this.parameters = (org.hibernate.annotations.Parameter[]) attributeValues.get( "parameters" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeBinderTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeBinderTypeAnnotation.java index 7d94dbf8aa09..b9bf499884b6 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeBinderTypeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeBinderTypeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.TypeBinderType; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class TypeBinderTypeAnnotation implements TypeBinderType { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public TypeBinderTypeAnnotation(SourceModelBuildingContext modelContext) { + public TypeBinderTypeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public TypeBinderTypeAnnotation(TypeBinderType annotation, SourceModelBuildingContext modelContext) { + public TypeBinderTypeAnnotation(TypeBinderType annotation, ModelsContext modelContext) { this.binder = annotation.binder(); } /** * Used in creating annotation instances from Jandex variant */ - public TypeBinderTypeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public TypeBinderTypeAnnotation(Map attributeValues, ModelsContext modelContext) { this.binder = (Class>) attributeValues.get( "binder" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeRegistrationAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeRegistrationAnnotation.java index bbed6501fa56..47c868b0d94e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeRegistrationAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeRegistrationAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.TypeRegistration; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -19,13 +19,13 @@ public class TypeRegistrationAnnotation implements TypeRegistration { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public TypeRegistrationAnnotation(SourceModelBuildingContext modelContext) { + public TypeRegistrationAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public TypeRegistrationAnnotation(TypeRegistration annotation, SourceModelBuildingContext modelContext) { + public TypeRegistrationAnnotation(TypeRegistration annotation, ModelsContext modelContext) { this.basicClass = annotation.basicClass(); this.userType = annotation.userType(); } @@ -33,7 +33,7 @@ public TypeRegistrationAnnotation(TypeRegistration annotation, SourceModelBuildi /** * Used in creating annotation instances from Jandex variant */ - public TypeRegistrationAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public TypeRegistrationAnnotation(Map attributeValues, ModelsContext modelContext) { this.basicClass = (Class) attributeValues.get( "basicClass" ); this.userType = (Class>) attributeValues.get( "userType" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeRegistrationsAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeRegistrationsAnnotation.java index bf3bd00be589..d45444b04e7c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeRegistrationsAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/TypeRegistrationsAnnotation.java @@ -11,7 +11,7 @@ import org.hibernate.annotations.TypeRegistrations; import org.hibernate.boot.models.HibernateAnnotations; import org.hibernate.boot.models.annotations.spi.RepeatableContainer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue; @@ -23,20 +23,20 @@ public class TypeRegistrationsAnnotation implements TypeRegistrations, Repeatabl /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public TypeRegistrationsAnnotation(SourceModelBuildingContext modelContext) { + public TypeRegistrationsAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public TypeRegistrationsAnnotation(TypeRegistrations annotation, SourceModelBuildingContext modelContext) { + public TypeRegistrationsAnnotation(TypeRegistrations annotation, ModelsContext modelContext) { this.value = extractJdkValue( annotation, HibernateAnnotations.TYPE_REGISTRATIONS, "value", modelContext ); } /** * Used in creating annotation instances from Jandex variant */ - public TypeRegistrationsAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public TypeRegistrationsAnnotation(Map attributeValues, ModelsContext modelContext) { this.value = (TypeRegistration[]) attributeValues.get( "value" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UniqueConstraintJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UniqueConstraintJpaAnnotation.java index 066e57338a46..7338b1b7e8d1 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UniqueConstraintJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UniqueConstraintJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.UniqueConstraint; @@ -21,7 +21,7 @@ public class UniqueConstraintJpaAnnotation implements UniqueConstraint { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public UniqueConstraintJpaAnnotation(SourceModelBuildingContext modelContext) { + public UniqueConstraintJpaAnnotation(ModelsContext modelsContext) { this.name = ""; this.options = ""; } @@ -29,7 +29,7 @@ public UniqueConstraintJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public UniqueConstraintJpaAnnotation(UniqueConstraint annotation, SourceModelBuildingContext modelContext) { + public UniqueConstraintJpaAnnotation(UniqueConstraint annotation, ModelsContext modelsContext) { this.name = annotation.name(); this.columnNames = annotation.columnNames(); this.options = annotation.options(); @@ -38,7 +38,7 @@ public UniqueConstraintJpaAnnotation(UniqueConstraint annotation, SourceModelBui /** * Used in creating annotation instances from Jandex variant */ - public UniqueConstraintJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public UniqueConstraintJpaAnnotation(Map attributeValues, ModelsContext modelsContext) { this.name = (String) attributeValues.get( "name" ); this.columnNames = (String[]) attributeValues.get( "columnNames" ); this.options = (String) attributeValues.get( "options" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UpdateTimestampAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UpdateTimestampAnnotation.java index 938dd715f224..cb33af382ffa 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UpdateTimestampAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UpdateTimestampAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.UpdateTimestamp; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,21 +18,21 @@ public class UpdateTimestampAnnotation implements UpdateTimestamp { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public UpdateTimestampAnnotation(SourceModelBuildingContext modelContext) { + public UpdateTimestampAnnotation(ModelsContext modelContext) { this.source = org.hibernate.annotations.SourceType.VM; } /** * Used in creating annotation instances from JDK variant */ - public UpdateTimestampAnnotation(UpdateTimestamp annotation, SourceModelBuildingContext modelContext) { + public UpdateTimestampAnnotation(UpdateTimestamp annotation, ModelsContext modelContext) { this.source = annotation.source(); } /** * Used in creating annotation instances from Jandex variant */ - public UpdateTimestampAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public UpdateTimestampAnnotation(Map attributeValues, ModelsContext modelContext) { this.source = (org.hibernate.annotations.SourceType) attributeValues.get( "source" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UuidGeneratorAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UuidGeneratorAnnotation.java index ae34dc649a27..a06fd023ff7a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UuidGeneratorAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/UuidGeneratorAnnotation.java @@ -9,7 +9,7 @@ import org.hibernate.annotations.UuidGenerator; import org.hibernate.id.uuid.UuidValueGenerator; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -20,7 +20,7 @@ public class UuidGeneratorAnnotation implements UuidGenerator { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public UuidGeneratorAnnotation(SourceModelBuildingContext modelContext) { + public UuidGeneratorAnnotation(ModelsContext modelContext) { this.style = org.hibernate.annotations.UuidGenerator.Style.AUTO; this.algorithm = UuidValueGenerator.class; } @@ -28,7 +28,7 @@ public UuidGeneratorAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating annotation instances from JDK variant */ - public UuidGeneratorAnnotation(UuidGenerator annotation, SourceModelBuildingContext modelContext) { + public UuidGeneratorAnnotation(UuidGenerator annotation, ModelsContext modelContext) { this.style = annotation.style(); this.algorithm = annotation.algorithm(); } @@ -36,7 +36,7 @@ public UuidGeneratorAnnotation(UuidGenerator annotation, SourceModelBuildingCont /** * Used in creating annotation instances from Jandex variant */ - public UuidGeneratorAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public UuidGeneratorAnnotation(Map attributeValues, ModelsContext modelContext) { this.style = (Style) attributeValues.get( "style" ); this.algorithm = (Class) attributeValues.get( "algorithm" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ValueGenerationTypeAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ValueGenerationTypeAnnotation.java index d54af0e9475b..7ed11ea8807f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ValueGenerationTypeAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ValueGenerationTypeAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.ValueGenerationType; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -18,20 +18,20 @@ public class ValueGenerationTypeAnnotation implements ValueGenerationType { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ValueGenerationTypeAnnotation(SourceModelBuildingContext modelContext) { + public ValueGenerationTypeAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public ValueGenerationTypeAnnotation(ValueGenerationType annotation, SourceModelBuildingContext modelContext) { + public ValueGenerationTypeAnnotation(ValueGenerationType annotation, ModelsContext modelContext) { this.generatedBy = annotation.generatedBy(); } /** * Used in creating annotation instances from Jandex variant */ - public ValueGenerationTypeAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ValueGenerationTypeAnnotation(Map attributeValues, ModelsContext modelContext) { this.generatedBy = (Class) attributeValues.get( "generatedBy" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/VersionJpaAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/VersionJpaAnnotation.java index 7de80ae4ae56..fd6f0f514d31 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/VersionJpaAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/VersionJpaAnnotation.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; import java.util.Map; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.Version; @@ -17,19 +17,19 @@ public class VersionJpaAnnotation implements Version { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public VersionJpaAnnotation(SourceModelBuildingContext modelContext) { + public VersionJpaAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public VersionJpaAnnotation(Version annotation, SourceModelBuildingContext modelContext) { + public VersionJpaAnnotation(Version annotation, ModelsContext modelContext) { } /** * Used in creating annotation instances from Jandex variant */ - public VersionJpaAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public VersionJpaAnnotation(Map attributeValues, ModelsContext modelContext) { } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ViewAnnotation.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ViewAnnotation.java index 3624defdcdba..27932f70e927 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ViewAnnotation.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/ViewAnnotation.java @@ -8,7 +8,7 @@ import java.util.Map; import org.hibernate.annotations.View; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; @SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" }) @jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor") @@ -19,20 +19,20 @@ public class ViewAnnotation implements View { /** * Used in creating dynamic annotation instances (e.g. from XML) */ - public ViewAnnotation(SourceModelBuildingContext modelContext) { + public ViewAnnotation(ModelsContext modelContext) { } /** * Used in creating annotation instances from JDK variant */ - public ViewAnnotation(View annotation, SourceModelBuildingContext modelContext) { + public ViewAnnotation(View annotation, ModelsContext modelContext) { this.query = annotation.query(); } /** * Used in creating annotation instances from Jandex variant */ - public ViewAnnotation(Map attributeValues, SourceModelBuildingContext modelContext) { + public ViewAnnotation(Map attributeValues, ModelsContext modelContext) { this.query = (String) attributeValues.get( "query" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/AbstractOverrider.java b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/AbstractOverrider.java index 64f5a5da9499..53134237f074 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/AbstractOverrider.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/annotations/spi/AbstractOverrider.java @@ -11,7 +11,7 @@ import org.hibernate.dialect.DatabaseVersion; import org.hibernate.dialect.Dialect; import org.hibernate.models.spi.AnnotationDescriptor; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; /** * Base support for {@linkplain DialectOverrider} annotations @@ -29,7 +29,7 @@ public AbstractOverrider() { public AbstractOverrider( Map attributeValues, AnnotationDescriptor descriptor, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { dialect( (Class) attributeValues.get( "dialect" ) ); before( (DialectOverride.Version) attributeValues.get( "before" ) ); sameOrAfter( (DialectOverride.Version) attributeValues.get( "sameOrAfter" ) ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/ClassLoaderServiceLoading.java b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/ClassLoaderServiceLoading.java index 02cab47e0219..a865b8e923dc 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/ClassLoaderServiceLoading.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/ClassLoaderServiceLoading.java @@ -38,11 +38,6 @@ public Class findClassForName(String name) { } } - @Override - public Package packageForName(String name) { - return classLoaderService.packageForNameOrNull( name ); - } - @Override public URL locateResource(String resourceName) { return classLoaderService.locateResource( resourceName ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/DomainModelCategorizationCollector.java b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/DomainModelCategorizationCollector.java index b446c31ab1cc..7bacdabcd711 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/DomainModelCategorizationCollector.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/DomainModelCategorizationCollector.java @@ -16,7 +16,7 @@ import org.hibernate.boot.models.spi.GlobalRegistrations; import org.hibernate.boot.models.xml.spi.XmlDocumentContext; import org.hibernate.models.spi.ClassDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import java.util.HashMap; import java.util.HashSet; @@ -32,7 +32,7 @@ public class DomainModelCategorizationCollector { private final boolean areIdGeneratorsGlobal; private final GlobalRegistrationsImpl globalRegistrations; - private final SourceModelBuildingContext modelsContext; + private final ModelsContext modelsContext; private final Set rootEntities = new HashSet<>(); private final Map mappedSuperclasses = new HashMap<>(); @@ -41,7 +41,7 @@ public class DomainModelCategorizationCollector { public DomainModelCategorizationCollector( boolean areIdGeneratorsGlobal, GlobalRegistrations globalRegistrations, - SourceModelBuildingContext modelsContext) { + ModelsContext modelsContext) { this.areIdGeneratorsGlobal = areIdGeneratorsGlobal; this.globalRegistrations = (GlobalRegistrationsImpl) globalRegistrations; this.modelsContext = modelsContext; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/GlobalRegistrationsImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/GlobalRegistrationsImpl.java index 0a3cc4cdb1ba..5b1de2f5e45c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/GlobalRegistrationsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/GlobalRegistrationsImpl.java @@ -83,7 +83,7 @@ import org.hibernate.models.spi.AnnotationTarget; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.MemberDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.usertype.CompositeUserType; import org.hibernate.usertype.UserCollectionType; import org.hibernate.usertype.UserType; @@ -119,7 +119,7 @@ * @author Steve Ebersole */ public class GlobalRegistrationsImpl implements GlobalRegistrations, GlobalRegistrar { - private final SourceModelBuildingContext sourceModelContext; + private final ModelsContext sourceModelContext; private final BootstrapContext bootstrapContext; private List jpaEventListeners; @@ -144,7 +144,7 @@ public class GlobalRegistrationsImpl implements GlobalRegistrations, GlobalRegis private Map namedNativeQueryRegistrations; private Map namedStoredProcedureQueryRegistrations; - public GlobalRegistrationsImpl(SourceModelBuildingContext sourceModelContext, BootstrapContext bootstrapContext) { + public GlobalRegistrationsImpl(ModelsContext sourceModelContext, BootstrapContext bootstrapContext) { this.sourceModelContext = sourceModelContext; this.bootstrapContext = bootstrapContext; } @@ -664,7 +664,7 @@ public void collectImportRename(String rename, String name) { // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // EntityListenerRegistration - public void collectEntityListenerRegistrations(List listeners, SourceModelBuildingContext modelsContext) { + public void collectEntityListenerRegistrations(List listeners, ModelsContext modelsContext) { if ( CollectionHelper.isEmpty( listeners ) ) { return; } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/ModelsHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/ModelsHelper.java index 5177f0d456b3..c1dfe74c1f05 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/ModelsHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/ModelsHelper.java @@ -11,14 +11,14 @@ import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; import org.hibernate.models.spi.RegistryPrimer; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; /** * @author Steve Ebersole */ public class ModelsHelper { - public static void preFillRegistries(RegistryPrimer.Contributions contributions, SourceModelBuildingContext buildingContext) { + public static void preFillRegistries(RegistryPrimer.Contributions contributions, ModelsContext buildingContext) { OrmAnnotationHelper.forEachOrmAnnotation( contributions::registerAnnotation ); buildingContext.getAnnotationDescriptorRegistry().getDescriptor( TenantId.class ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/OrmAnnotationHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/OrmAnnotationHelper.java index 61c0bdd48793..a03b7b9e9493 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/OrmAnnotationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/OrmAnnotationHelper.java @@ -22,7 +22,7 @@ import org.hibernate.models.AnnotationAccessException; import org.hibernate.models.spi.AnnotationDescriptor; import org.hibernate.models.spi.AttributeDescriptor; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; /** @@ -57,14 +57,14 @@ public static void forEachOrmAnnotation(Class declarer, Consumer V extractJdkValue(A jdkAnnotation, AttributeDescriptor attributeDescriptor, SourceModelBuildingContext modelContext) { + public static V extractJdkValue(A jdkAnnotation, AttributeDescriptor attributeDescriptor, ModelsContext modelContext) { return attributeDescriptor .getTypeDescriptor() .createJdkValueExtractor( modelContext ) .extractValue( jdkAnnotation, attributeDescriptor, modelContext ); } - public static V extractJdkValue(A jdkAnnotation, AnnotationDescriptor     annotationDescriptor, String attributeName, SourceModelBuildingContext modelContext) { + public static V extractJdkValue(A jdkAnnotation, AnnotationDescriptor annotationDescriptor, String attributeName, ModelsContext modelContext) { final AttributeDescriptor attributeDescriptor = annotationDescriptor.getAttribute( attributeName ); return extractJdkValue( jdkAnnotation, attributeDescriptor, modelContext ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/JpaEventListener.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/JpaEventListener.java index ac2300f3a024..476b5a5aaece 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/JpaEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/JpaEventListener.java @@ -12,7 +12,7 @@ import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.MethodDetails; import org.hibernate.models.spi.MutableMemberDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.PostLoad; import jakarta.persistence.PostPersist; @@ -32,7 +32,7 @@ /** * JPA-style event listener with support for resolving callback methods from - * {@linkplain #from(JpaEventListenerStyle, ClassDetails, JaxbEntityListenerImpl, SourceModelBuildingContext) XML} + * {@linkplain #from(JpaEventListenerStyle, ClassDetails, JaxbEntityListenerImpl, ModelsContext) XML} * or from {@linkplain #from(JpaEventListenerStyle, ClassDetails) annotation}. *

    * Represents a global entity listener defined in the persistence unit @@ -127,7 +127,7 @@ public static JpaEventListener from( JpaEventListenerStyle consumerType, ClassDetails listenerClassDetails, JaxbEntityListenerImpl jaxbMapping, - SourceModelBuildingContext modelsContext) { + ModelsContext modelsContext) { final MutableObject prePersistMethod = new MutableObject<>(); final MutableObject postPersistMethod = new MutableObject<>(); final MutableObject preRemoveMethod = new MutableObject<>(); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/EntityGraphProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/EntityGraphProcessing.java index 246d25509164..306aa2d13976 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/EntityGraphProcessing.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/EntityGraphProcessing.java @@ -20,7 +20,7 @@ import org.hibernate.internal.util.collections.CollectionHelper; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.MutableClassDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.NamedAttributeNode; import jakarta.persistence.NamedEntityGraph; @@ -44,7 +44,7 @@ public static void applyEntityGraphs( return; } - final SourceModelBuildingContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); + final ModelsContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); final NamedEntityGraphsJpaAnnotation entityGraphsUsage = (NamedEntityGraphsJpaAnnotation) classDetails.replaceAnnotationUsage( JpaAnnotations.NAMED_ENTITY_GRAPH, JpaAnnotations.NAMED_ENTITY_GRAPHS, @@ -62,7 +62,7 @@ public static void applyEntityGraphs( private static NamedEntityGraph extractGraph( JaxbNamedEntityGraphImpl jaxbEntityGraph, ClassDetails classDetails, - SourceModelBuildingContext modelBuildingContext, + ModelsContext modelBuildingContext, XmlDocumentContext xmlDocumentContext) { final NamedEntityGraphJpaAnnotation graphUsage = JpaAnnotations.NAMED_ENTITY_GRAPH.createUsage( modelBuildingContext ); @@ -107,7 +107,7 @@ private static NamedEntityGraph extractGraph( private static NamedAttributeNode[] extractAttributeNodes( List jaxbAttributeNodes, ClassDetails classDetails, - SourceModelBuildingContext modelBuildingContext, + ModelsContext modelBuildingContext, XmlDocumentContext xmlDocumentContext) { assert CollectionHelper.isNotEmpty( jaxbAttributeNodes ); @@ -133,7 +133,7 @@ private static NamedAttributeNode[] extractAttributeNodes( private static NamedSubgraph[] extractSubgraphNodes( List jaxbSubgraphs, ClassDetails classDetails, - SourceModelBuildingContext modelBuildingContext, + ModelsContext modelBuildingContext, XmlDocumentContext xmlDocumentContext) { assert CollectionHelper.isNotEmpty( jaxbSubgraphs ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/ManagedTypeProcessor.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/ManagedTypeProcessor.java index 65732a3c1aa2..6be50ea2a051 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/ManagedTypeProcessor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/ManagedTypeProcessor.java @@ -53,7 +53,7 @@ import org.hibernate.models.spi.MethodDetails; import org.hibernate.models.spi.MutableClassDetails; import org.hibernate.models.spi.MutableMemberDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.models.spi.TypeDetails; import org.hibernate.property.access.spi.BuiltInPropertyAccessStrategies; @@ -869,7 +869,7 @@ private static void processMappedSuperclassMetadata( JaxbMappedSuperclassImpl jaxbMappedSuperclass, MutableClassDetails classDetails, XmlDocumentContext xmlDocumentContext) { - final SourceModelBuildingContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); + final ModelsContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); classDetails.applyAnnotationUsage( JpaAnnotations.MAPPED_SUPERCLASS, modelBuildingContext ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/QueryProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/QueryProcessing.java index cc7100617b89..47b406c8ca52 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/QueryProcessing.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/QueryProcessing.java @@ -46,7 +46,7 @@ import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.internal.util.collections.CollectionHelper; import org.hibernate.models.spi.MutableClassDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import jakarta.persistence.ColumnResult; import jakarta.persistence.ConstructorResult; @@ -73,7 +73,7 @@ public static void applyNamedQueries( return; } - final SourceModelBuildingContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); + final ModelsContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); List namedHqlQueryList = null; List namedJpqlQueryList = null; @@ -134,7 +134,7 @@ public static QueryHint[] collectQueryHints(List jaxbHints, X } final QueryHint[] hints = new QueryHint[jaxbHints.size()]; - final SourceModelBuildingContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); + final ModelsContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); for ( int i = 0; i < jaxbHints.size(); i++ ) { final QueryHintJpaAnnotation queryHintUsage = JpaAnnotations.QUERY_HINT.createUsage( modelBuildingContext ); hints[i] = queryHintUsage; @@ -154,7 +154,7 @@ public static void applyNamedNativeQueries( return; } - final SourceModelBuildingContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); + final ModelsContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); List namedQueryList = null; List namedJpaQueryList = null; @@ -215,7 +215,7 @@ public static ColumnResult[] extractColumnResults( return NO_COLUMN_RESULTS; } - final SourceModelBuildingContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); + final ModelsContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); final ColumnResult[] columnResults = new ColumnResult[jaxbColumnResultList.size()]; for ( int i = 0; i < jaxbColumnResultList.size(); i++ ) { final ColumnResultJpaAnnotation columnResult = JpaAnnotations.COLUMN_RESULT.createUsage( modelBuildingContext ); @@ -238,7 +238,7 @@ public static ConstructorResult[] extractConstructorResults( return NO_CONSTRUCTOR_RESULTS; } - final SourceModelBuildingContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); + final ModelsContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); final ConstructorResult[] constructorResults = new ConstructorResult[jaxbConstructorResultList.size()]; for ( int i = 0; i < jaxbConstructorResultList.size(); i++ ) { final ConstructorResultJpaAnnotation constructorResult = JpaAnnotations.CONSTRUCTOR_RESULT.createUsage( modelBuildingContext ); @@ -267,7 +267,7 @@ public static EntityResult[] extractEntityResults( return NO_ENTITY_RESULTS; } - final SourceModelBuildingContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); + final ModelsContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); final EntityResult[] entityResults = new EntityResult[jaxbEntityResults.size()]; for ( int i = 0; i < jaxbEntityResults.size(); i++ ) { final EntityResultJpaAnnotation entityResult = JpaAnnotations.ENTITY_RESULT.createUsage( modelBuildingContext ); @@ -300,7 +300,7 @@ private static FieldResult[] extractFieldResults( return null; } - final SourceModelBuildingContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); + final ModelsContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); final FieldResult[] fieldResults = new FieldResult[jaxbFieldResults.size()]; for ( int i = 0; i < jaxbFieldResults.size(); i++ ) { final FieldResultJpaAnnotation fieldResult = JpaAnnotations.FIELD_RESULT.createUsage( modelBuildingContext ); @@ -322,7 +322,7 @@ public static void applyNamedProcedureQueries( return; } - final SourceModelBuildingContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); + final ModelsContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); final NamedStoredProcedureQueriesJpaAnnotation namedQueriesUsage = (NamedStoredProcedureQueriesJpaAnnotation) classDetails.replaceAnnotationUsage( NAMED_STORED_PROCEDURE_QUERY, JpaAnnotations.NAMED_STORED_PROCEDURE_QUERIES, @@ -349,10 +349,10 @@ public static StoredProcedureParameter[] collectParameters( return NO_PARAMS; } - final SourceModelBuildingContext sourceModelBuildingContext = xmlDocumentContext.getModelBuildingContext(); + final ModelsContext ModelsContext = xmlDocumentContext.getModelBuildingContext(); final StoredProcedureParameter[] result = new StoredProcedureParameter[jaxbParameters.size()]; for ( int i = 0; i < jaxbParameters.size(); i++ ) { - final StoredProcedureParameterJpaAnnotation param = JpaAnnotations.STORED_PROCEDURE_PARAMETER.createUsage( sourceModelBuildingContext ); + final StoredProcedureParameterJpaAnnotation param = JpaAnnotations.STORED_PROCEDURE_PARAMETER.createUsage( ModelsContext ); result[i] = param; final JaxbStoredProcedureParameterImpl jaxbParam = jaxbParameters.get( i ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlAnnotationHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlAnnotationHelper.java index c175e80b43b7..ea1ef80fcb86 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlAnnotationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlAnnotationHelper.java @@ -136,7 +136,7 @@ import org.hibernate.models.spi.MutableAnnotationTarget; import org.hibernate.models.spi.MutableClassDetails; import org.hibernate.models.spi.MutableMemberDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.type.SqlTypes; import jakarta.persistence.AssociationOverride; @@ -331,7 +331,7 @@ public static Parameter[] collectParameters( public static Parameter[] collectParameters( List jaxbParameters, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { if ( isEmpty( jaxbParameters ) ) { return NO_PARAMETERS; } @@ -681,7 +681,7 @@ private static AttributeOverrideJpaAnnotation createAttributeOverrideUsage( String namePrefix, MutableAnnotationTarget target, XmlDocumentContext xmlDocumentContext) { - final SourceModelBuildingContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); + final ModelsContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); final AttributeOverrideJpaAnnotation overrideUsage = ATTRIBUTE_OVERRIDE.createUsage( modelBuildingContext ); @@ -1241,7 +1241,7 @@ public static void applyLifecycleCallbacks( JaxbEntityOrMappedSuperclass jaxbClass, MutableClassDetails classDetails, XmlDocumentContext xmlDocumentContext) { - final SourceModelBuildingContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); + final ModelsContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); if ( jaxbClass.getExcludeDefaultListeners() != null ) { classDetails.applyAnnotationUsage( EXCLUDE_DEFAULT_LISTENERS, modelBuildingContext ); @@ -1608,7 +1608,7 @@ public static UniqueConstraint[] collectUniqueConstraints( public static UniqueConstraint[] collectUniqueConstraints( List jaxbUniqueConstraints, - SourceModelBuildingContext modelContext) { + ModelsContext modelContext) { if ( isEmpty( jaxbUniqueConstraints ) ) { return NO_UNIQUE_CONSTRAINTS; } @@ -1635,7 +1635,7 @@ public static Index[] collectIndexes( public static Index[] collectIndexes( List jaxbIndexes, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { if ( isEmpty( jaxbIndexes ) ) { return NO_INDICES; } @@ -1666,7 +1666,7 @@ public static void applyPrimaryKeyJoinColumns( return; } - final SourceModelBuildingContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); + final ModelsContext modelBuildingContext = xmlDocumentContext.getModelBuildingContext(); final PrimaryKeyJoinColumnsJpaAnnotation columnsAnn = (PrimaryKeyJoinColumnsJpaAnnotation) classDetails.replaceAnnotationUsage( JpaAnnotations.PRIMARY_KEY_JOIN_COLUMN, JpaAnnotations.PRIMARY_KEY_JOIN_COLUMNS, diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlDocumentContextImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlDocumentContextImpl.java index 3dea7b0060e1..95974a991921 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlDocumentContextImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/XmlDocumentContextImpl.java @@ -11,7 +11,7 @@ import org.hibernate.boot.spi.BootstrapContext; import org.hibernate.boot.spi.EffectiveMappingDefaults; import org.hibernate.internal.util.StringHelper; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; /** * @author Steve Ebersole @@ -19,13 +19,13 @@ public class XmlDocumentContextImpl implements XmlDocumentContext { private final XmlDocument xmlDocument; private final EffectiveMappingDefaults effectiveDefaults; - private final SourceModelBuildingContext modelBuildingContext; + private final ModelsContext modelBuildingContext; private final BootstrapContext bootstrapContext; public XmlDocumentContextImpl( XmlDocument xmlDocument, RootMappingDefaults mappingDefaults, - SourceModelBuildingContext modelBuildingContext, + ModelsContext modelBuildingContext, BootstrapContext bootstrapContext) { this.xmlDocument = xmlDocument; this.effectiveDefaults = buildEffectiveDefaults( xmlDocument, mappingDefaults ); @@ -44,7 +44,7 @@ public EffectiveMappingDefaults getEffectiveDefaults() { } @Override - public SourceModelBuildingContext getModelBuildingContext() { + public ModelsContext getModelBuildingContext() { return modelBuildingContext; } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/CommonPluralAttributeProcessing.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/CommonPluralAttributeProcessing.java index 9a9d2204ae36..2127d5e1d101 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/CommonPluralAttributeProcessing.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/CommonPluralAttributeProcessing.java @@ -30,7 +30,7 @@ import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; import org.hibernate.models.spi.MutableMemberDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; /** * @author Marco Belladelli @@ -40,7 +40,7 @@ public static void applyPluralAttributeStructure( JaxbPluralAttribute jaxbPluralAttribute, MutableMemberDetails memberDetails, XmlDocumentContext xmlDocumentContext) { - final SourceModelBuildingContext buildingContext = xmlDocumentContext.getModelBuildingContext(); + final ModelsContext buildingContext = xmlDocumentContext.getModelBuildingContext(); final ClassDetailsRegistry classDetailsRegistry = buildingContext.getClassDetailsRegistry(); if ( jaxbPluralAttribute.getFetchMode() != null ) { diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlDocumentContext.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlDocumentContext.java index d280fed93a35..c0680ec8d5cd 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlDocumentContext.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlDocumentContext.java @@ -26,7 +26,7 @@ import org.hibernate.models.internal.dynamic.DynamicClassDetails; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.MutableClassDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.type.descriptor.java.JavaType; import org.hibernate.type.descriptor.jdbc.JdbcType; import org.hibernate.usertype.UserType; @@ -50,9 +50,9 @@ public interface XmlDocumentContext { EffectiveMappingDefaults getEffectiveDefaults(); /** - * Access to the containing SourceModelBuildingContext + * Access to the containing ModelsContext */ - SourceModelBuildingContext getModelBuildingContext(); + ModelsContext getModelBuildingContext(); /** * Access to the containing BootstrapContext diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlProcessor.java b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlProcessor.java index f5e96978dd33..aa281df93920 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlProcessor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/xml/spi/XmlProcessor.java @@ -11,7 +11,7 @@ import org.hibernate.boot.models.xml.internal.XmlDocumentImpl; import org.hibernate.boot.models.xml.internal.XmlProcessingResultImpl; import org.hibernate.boot.spi.BootstrapContext; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; /** * Processes XML mappings - applying metadata-complete mappings and collecting @@ -23,7 +23,7 @@ public class XmlProcessor { public static XmlProcessingResult processXml( XmlPreProcessingResult xmlPreProcessingResult, DomainModelCategorizationCollector modelCategorizationCollector, - SourceModelBuildingContext sourceModelBuildingContext, + ModelsContext ModelsContext, BootstrapContext bootstrapContext, RootMappingDefaults mappingDefaults) { final boolean xmlMappingsGloballyComplete = xmlPreProcessingResult.getPersistenceUnitMetadata().areXmlMappingsComplete(); @@ -37,7 +37,7 @@ public static XmlProcessingResult processXml( final XmlDocumentContext xmlDocumentContext = new XmlDocumentContextImpl( xmlDocument, mappingDefaults, - sourceModelBuildingContext, + ModelsContext, bootstrapContext ); modelCategorizationCollector.apply( jaxbRoot, xmlDocumentContext ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java index 147e885c53e3..c64311da83e9 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java @@ -20,7 +20,7 @@ import org.hibernate.engine.config.spi.ConfigurationService; import org.hibernate.jpa.spi.MutableJpaCompliance; import org.hibernate.metamodel.spi.ManagedTypeRepresentationResolver; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.query.sqm.function.SqmFunctionDescriptor; import org.hibernate.query.sqm.function.SqmFunctionRegistry; import org.hibernate.resource.beans.spi.BeanInstanceProducer; @@ -55,10 +55,10 @@ public interface BootstrapContext { TypeConfiguration getTypeConfiguration(); /** - * Access to the {@code hibernate-models} {@linkplain SourceModelBuildingContext} + * Access to the {@code hibernate-models} {@linkplain ModelsContext} */ @Incubating - SourceModelBuildingContext getModelsContext(); + ModelsContext getModelsContext(); /** * The {@link SqmFunctionRegistry} belonging to this {@code BootstrapContext}. diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java index ff6e36206c02..76230298c461 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java @@ -48,7 +48,7 @@ import org.hibernate.models.spi.AnnotationDescriptorRegistry; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.type.descriptor.java.JavaType; import org.hibernate.type.descriptor.jdbc.JdbcType; import org.hibernate.usertype.CompositeUserType; @@ -71,7 +71,7 @@ public interface InFlightMetadataCollector extends MetadataImplementor { * @deprecated Use {@linkplain BootstrapContext#getModelsContext()} instead. */ @Deprecated - default SourceModelBuildingContext getSourceModelBuildingContext() { + default ModelsContext getModelsContext() { return getBootstrapContext().getModelsContext(); } diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackDefinitionResolver.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackDefinitionResolver.java index fab4ba7e9218..6b0dde1a61e5 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackDefinitionResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackDefinitionResolver.java @@ -23,7 +23,7 @@ import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; import org.hibernate.models.spi.MethodDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.property.access.spi.Getter; import jakarta.persistence.Entity; @@ -47,7 +47,7 @@ private static List resolveEntityCallbacks( InFlightMetadataCollector metadataCollector, ClassDetails entityClass, CallbackType callbackType) { - final SourceModelBuildingContext modelsContext = metadataCollector.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = metadataCollector.getBootstrapContext().getModelsContext(); final List callbackDefinitions = new ArrayList<>(); final List callbacksMethodNames = new ArrayList<>(); @@ -163,7 +163,7 @@ private static List resolveEmbeddableCallbacks( Property embeddableProperty, CallbackType callbackType) { - final SourceModelBuildingContext modelsContext = metadataCollector.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = metadataCollector.getBootstrapContext().getModelsContext(); final Class embeddableClass = embeddableProperty.getType().getReturnedClass(); final ClassDetails embeddableClassDetails = modelsContext.getClassDetailsRegistry().getClassDetails( embeddableClass.getName() ); @@ -236,7 +236,7 @@ private static List resolveEmbeddableCallbacks( private static void applyListeners( ClassDetails currentClazz, List listOfListeners, - SourceModelBuildingContext sourceModelContext) { + ModelsContext sourceModelContext) { final ClassDetailsRegistry classDetailsRegistry = sourceModelContext.getClassDetailsRegistry(); final EntityListeners entityListeners = currentClazz.getDirectAnnotationUsage( EntityListeners.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java index 823610e9b942..03435a67b1db 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java @@ -18,12 +18,12 @@ import org.hibernate.boot.models.xml.spi.XmlProcessor; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.boot.spi.BootstrapContext; -import org.hibernate.models.internal.BasicModelBuildingContextImpl; +import org.hibernate.models.internal.BasicModelsContextImpl; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.FieldDetails; import org.hibernate.models.spi.MemberDetails; import org.hibernate.models.spi.MethodDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.testing.boot.BootstrapContextImpl; import org.hibernate.testing.junit4.BaseUnitTestCase; @@ -77,7 +77,7 @@ protected MemberDetails getAttributeMember(Class entityClass, String fieldNam throw new IllegalStateException( "Unable to locate persistent attribute : " + fieldName ); } - private SourceModelBuildingContext sourceModelContext; + private ModelsContext sourceModelContext; protected ClassDetails getClassDetails(Class entityClass, String xmlResourceName) { final ManagedResources managedResources = new AdditionalManagedResourcesImpl.Builder().addLoadedClasses( entityClass ) @@ -89,7 +89,7 @@ protected ClassDetails getClassDetails(Class entityClass, String xmlResourceN persistenceUnitMetadata ); - final SourceModelBuildingContext modelBuildingContext = new BasicModelBuildingContextImpl( + final ModelsContext modelBuildingContext = new BasicModelsContextImpl( SIMPLE_CLASS_LOADING, (contributions, inFlightContext) -> { OrmAnnotationHelper.forEachOrmAnnotation( contributions::registerAnnotation ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/BootstrapContextTesting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/BootstrapContextTesting.java index bbc595316688..73552994cb38 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/BootstrapContextTesting.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/BootstrapContextTesting.java @@ -26,7 +26,7 @@ import org.hibernate.jpa.spi.MutableJpaCompliance; import org.hibernate.metamodel.internal.ManagedTypeRepresentationResolverStandard; import org.hibernate.metamodel.spi.ManagedTypeRepresentationResolver; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.query.sqm.function.SqmFunctionDescriptor; import org.hibernate.query.sqm.function.SqmFunctionRegistry; import org.hibernate.resource.beans.spi.BeanInstanceProducer; @@ -80,7 +80,7 @@ public class BootstrapContextTesting implements BootstrapContext { private HashMap, ConverterDescriptor> attributeConverterDescriptorMap; private ArrayList cacheRegionDefinitions; private final ManagedTypeRepresentationResolver representationStrategySelector; - private SourceModelBuildingContext modelsContext; + private ModelsContext modelsContext; public BootstrapContextTesting( IndexView jandexIndex, @@ -137,7 +137,7 @@ public TypeConfiguration getTypeConfiguration() { } @Override - public SourceModelBuildingContext getModelsContext() { + public ModelsContext getModelsContext() { return modelsContext; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/SourceModelTestHelper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/SourceModelTestHelper.java index efe50697733c..f79397c0afea 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/SourceModelTestHelper.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/SourceModelTestHelper.java @@ -4,14 +4,6 @@ */ package org.hibernate.orm.test.boot.models; -import java.io.IOException; -import java.io.InputStream; -import java.lang.annotation.Annotation; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; -import java.util.function.Consumer; - import org.hibernate.boot.MetadataSources; import org.hibernate.boot.internal.BootstrapContextImpl; import org.hibernate.boot.internal.MetadataBuilderImpl; @@ -43,19 +35,25 @@ import org.hibernate.boot.spi.MetadataBuildingOptions; import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.engine.config.spi.ConfigurationService; -import org.hibernate.models.internal.BasicModelBuildingContextImpl; -import org.hibernate.models.internal.jdk.JdkBuilders; +import org.hibernate.models.internal.BasicModelsContextImpl; import org.hibernate.models.jandex.internal.JandexIndexerHelper; -import org.hibernate.models.jandex.internal.JandexModelBuildingContextImpl; +import org.hibernate.models.jandex.internal.JandexModelsContextImpl; import org.hibernate.models.spi.ClassDetailsRegistry; import org.hibernate.models.spi.ClassLoading; -import org.hibernate.models.spi.SourceModelBuildingContext; - +import org.hibernate.models.spi.ModelsContext; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.Index; import org.jboss.jandex.IndexView; import org.jboss.jandex.Indexer; +import java.io.IOException; +import java.io.InputStream; +import java.lang.annotation.Annotation; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; + import static org.hibernate.boot.jaxb.hbm.transform.TransformationHelper.determineEntityName; import static org.hibernate.boot.models.internal.OrmAnnotationHelper.forEachOrmAnnotation; import static org.hibernate.cfg.MappingSettings.TRANSFORM_HBM_XML; @@ -70,33 +68,33 @@ */ public class SourceModelTestHelper { - public static SourceModelBuildingContext createBuildingContext(Class... modelClasses) { + public static ModelsContext createBuildingContext(Class... modelClasses) { return createBuildingContext( SIMPLE_CLASS_LOADING, modelClasses ); } - public static SourceModelBuildingContext createBuildingContext(ClassLoading classLoadingAccess, Class... modelClasses) { + public static ModelsContext createBuildingContext(ClassLoading classLoadingAccess, Class... modelClasses) { final Index jandexIndex = buildJandexIndex( classLoadingAccess, modelClasses ); return createBuildingContext( jandexIndex, modelClasses ); } - public static SourceModelBuildingContext createBuildingContext(Index jandexIndex, Class... modelClasses) { + public static ModelsContext createBuildingContext(Index jandexIndex, Class... modelClasses) { return createBuildingContext( jandexIndex, SIMPLE_CLASS_LOADING, modelClasses ); } - public static SourceModelBuildingContext createBuildingContext( + public static ModelsContext createBuildingContext( Index jandexIndex, ClassLoading classLoadingAccess, Class... modelClasses) { - final SourceModelBuildingContext ctx; + final ModelsContext ctx; if ( jandexIndex == null ) { - ctx = new BasicModelBuildingContextImpl( + ctx = new BasicModelsContextImpl( classLoadingAccess, (contributions, buildingContext1) -> forEachOrmAnnotation( contributions::registerAnnotation ) ); } else { - ctx = new JandexModelBuildingContextImpl( + ctx = new JandexModelsContextImpl( jandexIndex, classLoadingAccess, (contributions, buildingContext1) -> forEachOrmAnnotation( contributions::registerAnnotation ) @@ -107,13 +105,7 @@ public static SourceModelBuildingContext createBuildingContext( if ( knownClass.isAnnotation() ) { final Class annotationClass = classLoadingAccess.classForName( knownClass.name().toString() ); - ctx.getAnnotationDescriptorRegistry().resolveDescriptor( - annotationClass, - annotationType -> JdkBuilders.buildAnnotationDescriptor( - annotationType, - ctx - ) - ); + ctx.getAnnotationDescriptorRegistry().getDescriptor( annotationClass ); } } } @@ -146,7 +138,7 @@ public static Index buildJandexIndex(ClassLoading classLoadingAccess, Class.. return indexer.complete(); } - public static SourceModelBuildingContext createBuildingContext( + public static ModelsContext createBuildingContext( ManagedResources managedResources, StandardServiceRegistry serviceRegistry) { final MetadataBuilderImpl.MetadataBuildingOptionsImpl metadataBuildingOptions = @@ -162,7 +154,7 @@ public static SourceModelBuildingContext createBuildingContext( ); } - public static SourceModelBuildingContext createBuildingContext( + public static ModelsContext createBuildingContext( ManagedResources managedResources, Index jandexIndex, StandardServiceRegistry serviceRegistry) { @@ -179,7 +171,7 @@ public static SourceModelBuildingContext createBuildingContext( ); } - public static SourceModelBuildingContext createBuildingContext( + public static ModelsContext createBuildingContext( ManagedResources managedResources, boolean buildJandexIndex, MetadataBuildingOptions metadataBuildingOptions, @@ -270,29 +262,29 @@ public static SourceModelBuildingContext createBuildingContext( ? buildJandexIndex( classLoading, allKnownClassNames ) : null; - final SourceModelBuildingContext sourceModelBuildingContext = - createSourceModelBuildingContext( jandexIndex, classLoading ); + final ModelsContext ModelsContext = + createModelsContext( jandexIndex, classLoading ); final RootMappingDefaults rootMappingDefaults = new RootMappingDefaults( metadataBuildingOptions.getMappingDefaults(), persistenceUnitMetadata ); final GlobalRegistrationsImpl globalRegistrations = - new GlobalRegistrationsImpl( sourceModelBuildingContext, bootstrapContext ); + new GlobalRegistrationsImpl( ModelsContext, bootstrapContext ); final DomainModelCategorizationCollector modelCategorizationCollector = new DomainModelCategorizationCollector( true, globalRegistrations, - sourceModelBuildingContext + ModelsContext ); final XmlProcessingResult xmlProcessingResult = XmlProcessor.processXml( xmlPreProcessingResult, modelCategorizationCollector, - sourceModelBuildingContext, + ModelsContext, bootstrapContext, rootMappingDefaults ); - final ClassDetailsRegistry classDetailsRegistry = sourceModelBuildingContext.getClassDetailsRegistry(); + final ClassDetailsRegistry classDetailsRegistry = ModelsContext.getClassDetailsRegistry(); allKnownClassNames.forEach( (className) -> modelCategorizationCollector.apply( classDetailsRegistry.resolveClassDetails( className ) ) ); xmlPreProcessingResult.getMappedNames().forEach( (className) -> @@ -308,14 +300,14 @@ public static SourceModelBuildingContext createBuildingContext( xmlProcessingResult.apply( xmlPreProcessingResult.getPersistenceUnitMetadata() ); - return sourceModelBuildingContext; + return ModelsContext; } - private static SourceModelBuildingContext createSourceModelBuildingContext( + private static ModelsContext createModelsContext( IndexView jandexIndex, ClassLoaderServiceLoading classLoading) { return jandexIndex == null - ? new BasicModelBuildingContextImpl( classLoading, ModelsHelper::preFillRegistries ) - : new JandexModelBuildingContextImpl( jandexIndex, classLoading, ModelsHelper::preFillRegistries ); + ? new BasicModelsContextImpl( classLoading, ModelsHelper::preFillRegistries ) + : new JandexModelsContextImpl( jandexIndex, classLoading, ModelsHelper::preFillRegistries ); } private static void collectHbmClasses(JaxbHbmHibernateMapping hbmRoot, Consumer classNameConsumer) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/SourceModelTestHelperSmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/SourceModelTestHelperSmokeTests.java index 771587a91011..900154099a7c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/SourceModelTestHelperSmokeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/SourceModelTestHelperSmokeTests.java @@ -9,7 +9,7 @@ import org.hibernate.models.spi.AnnotationDescriptor; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.FieldDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.junit.jupiter.api.Test; @@ -29,7 +29,7 @@ public class SourceModelTestHelperSmokeTests { @Test void testIt() { - final SourceModelBuildingContext buildingContext = SourceModelTestHelper.createBuildingContext( AnEntity.class ); + final ModelsContext buildingContext = SourceModelTestHelper.createBuildingContext( AnEntity.class ); final AnnotationDescriptor entityAnnDescriptor = buildingContext .getAnnotationDescriptorRegistry() diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/annotation/SimpleAnnotationUsageTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/annotation/SimpleAnnotationUsageTests.java index ad9cccb64201..620b3a717262 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/annotation/SimpleAnnotationUsageTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/annotation/SimpleAnnotationUsageTests.java @@ -10,7 +10,7 @@ import org.hibernate.models.spi.AnnotationDescriptorRegistry; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.orm.test.boot.models.SourceModelTestHelper; import org.junit.jupiter.api.Test; @@ -27,7 +27,7 @@ public class SimpleAnnotationUsageTests { @Test void testSimpleUsage() { - final SourceModelBuildingContext context = SourceModelTestHelper.createBuildingContext( SimpleEntity.class ); + final ModelsContext context = SourceModelTestHelper.createBuildingContext( SimpleEntity.class ); final AnnotationDescriptorRegistry descriptorRegistry = context.getAnnotationDescriptorRegistry(); final AnnotationDescriptor entityDescriptor = descriptorRegistry.getDescriptor( Entity.class ); assertThat( entityDescriptor ).isInstanceOf( OrmAnnotationDescriptor.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/XmlProcessingSmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/XmlProcessingSmokeTests.java index f20d4e8ce43e..9751db63c781 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/XmlProcessingSmokeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/XmlProcessingSmokeTests.java @@ -19,7 +19,7 @@ import org.hibernate.boot.models.xml.spi.PersistenceUnitMetadata; import org.hibernate.models.internal.StringTypeDescriptor; import org.hibernate.models.spi.ClassDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.orm.test.boot.models.SourceModelTestHelper; import org.hibernate.orm.test.boot.models.XmlHelper; import org.hibernate.type.descriptor.jdbc.ClobJdbcType; @@ -123,7 +123,7 @@ void testSimpleXmlDocumentBuilding() { @Test @ServiceRegistry void testSimpleGlobalXmlProcessing(ServiceRegistryScope scope) { - final SourceModelBuildingContext buildingContext = SourceModelTestHelper.createBuildingContext( StringTypeDescriptor.class ); + final ModelsContext buildingContext = SourceModelTestHelper.createBuildingContext( StringTypeDescriptor.class ); final XmlPreProcessingResultImpl collectedXmlResources = new XmlPreProcessingResultImpl(); final JaxbEntityMappingsImpl xmlMapping = XmlHelper.loadMapping( "mappings/models/globals.xml", SIMPLE_CLASS_LOADING ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/AnyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/AnyTests.java index 8f579ff82558..4195e60d802f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/AnyTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/AnyTests.java @@ -17,7 +17,7 @@ import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; import org.hibernate.models.spi.FieldDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.ServiceRegistryScope; @@ -47,9 +47,9 @@ void testSimpleAnyAttribute(ServiceRegistryScope scope) { .addXmlMappings( "mappings/models/attr/any/simple.xml" ) .build(); - final SourceModelBuildingContext sourceModelBuildingContext = createBuildingContext( managedResources, serviceRegistry ); + final ModelsContext ModelsContext = createBuildingContext( managedResources, serviceRegistry ); - final ClassDetailsRegistry classDetailsRegistry = sourceModelBuildingContext.getClassDetailsRegistry(); + final ClassDetailsRegistry classDetailsRegistry = ModelsContext.getClassDetailsRegistry(); // Entity3 is mapped by XML final ClassDetails entity3ClassDetails = classDetailsRegistry.resolveClassDetails( Entity3.class.getName() ); @@ -62,7 +62,7 @@ void testSimpleAnyAttribute(ServiceRegistryScope scope) { assertThat( discrimAnn ).isNotNull(); assertThat( discrimAnn.value() ).isEqualTo( DiscriminatorType.INTEGER ); - final AnyDiscriminatorValue[] discriminatorMappings = associationField.getRepeatedAnnotationUsages( AnyDiscriminatorValue.class, sourceModelBuildingContext ); + final AnyDiscriminatorValue[] discriminatorMappings = associationField.getRepeatedAnnotationUsages( AnyDiscriminatorValue.class, ModelsContext ); assertThat( discriminatorMappings ).hasSize( 2 ); final List mappedEntityNames = Arrays.stream( discriminatorMappings ) @@ -74,7 +74,7 @@ void testSimpleAnyAttribute(ServiceRegistryScope scope) { assertThat( keyTypeAnn ).isNotNull(); assertThat( keyTypeAnn.value() ).isEqualTo( "integer" ); - final JoinColumn keyColumn = associationField.getAnnotationUsage( JoinColumn.class, sourceModelBuildingContext ); + final JoinColumn keyColumn = associationField.getAnnotationUsage( JoinColumn.class, ModelsContext ); assertThat( keyColumn ).isNotNull(); assertThat( keyColumn.name() ).isEqualTo( "association_fk" ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/ManyToOneTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/ManyToOneTests.java index ffb402657f68..d12d4d786aaa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/ManyToOneTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/ManyToOneTests.java @@ -22,7 +22,7 @@ import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; import org.hibernate.models.spi.FieldDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.ServiceRegistryScope; @@ -50,8 +50,8 @@ void testSimpleManyToOne(ServiceRegistryScope scope) { .addXmlMappings( "mappings/models/attr/many-to-one/simple.xml" ) .build(); - final SourceModelBuildingContext sourceModelBuildingContext = createBuildingContext( managedResources, serviceRegistry ); - final ClassDetailsRegistry classDetailsRegistry = sourceModelBuildingContext.getClassDetailsRegistry(); + final ModelsContext ModelsContext = createBuildingContext( managedResources, serviceRegistry ); + final ClassDetailsRegistry classDetailsRegistry = ModelsContext.getClassDetailsRegistry(); final ClassDetails classDetails = classDetailsRegistry.getClassDetails( SimpleEntity.class.getName() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/ColumnTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/ColumnTests.java index 9bfa773ce14f..64307d33ea37 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/ColumnTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/ColumnTests.java @@ -11,7 +11,7 @@ import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.FieldDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.ServiceRegistryScope; @@ -41,14 +41,14 @@ void testCompleteColumn(ServiceRegistryScope scope) { metadataBuildingOptions ); metadataBuildingOptions.setBootstrapContext( bootstrapContext ); - final SourceModelBuildingContext sourceModelBuildingContext = createBuildingContext( + final ModelsContext ModelsContext = createBuildingContext( managedResources, false, metadataBuildingOptions, bootstrapContext ); - final ClassDetails anEntityDetails = sourceModelBuildingContext.getClassDetailsRegistry().getClassDetails( AnEntity.class.getName() ); + final ClassDetails anEntityDetails = ModelsContext.getClassDetailsRegistry().getClassDetails( AnEntity.class.getName() ); final FieldDetails nameField = anEntityDetails.findFieldByName( "name" ); assertThat( nameField ).isNotNull(); @@ -75,14 +75,14 @@ void testOverrideColumn(ServiceRegistryScope scope) { metadataBuildingOptions ); metadataBuildingOptions.setBootstrapContext( bootstrapContext ); - final SourceModelBuildingContext sourceModelBuildingContext = createBuildingContext( + final ModelsContext ModelsContext = createBuildingContext( managedResources, false, metadataBuildingOptions, bootstrapContext ); - final ClassDetails anEntityDetails = sourceModelBuildingContext.getClassDetailsRegistry().getClassDetails( AnEntity.class.getName() ); + final ClassDetails anEntityDetails = ModelsContext.getClassDetailsRegistry().getClassDetails( AnEntity.class.getName() ); final FieldDetails nameField = anEntityDetails.findFieldByName( "name" ); assertThat( nameField ).isNotNull(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/transform/ModelTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/transform/ModelTests.java index 71e858025224..7a8186461c2f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/transform/ModelTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/transform/ModelTests.java @@ -14,7 +14,7 @@ import org.hibernate.mapping.Property; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.FieldDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.DomainModelScope; @@ -38,11 +38,11 @@ void testMappingXml(ServiceRegistryScope scope) { .addXmlMappings( "mappings/models/column/transform/mapping.xml" ) .build(); final StandardServiceRegistry serviceRegistry = scope.getRegistry(); - final SourceModelBuildingContext sourceModelBuildingContext = createBuildingContext( managedResources, serviceRegistry ); + final ModelsContext ModelsContext = createBuildingContext( managedResources, serviceRegistry ); - final ClassDetails classDetails = sourceModelBuildingContext.getClassDetailsRegistry().getClassDetails( Item.class.getName() ); + final ClassDetails classDetails = ModelsContext.getClassDetailsRegistry().getClassDetails( Item.class.getName() ); final FieldDetails costField = classDetails.findFieldByName( "cost" ); - final ColumnTransformer transformerAnn = costField.getAnnotationUsage( ColumnTransformer.class, sourceModelBuildingContext ); + final ColumnTransformer transformerAnn = costField.getAnnotationUsage( ColumnTransformer.class, ModelsContext ); assertThat( transformerAnn ).isNotNull(); assertThat( transformerAnn.read() ).isEqualTo( "cost / 100.00" ); assertThat( transformerAnn.write() ).isEqualTo( "? * 100.00" ); @@ -60,11 +60,11 @@ void testHbmXml(ServiceRegistryScope scope) { .addXmlMappings( hbmXmlResourceName ) .build(); final StandardServiceRegistry serviceRegistry = scope.getRegistry(); - final SourceModelBuildingContext sourceModelBuildingContext = createBuildingContext( managedResources, serviceRegistry ); + final ModelsContext ModelsContext = createBuildingContext( managedResources, serviceRegistry ); - final ClassDetails classDetails = sourceModelBuildingContext.getClassDetailsRegistry().getClassDetails( Item.class.getName() ); + final ClassDetails classDetails = ModelsContext.getClassDetailsRegistry().getClassDetails( Item.class.getName() ); final FieldDetails costField = classDetails.findFieldByName( "cost" ); - final ColumnTransformer transformerAnn = costField.getAnnotationUsage( ColumnTransformer.class, sourceModelBuildingContext ); + final ColumnTransformer transformerAnn = costField.getAnnotationUsage( ColumnTransformer.class, ModelsContext ); assertThat( transformerAnn ).isNotNull(); assertThat( transformerAnn.read() ).isEqualTo( "cost / 100.00" ); assertThat( transformerAnn.write() ).isEqualTo( "? * 100.00" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompletePartialTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompletePartialTests.java index 9bf8763cde8c..754158ccee8b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompletePartialTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompletePartialTests.java @@ -10,7 +10,7 @@ import org.hibernate.mapping.Property; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.DomainModelScope; @@ -38,11 +38,11 @@ void testSourceModel(ServiceRegistryScope registryScope) { .addXmlMappings( "mappings/models/complete/partial-complete.xml" ) .build(); - final SourceModelBuildingContext sourceModelBuildingContext = createBuildingContext( + final ModelsContext ModelsContext = createBuildingContext( managedResources, registryScope.getRegistry() ); - final ClassDetailsRegistry classDetailsRegistry = sourceModelBuildingContext.getClassDetailsRegistry(); + final ClassDetailsRegistry classDetailsRegistry = ModelsContext.getClassDetailsRegistry(); final ClassDetails classDetails = classDetailsRegistry.getClassDetails( Thing.class.getName() ); // NOTE : `#createBuildingContext` applies `XmlProcessor` diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompleteXmlInheritanceTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompleteXmlInheritanceTests.java index 86782a2324a7..2e089d34fca3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompleteXmlInheritanceTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompleteXmlInheritanceTests.java @@ -9,7 +9,7 @@ import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; import org.hibernate.models.spi.FieldDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.ServiceRegistryScope; @@ -38,13 +38,13 @@ void testModel(ServiceRegistryScope registryScope) { managedResourcesBuilder.addXmlMappings( "mappings/models/complete/simple-inherited.xml" ); final ManagedResources managedResources = managedResourcesBuilder.build(); - final SourceModelBuildingContext sourceModelBuildingContext = createBuildingContext( + final ModelsContext ModelsContext = createBuildingContext( managedResources, buildJandexIndex( SIMPLE_CLASS_LOADING, Root.class, Sub.class ), registryScope.getRegistry() ); - final ClassDetailsRegistry classDetailsRegistry = sourceModelBuildingContext.getClassDetailsRegistry(); + final ClassDetailsRegistry classDetailsRegistry = ModelsContext.getClassDetailsRegistry(); final ClassDetails root = classDetailsRegistry.getClassDetails( Root.class.getName() ); final Inheritance inheritance = root.getDirectAnnotationUsage( Inheritance.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompleteXmlWithEmbeddableTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompleteXmlWithEmbeddableTests.java index d380a73c5a5b..f9eefcd3fab9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompleteXmlWithEmbeddableTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/CompleteXmlWithEmbeddableTests.java @@ -11,7 +11,7 @@ import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; import org.hibernate.models.spi.FieldDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.ServiceRegistryScope; @@ -36,12 +36,12 @@ void testModel(ServiceRegistryScope registryScope) { managedResourcesBuilder.addXmlMappings( "mappings/models/complete/simple-person.xml" ); final ManagedResources managedResources = managedResourcesBuilder.build(); - final SourceModelBuildingContext sourceModelBuildingContext = createBuildingContext( + final ModelsContext ModelsContext = createBuildingContext( managedResources, registryScope.getRegistry() ); - final ClassDetailsRegistry classDetailsRegistry = sourceModelBuildingContext.getClassDetailsRegistry(); + final ClassDetailsRegistry classDetailsRegistry = ModelsContext.getClassDetailsRegistry(); final ClassDetails personClassDetails = classDetailsRegistry.getClassDetails( SimplePerson.class.getName() ); final FieldDetails idAttribute = personClassDetails.findFieldByName( "id" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/DiscriminatorValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/DiscriminatorValueTest.java index 4f37c6b77005..c38fc043d383 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/DiscriminatorValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/DiscriminatorValueTest.java @@ -9,7 +9,7 @@ import org.hibernate.boot.model.source.internal.annotations.AdditionalManagedResourcesImpl; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.orm.test.boot.models.xml.SimpleEntity; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -31,11 +31,11 @@ void testDiscriminatorValue(ServiceRegistryScope registryScope) { .addXmlMappings( "mappings/models/complete/discriminator-value.xml" ) .build(); - final SourceModelBuildingContext sourceModelBuildingContext = createBuildingContext( + final ModelsContext ModelsContext = createBuildingContext( managedResources, registryScope.getRegistry() ); - final ClassDetailsRegistry classDetailsRegistry = sourceModelBuildingContext.getClassDetailsRegistry(); + final ClassDetailsRegistry classDetailsRegistry = ModelsContext.getClassDetailsRegistry(); { final ClassDetails rootClassDetails = classDetailsRegistry.getClassDetails( Root.class.getName() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/SimpleCompleteXmlTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/SimpleCompleteXmlTests.java index 5a526d4c7bfe..9f8a1adbd38f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/SimpleCompleteXmlTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/complete/SimpleCompleteXmlTests.java @@ -14,7 +14,7 @@ import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; import org.hibernate.models.spi.FieldDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.orm.test.boot.models.xml.SimpleEntity; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -40,8 +40,8 @@ void testSimpleCompleteEntity(ServiceRegistryScope registryScope) { managedResourcesBuilder.addXmlMappings( "mappings/models/complete/simple-complete.xml" ); final ManagedResources managedResources = managedResourcesBuilder.build(); - final SourceModelBuildingContext sourceModelBuildingContext = createBuildingContext( managedResources, registryScope.getRegistry() ); - final ClassDetailsRegistry classDetailsRegistry = sourceModelBuildingContext.getClassDetailsRegistry(); + final ModelsContext ModelsContext = createBuildingContext( managedResources, registryScope.getRegistry() ); + final ClassDetailsRegistry classDetailsRegistry = ModelsContext.getClassDetailsRegistry(); final ClassDetails classDetails = classDetailsRegistry.getClassDetails( SimpleEntity.class.getName() ); @@ -64,7 +64,7 @@ void testSimpleCompleteEntity(ServiceRegistryScope registryScope) { validateSqlInsert( classDetails.getDirectAnnotationUsage( SQLInsert.class )); - validateFilterUsage( classDetails.getAnnotationUsage( Filter.class, sourceModelBuildingContext ) ); + validateFilterUsage( classDetails.getAnnotationUsage( Filter.class, ModelsContext ) ); } private void validateFilterUsage(Filter filter) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/DynamicModelTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/DynamicModelTests.java index 3965edebe94a..2d5ae91750cb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/DynamicModelTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/DynamicModelTests.java @@ -21,7 +21,7 @@ import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; import org.hibernate.models.spi.FieldDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.ServiceRegistryScope; @@ -51,9 +51,9 @@ void testSimpleDynamicModel(ServiceRegistryScope registryScope) { final ManagedResources managedResources = new AdditionalManagedResourcesImpl.Builder() .addXmlMappings( "mappings/models/dynamic/dynamic-simple.xml" ) .build(); - final SourceModelBuildingContext sourceModelBuildingContext = createBuildingContext( managedResources, registryScope.getRegistry() ); + final ModelsContext ModelsContext = createBuildingContext( managedResources, registryScope.getRegistry() ); - final ClassDetailsRegistry classDetailsRegistry = sourceModelBuildingContext.getClassDetailsRegistry(); + final ClassDetailsRegistry classDetailsRegistry = ModelsContext.getClassDetailsRegistry(); final ClassDetails classDetails = classDetailsRegistry.getClassDetails( "SimpleEntity" ); assertThat( classDetails.getClassName() ).isNull(); @@ -77,9 +77,9 @@ void testSemiSimpleDynamicModel(ServiceRegistryScope registryScope) { .addXmlMappings( "mappings/models/dynamic/dynamic-semi-simple.xml" ) .build(); - final SourceModelBuildingContext sourceModelBuildingContext = createBuildingContext( managedResources, registryScope.getRegistry() ); + final ModelsContext ModelsContext = createBuildingContext( managedResources, registryScope.getRegistry() ); - final ClassDetailsRegistry classDetailsRegistry = sourceModelBuildingContext.getClassDetailsRegistry(); + final ClassDetailsRegistry classDetailsRegistry = ModelsContext.getClassDetailsRegistry(); final ClassDetails classDetails = classDetailsRegistry.getClassDetails( "Contact" ); assertThat( classDetails.getClassName() ).isNull(); @@ -124,9 +124,9 @@ void testIdClass(ServiceRegistryScope registryScope) { final ManagedResources managedResources = new AdditionalManagedResourcesImpl.Builder() .addXmlMappings( "mappings/models/dynamic/dynamic-id-class.xml" ) .build(); - final SourceModelBuildingContext sourceModelBuildingContext = createBuildingContext( managedResources, registryScope.getRegistry() ); + final ModelsContext ModelsContext = createBuildingContext( managedResources, registryScope.getRegistry() ); - final ClassDetailsRegistry classDetailsRegistry = sourceModelBuildingContext.getClassDetailsRegistry(); + final ClassDetailsRegistry classDetailsRegistry = ModelsContext.getClassDetailsRegistry(); final ClassDetails classDetails = classDetailsRegistry.getClassDetails( Employee.class.getName() ); final IdClass idClass = classDetails.getDirectAnnotationUsage( IdClass.class ); @@ -142,8 +142,8 @@ void testOneToMany(ServiceRegistryScope registryScope) { final ManagedResources managedResources = new AdditionalManagedResourcesImpl.Builder() .addXmlMappings( "mappings/models/dynamic/dynamic-plurals.xml" ) .build(); - final SourceModelBuildingContext sourceModelBuildingContext = createBuildingContext( managedResources, registryScope.getRegistry() ); - final ClassDetailsRegistry classDetailsRegistry = sourceModelBuildingContext.getClassDetailsRegistry(); + final ModelsContext ModelsContext = createBuildingContext( managedResources, registryScope.getRegistry() ); + final ClassDetailsRegistry classDetailsRegistry = ModelsContext.getClassDetailsRegistry(); final ClassDetails classDetails = classDetailsRegistry.getClassDetails( Employee.class.getName() ); assertThat( classDetails.getName() ).isEqualTo( Employee.class.getName() ); @@ -153,7 +153,7 @@ void testOneToMany(ServiceRegistryScope registryScope) { final OneToMany oneToManyAnn = oneToMany.getDirectAnnotationUsage( OneToMany.class ); assertThat( oneToManyAnn.fetch() ).isEqualTo( FetchType.EAGER ); assertThat( oneToMany.getDirectAnnotationUsage( OnDelete.class ).action() ).isEqualTo( OnDeleteAction.CASCADE ); - final JoinColumn joinColumn = oneToMany.getAnnotationUsage( JoinColumn.class, sourceModelBuildingContext ); + final JoinColumn joinColumn = oneToMany.getAnnotationUsage( JoinColumn.class, ModelsContext ); assertThat( joinColumn.name() ).isEqualTo( "employee_id" ); assertThat( joinColumn.referencedColumnName() ).isEqualTo( "emp_num" ); assertThat( joinColumn.insertable() ).isEqualTo( Boolean.FALSE ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/NamedEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/NamedEntityGraphTest.java index b78bea83a5a3..b9f62f5ba23d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/NamedEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/NamedEntityGraphTest.java @@ -8,7 +8,7 @@ import org.hibernate.boot.model.source.internal.annotations.AdditionalManagedResourcesImpl; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.ServiceRegistryScope; @@ -29,12 +29,12 @@ void testNamedEntityGraph(ServiceRegistryScope registryScope) { final ManagedResources managedResources = new AdditionalManagedResourcesImpl.Builder() .addXmlMappings( "mappings/models/dynamic/dynamic-named-entity-graph.xml" ) .build(); - final SourceModelBuildingContext sourceModelBuildingContext = createBuildingContext( managedResources, registryScope.getRegistry() ); - final ClassDetailsRegistry classDetailsRegistry = sourceModelBuildingContext.getClassDetailsRegistry(); + final ModelsContext ModelsContext = createBuildingContext( managedResources, registryScope.getRegistry() ); + final ClassDetailsRegistry classDetailsRegistry = ModelsContext.getClassDetailsRegistry(); { final ClassDetails employeeClassDetails = classDetailsRegistry.getClassDetails( "Employee" ); - final NamedEntityGraph namedEntityGraph = employeeClassDetails.getAnnotationUsage( NamedEntityGraph.class, sourceModelBuildingContext ); + final NamedEntityGraph namedEntityGraph = employeeClassDetails.getAnnotationUsage( NamedEntityGraph.class, ModelsContext ); assertThat( namedEntityGraph ).isNotNull(); assertThat( namedEntityGraph.name() ).isEqualTo( "employee" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/RowIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/RowIdTest.java index e72c565f6adf..a41e61b79c5e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/RowIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/RowIdTest.java @@ -9,7 +9,7 @@ import org.hibernate.boot.model.source.internal.annotations.AdditionalManagedResourcesImpl; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.ServiceRegistryScope; @@ -26,11 +26,11 @@ void testSimpleDynamicModel(ServiceRegistryScope registryScope) { final ManagedResources managedResources = new AdditionalManagedResourcesImpl.Builder() .addXmlMappings( "mappings/models/dynamic/dynamic-rowid.xml" ) .build(); - final SourceModelBuildingContext sourceModelBuildingContext = createBuildingContext( + final ModelsContext ModelsContext = createBuildingContext( managedResources, registryScope.getRegistry() ); - final ClassDetailsRegistry classDetailsRegistry = sourceModelBuildingContext.getClassDetailsRegistry(); + final ClassDetailsRegistry classDetailsRegistry = ModelsContext.getClassDetailsRegistry(); { final ClassDetails classDetails = classDetailsRegistry.getClassDetails( "EntityWithoutRowId" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/TenantIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/TenantIdTest.java index d3aa729b3760..99775712e142 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/TenantIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/TenantIdTest.java @@ -11,7 +11,7 @@ import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; import org.hibernate.models.spi.FieldDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.ServiceRegistryScope; @@ -33,8 +33,8 @@ void testSimpleDynamicModel(ServiceRegistryScope registryScope) { final ManagedResources managedResources = new AdditionalManagedResourcesImpl.Builder() .addXmlMappings( "mappings/models/dynamic/dynamic-tenantid.xml" ) .build(); - final SourceModelBuildingContext sourceModelBuildingContext = createBuildingContext( managedResources, registryScope.getRegistry() ); - final ClassDetailsRegistry classDetailsRegistry = sourceModelBuildingContext.getClassDetailsRegistry(); + final ModelsContext ModelsContext = createBuildingContext( managedResources, registryScope.getRegistry() ); + final ClassDetailsRegistry classDetailsRegistry = ModelsContext.getClassDetailsRegistry(); final ClassDetails classDetails = classDetailsRegistry.getClassDetails( "EntityWithTenantId" ); final FieldDetails tenantIdField = classDetails.findFieldByName( "tenantId" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/lifecycle/EntityLifecycleTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/lifecycle/EntityLifecycleTests.java index 8959d41958cc..60a909792a39 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/lifecycle/EntityLifecycleTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/lifecycle/EntityLifecycleTests.java @@ -12,7 +12,7 @@ import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; import org.hibernate.models.spi.MethodDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.orm.test.boot.models.xml.SimpleEntity; import org.hibernate.testing.orm.junit.ServiceRegistry; @@ -41,11 +41,11 @@ void testEntityLifecycle(ServiceRegistryScope registryScope) { final ManagedResources managedResources = new AdditionalManagedResourcesImpl.Builder() .addXmlMappings( "mappings/models/lifecycle/entity-lifecycle.xml" ) .build(); - final SourceModelBuildingContext sourceModelBuildingContext = createBuildingContext( + final ModelsContext ModelsContext = createBuildingContext( managedResources, registryScope.getRegistry() ); - final ClassDetailsRegistry classDetailsRegistry = sourceModelBuildingContext.getClassDetailsRegistry(); + final ClassDetailsRegistry classDetailsRegistry = ModelsContext.getClassDetailsRegistry(); final ClassDetails classDetails = classDetailsRegistry.getClassDetails( SimpleEntity.class.getName() ); assertThat( classDetails.getName() ).isEqualTo( SimpleEntity.class.getName() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/intg/AdditionalMappingContributorTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/intg/AdditionalMappingContributorTests.java index 7f41e08a3d7e..0b8b7f339163 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/intg/AdditionalMappingContributorTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/intg/AdditionalMappingContributorTests.java @@ -24,7 +24,7 @@ import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; import org.hibernate.models.spi.MutableMemberDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.testing.orm.junit.BootstrapServiceRegistry; import org.hibernate.testing.orm.junit.BootstrapServiceRegistry.JavaService; @@ -299,7 +299,7 @@ public void contribute( InFlightMetadataCollector metadata, ResourceStreamLocator resourceStreamLocator, MetadataBuildingContext buildingContext) { - final SourceModelBuildingContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); final ClassDetailsRegistry classDetailsRegistry = modelsContext.getClassDetailsRegistry(); contributeEntity4Details( contributions, modelsContext, classDetailsRegistry ); @@ -308,20 +308,20 @@ public void contribute( private static void contributeEntity4Details( AdditionalMappingContributions contributions, - SourceModelBuildingContext sourceModelBuildingContext, + ModelsContext ModelsContext, ClassDetailsRegistry classDetailsRegistry) { final ClassDetails entity4Details = ModelsHelper.resolveClassDetails( Entity4.class.getName(), classDetailsRegistry, () -> - new JdkClassDetails( Entity4.class, sourceModelBuildingContext ) + new JdkClassDetails( Entity4.class, ModelsContext ) ); contributions.contributeManagedClass( entity4Details ); } private static void contributeEntity5Details( AdditionalMappingContributions contributions, - SourceModelBuildingContext modelBuildingContext, + ModelsContext modelBuildingContext, ClassDetailsRegistry classDetailsRegistry) { final ClassDetails entity5Details = ModelsHelper.resolveClassDetails( Entity5.class.getName(), @@ -356,14 +356,14 @@ public void contribute( InFlightMetadataCollector metadata, ResourceStreamLocator resourceStreamLocator, MetadataBuildingContext buildingContext) { - final SourceModelBuildingContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); + final ModelsContext modelsContext = buildingContext.getBootstrapContext().getModelsContext(); final ClassDetailsRegistry classDetailsRegistry = modelsContext.getClassDetailsRegistry(); contributeEntity6Details( contributions, modelsContext, classDetailsRegistry ); } private void contributeEntity6Details( AdditionalMappingContributions contributions, - SourceModelBuildingContext modelBuildingContext, + ModelsContext modelBuildingContext, ClassDetailsRegistry classDetailsRegistry) { final ClassDetails entity6Details = ModelsHelper.resolveClassDetails( "Entity6", diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversMetadataBuildingContextImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversMetadataBuildingContextImpl.java index 7c3d07c54961..ac25e10e24ed 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversMetadataBuildingContextImpl.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversMetadataBuildingContextImpl.java @@ -16,7 +16,7 @@ import org.hibernate.envers.configuration.internal.metadata.AuditEntityConfigurationRegistry; import org.hibernate.envers.configuration.internal.metadata.AuditEntityNameRegister; import org.hibernate.models.spi.ClassDetailsRegistry; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.service.ServiceRegistry; /** @@ -100,8 +100,8 @@ public ServiceRegistry getServiceRegistry() { } @Override - public SourceModelBuildingContext getSourceModelBuildingContext() { - return metadataCollector.getSourceModelBuildingContext(); + public ModelsContext getModelsContext() { + return metadataCollector.getBootstrapContext().getModelsContext(); } @Override diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/spi/EnversMetadataBuildingContext.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/spi/EnversMetadataBuildingContext.java index 5c7de23eab83..77f2b776860a 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/spi/EnversMetadataBuildingContext.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/spi/EnversMetadataBuildingContext.java @@ -10,7 +10,7 @@ import org.hibernate.envers.configuration.internal.metadata.AuditEntityConfigurationRegistry; import org.hibernate.envers.configuration.internal.metadata.AuditEntityNameRegister; import org.hibernate.models.spi.ClassDetailsRegistry; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.service.ServiceRegistry; /** @@ -25,7 +25,7 @@ public interface EnversMetadataBuildingContext extends MetadataBuildingContext { ServiceRegistry getServiceRegistry(); - SourceModelBuildingContext getSourceModelBuildingContext(); + ModelsContext getModelsContext(); ClassDetailsRegistry getClassDetailsRegistry(); diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ModelsHelper.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ModelsHelper.java index 082dfd1be2a6..7049609d4598 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ModelsHelper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ModelsHelper.java @@ -14,7 +14,7 @@ import org.hibernate.models.spi.FieldDetails; import org.hibernate.models.spi.MemberDetails; import org.hibernate.models.spi.MethodDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.models.spi.TypeDetails; /** @@ -69,14 +69,14 @@ public static MemberDetails getMember(ClassDetails classDetails, String name) { * * @param propertiesSource The property source containing the virtual field * @param propertyName The property name of the dynamic field - * @param sourceModelBuildingContext Context object for models + * @param modelsContext Context object for models * * @return The newly created dynamic field details */ public static FieldDetails dynamicFieldDetails( PersistentPropertiesSource propertiesSource, String propertyName, - SourceModelBuildingContext sourceModelBuildingContext) { + ModelsContext modelsContext) { return new DynamicFieldDetails( propertyName, new ClassTypeDetailsImpl( propertiesSource.getClassDetails(), TypeDetails.Kind.CLASS ), @@ -84,7 +84,7 @@ public static FieldDetails dynamicFieldDetails( ModifierUtils.DYNAMIC_ATTRIBUTE_MODIFIERS, false, false, - sourceModelBuildingContext + modelsContext ); } } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java index bd2bddf04d53..971950404acf 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java @@ -36,7 +36,7 @@ import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.FieldDetails; import org.hibernate.models.spi.MemberDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.spi.NavigablePath; import jakarta.persistence.ElementCollection; @@ -356,8 +356,8 @@ private void addPropertiesFromDynamicComponent(PersistentPropertiesSource proper String accessType = entry.getValue(); if ( !auditedPropertiesHolder.contains( property ) ) { final Value propertyValue = persistentPropertiesSource.getProperty( property ).getValue(); - final SourceModelBuildingContext buildingContext = metadataBuildingContext.getSourceModelBuildingContext(); - final FieldDetails fieldDetails = dynamicFieldDetails( propertiesSource, property, buildingContext ); + final ModelsContext modelsContext = metadataBuildingContext.getModelsContext(); + final FieldDetails fieldDetails = dynamicFieldDetails( propertiesSource, property, modelsContext ); if ( propertyValue instanceof Component ) { this.addFromComponentProperty( fieldDetails, diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/boot/BootstrapContextImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/boot/BootstrapContextImpl.java index c1a1bcf36183..2690a2835baa 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/boot/BootstrapContextImpl.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/boot/BootstrapContextImpl.java @@ -4,28 +4,25 @@ */ package org.hibernate.testing.boot; -import java.util.Collection; -import java.util.Map; - import org.hibernate.boot.CacheRegionDefinition; import org.hibernate.boot.archive.scan.spi.ScanEnvironment; import org.hibernate.boot.archive.scan.spi.ScanOptions; import org.hibernate.boot.archive.spi.ArchiveDescriptorFactory; -import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; -import org.hibernate.boot.spi.ClassmateContext; import org.hibernate.boot.internal.MetadataBuilderImpl; import org.hibernate.boot.model.convert.spi.ConverterDescriptor; import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject; import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; +import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.boot.spi.BootstrapContext; import org.hibernate.boot.spi.ClassLoaderAccess; +import org.hibernate.boot.spi.ClassmateContext; import org.hibernate.boot.spi.MetadataBuildingOptions; import org.hibernate.engine.config.spi.ConfigurationService; import org.hibernate.jpa.spi.MutableJpaCompliance; import org.hibernate.metamodel.internal.ManagedTypeRepresentationResolverStandard; import org.hibernate.metamodel.spi.ManagedTypeRepresentationResolver; -import org.hibernate.models.spi.SourceModelBuildingContext; +import org.hibernate.models.spi.ModelsContext; import org.hibernate.query.sqm.function.SqmFunctionDescriptor; import org.hibernate.query.sqm.function.SqmFunctionRegistry; import org.hibernate.resource.beans.spi.BeanInstanceProducer; @@ -33,6 +30,9 @@ import org.hibernate.type.BasicType; import org.hibernate.type.spi.TypeConfiguration; +import java.util.Collection; +import java.util.Map; + /** * @author Andrea Boriero @@ -64,7 +64,7 @@ public TypeConfiguration getTypeConfiguration() { } @Override - public SourceModelBuildingContext getModelsContext() { + public ModelsContext getModelsContext() { return delegate.getModelsContext(); } diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java index c9f663de74d6..93612e18c018 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java @@ -4,15 +4,7 @@ */ package org.hibernate.testing.orm.junit; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.function.Supplier; - +import jakarta.persistence.AttributeConverter; import org.hibernate.DuplicateMappingException; import org.hibernate.MappingException; import org.hibernate.annotations.CollectionTypeRegistration; @@ -48,15 +40,16 @@ import org.hibernate.boot.spi.NaturalIdUniqueKeyBinder; import org.hibernate.boot.spi.PropertyData; import org.hibernate.boot.spi.SecondPass; +import org.hibernate.community.dialect.DerbyDialect; import org.hibernate.community.dialect.FirebirdDialect; import org.hibernate.community.dialect.InformixDialect; -import org.hibernate.dialect.HANADialect; +import org.hibernate.community.dialect.TiDBDialect; import org.hibernate.dialect.CockroachDialect; import org.hibernate.dialect.DB2Dialect; -import org.hibernate.community.dialect.DerbyDialect; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.DialectDelegateWrapper; import org.hibernate.dialect.H2Dialect; +import org.hibernate.dialect.HANADialect; import org.hibernate.dialect.HSQLDialect; import org.hibernate.dialect.MariaDBDialect; import org.hibernate.dialect.MySQLDialect; @@ -68,7 +61,6 @@ import org.hibernate.dialect.SybaseASEDialect; import org.hibernate.dialect.SybaseDialect; import org.hibernate.dialect.SybaseDriverKind; -import org.hibernate.community.dialect.TiDBDialect; import org.hibernate.dialect.TimeZoneSupport; import org.hibernate.engine.spi.FilterDefinition; import org.hibernate.engine.spi.SessionFactoryImplementor; @@ -85,13 +77,13 @@ import org.hibernate.metamodel.mapping.internal.SqlTypedMappingImpl; import org.hibernate.metamodel.spi.EmbeddableInstantiator; import org.hibernate.models.spi.ClassDetails; -import org.hibernate.models.spi.SourceModelBuildingContext; -import org.hibernate.query.named.NamedObjectRepository; import org.hibernate.query.common.FetchClauseType; +import org.hibernate.query.named.NamedObjectRepository; import org.hibernate.query.sqm.function.SqmFunctionDescriptor; import org.hibernate.query.sqm.function.SqmFunctionRegistry; import org.hibernate.service.ServiceRegistry; import org.hibernate.sql.ast.spi.StringBuilderSqlAppender; +import org.hibernate.testing.boot.BootstrapContextImpl; import org.hibernate.type.SqlTypes; import org.hibernate.type.Type; import org.hibernate.type.descriptor.java.JavaType; @@ -103,9 +95,14 @@ import org.hibernate.usertype.CompositeUserType; import org.hibernate.usertype.UserType; -import org.hibernate.testing.boot.BootstrapContextImpl; - -import jakarta.persistence.AttributeConverter; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.Supplier; /** * Container class for different implementation of the {@link DialectFeatureCheck} interface. @@ -1212,11 +1209,6 @@ public String getCurrentContributorName() { return ""; } - @Override - public SourceModelBuildingContext getSourceModelBuildingContext() { - return null; - } - @Override public GlobalRegistrations getGlobalRegistrations() { return null; diff --git a/settings.gradle b/settings.gradle index 1160f35cd3bd..b8c10b4d326d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -27,7 +27,9 @@ dependencyResolutionManagement { if ( rootProject.hasProperty( "mavenMirror" ) ) { url( rootProject.property( "mavenMirror" ) ) } + mavenCentral() + if (System.getProperty('JPA_PREVIEW') != null) { maven { url "https://jakarta.oss.sonatype.org/content/repositories/releases/" @@ -38,8 +40,6 @@ dependencyResolutionManagement { } } - mavenLocal() - //Allow loading additional dependencies from a local path; //useful to load JDBC drivers which can not be distributed in public. if (System.env['ADDITIONAL_REPO'] != null) { @@ -76,7 +76,7 @@ dependencyResolutionManagement { def byteBuddyVersion = version "byteBuddy", "1.15.11" def classmateVersion = version "classmate", "1.7.0" def geolatteVersion = version "geolatte", "1.9.1" - def hibernateModelsVersion = version "hibernateModels", "0.9.3" + def hibernateModelsVersion = version "hibernateModels", "1.0.0.CR1" def jandexVersion = version "jandex", "3.3.0" def jacksonVersion = version "jackson", "2.18.2" def jbossLoggingVersion = version "jbossLogging", "3.6.1.Final"