From ec0f78d8c789d1b5a71b4f5f7c24fb633ade1658 Mon Sep 17 00:00:00 2001 From: Gavin King Date: Sat, 21 Sep 2024 23:20:01 +0200 Subject: [PATCH] HHH-18649 populate TypedQueryReference in static metamodel also rename two enums since "metamodel" is a word --- .../NamedProcedureCallDefinitionImpl.java | 5 + .../SequenceGeneratorJpaAnnotation.java | 4 +- .../internal/TableGeneratorJpaAnnotation.java | 4 +- .../boot/query/NamedQueryDefinition.java | 9 +- .../spi/AbstractNamedQueryDefinition.java | 1 + .../org/hibernate/cfg/MappingSettings.java | 23 ++-- .../internal/SessionFactoryImpl.java | 2 +- ...ava => JpaMetamodelPopulationSetting.java} | 26 ++--- ... JpaStaticMetamodelPopulationSetting.java} | 30 +++-- .../metamodel/internal/MetadataContext.java | 105 +++++++++++++----- .../model/domain/AbstractManagedType.java | 3 + .../domain/internal/JpaMetamodelImpl.java | 10 +- .../domain/internal/MappingMetamodelImpl.java | 4 +- .../validation/MockSessionFactory.java | 8 +- 14 files changed, 152 insertions(+), 82 deletions(-) rename hibernate-core/src/main/java/org/hibernate/metamodel/internal/{JpaMetaModelPopulationSetting.java => JpaMetamodelPopulationSetting.java} (52%) rename hibernate-core/src/main/java/org/hibernate/metamodel/internal/{JpaStaticMetaModelPopulationSetting.java => JpaStaticMetamodelPopulationSetting.java} (58%) diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedProcedureCallDefinitionImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedProcedureCallDefinitionImpl.java index 8d8601a551b..b6a1ab27586 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedProcedureCallDefinitionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedProcedureCallDefinitionImpl.java @@ -203,4 +203,9 @@ public ParameterMemento toMemento(SessionFactoryImplementor sessionFactory) { private static String normalize(String name) { return StringHelper.isNotEmpty( name ) ? name : null; } + + @Override + public Map getHints() { + return hints; + } } 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 84598a2bcf1..1f770b7fbce 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 @@ -32,8 +32,8 @@ public SequenceGeneratorJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating named, defaulted annotation instances. Generally this * is a situation where we have:
    - *
  1. {@linkplain GeneratedValue#strategy()} set to {@linkplain jakarta.persistence.GenerationType#SEQUENCE}
    2. - *
  2. {@linkplain GeneratedValue#generator()} set to a non-empty String, but with no matching {@linkplain SequenceGenerator}
    3. + *
  3. {@linkplain jakarta.persistence.GeneratedValue#strategy()} set to {@linkplain jakarta.persistence.GenerationType#SEQUENCE}
    4. + *
  4. {@linkplain jakarta.persistence.GeneratedValue#generator()} set to a non-empty String, but with no matching {@linkplain SequenceGenerator}
    5. *
*/ public SequenceGeneratorJpaAnnotation(String name, SourceModelBuildingContext modelContext) { 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 74d3721b2e7..826cb82384c 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 @@ -47,8 +47,8 @@ public TableGeneratorJpaAnnotation(SourceModelBuildingContext modelContext) { /** * Used in creating named, defaulted annotation instances. Generally this * is a situation where we have:
    - *
  1. {@linkplain GeneratedValue#strategy()} set to {@linkplain jakarta.persistence.GenerationType#TABLE}
    2. - *
  2. {@linkplain GeneratedValue#generator()} set to a non-empty String, but with no matching {@linkplain TableGenerator}
    3. + *
  3. {@linkplain jakarta.persistence.GeneratedValue#strategy()} set to {@linkplain jakarta.persistence.GenerationType#TABLE}
    4. + *
  4. {@linkplain jakarta.persistence.GeneratedValue#generator()} set to a non-empty String, but with no matching {@linkplain TableGenerator}
    5. *
*/ public TableGeneratorJpaAnnotation(String name, SourceModelBuildingContext modelContext) { diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedQueryDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedQueryDefinition.java index d2eb92de8d5..38f1330e634 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedQueryDefinition.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedQueryDefinition.java @@ -4,11 +4,13 @@ */ package org.hibernate.boot.query; +import jakarta.persistence.TypedQueryReference; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.query.named.NamedQueryMemento; import org.checkerframework.checker.nullness.qual.Nullable; + /** * Common attributes shared across the mapping of named HQL, native * and "callable" queries defined in annotations, orm.xml and hbm.xml @@ -16,7 +18,12 @@ * @author Steve Ebersole * @author Gavin King */ -public interface NamedQueryDefinition { +public interface NamedQueryDefinition extends TypedQueryReference { + @Override + default String getName() { + return getRegistrationName(); + } + /** * The name under which the query is to be registered */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractNamedQueryDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractNamedQueryDefinition.java index 6bcca75f7fa..ef3e9a8b42d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractNamedQueryDefinition.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractNamedQueryDefinition.java @@ -110,6 +110,7 @@ public String getComment() { return comment; } + @Override public Map getHints() { return hints; } diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java index cf66a8e7903..d250834c8b7 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/MappingSettings.java @@ -46,33 +46,38 @@ public interface MappingSettings { /** * Setting that indicates whether to build the JPA types, either:
    *
  • - * enabled - Do the build + * {@code enabled} — do the build *
    • *
  • - * disabled - Do not do the build + * {@code disabled} — do not do the build *
    • *
  • - * ignoreUnsupported - Do the build, but ignore any non-JPA - * features that would otherwise result in a failure. + * {@code ignoreUnsupported} — do the build, but ignore any + * non-JPA features that would otherwise result in a failure. *
    • *
+ * + * @settingDefault {@code ignoreUnsupported} */ String JPA_METAMODEL_POPULATION = "hibernate.jpa.metamodel.population"; /** - * Setting that controls whether we seek out JPA "static metamodel" classes + * Setting that controls whether we seek out JPA static metamodel classes * and populate them, either:
    *
  • - * enabled - Do the population + * {@code enabled} — do populate the static metamodel, *
    • *
  • - * disabled - Do not do the population + * {@code disabled} — do not populate the static metamodel, or *
    • *
  • - * skipUnsupported - Do the population, but ignore any non-JPA - * features that would otherwise result in the population failing. + * {@code skipUnsupported} — do populate the static metamodel, + * but ignore any non-JPA features that would otherwise result in + * the process failing. *
    • *
+ * + * @settingDefault {@code skipUnsupported} */ String STATIC_METAMODEL_POPULATION = "hibernate.jpa.static_metamodel.population"; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java index 1a669eb9ecc..779f0900622 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java @@ -356,7 +356,7 @@ public void sessionFactoryClosed(SessionFactory factory) { private void integrate(MetadataImplementor bootMetamodel, BootstrapContext bootstrapContext, IntegratorObserver integratorObserver) { for ( Integrator integrator : serviceRegistry.requireService( IntegratorService.class ).getIntegrators() ) { - integrator.integrate(bootMetamodel, bootstrapContext, this ); + integrator.integrate( bootMetamodel, bootstrapContext, this ); integratorObserver.integrators.add( integrator ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaMetaModelPopulationSetting.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaMetamodelPopulationSetting.java similarity index 52% rename from hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaMetaModelPopulationSetting.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaMetamodelPopulationSetting.java index 1accb4a7924..e511ff52d66 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaMetaModelPopulationSetting.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaMetamodelPopulationSetting.java @@ -4,6 +4,7 @@ */ package org.hibernate.metamodel.internal; +import java.util.Locale; import java.util.Map; import org.hibernate.cfg.AvailableSettings; @@ -12,28 +13,25 @@ /** * @author Steve Ebersole */ -public enum JpaMetaModelPopulationSetting { +public enum JpaMetamodelPopulationSetting { ENABLED, DISABLED, IGNORE_UNSUPPORTED; - public static JpaMetaModelPopulationSetting parse(String setting) { - if ( "enabled".equalsIgnoreCase( setting ) ) { - return ENABLED; - } - else if ( "disabled".equalsIgnoreCase( setting ) ) { - return DISABLED; - } - else { - return IGNORE_UNSUPPORTED; - } + public static JpaMetamodelPopulationSetting parse(String setting) { + return switch ( setting.toLowerCase(Locale.ROOT) ) { + case "enabled" -> ENABLED; + case "disabled" -> DISABLED; + default -> IGNORE_UNSUPPORTED; + }; } - public static JpaMetaModelPopulationSetting determineJpaMetaModelPopulationSetting(Map configurationValues) { + public static JpaMetamodelPopulationSetting determineJpaMetaModelPopulationSetting(Map configurationValues) { String setting = ConfigurationHelper.getString( AvailableSettings.JPA_METAMODEL_POPULATION, - configurationValues + configurationValues, + "ignoreUnsupported" ); - return JpaMetaModelPopulationSetting.parse( setting ); + return JpaMetamodelPopulationSetting.parse( setting ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaStaticMetaModelPopulationSetting.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaStaticMetamodelPopulationSetting.java similarity index 58% rename from hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaStaticMetaModelPopulationSetting.java rename to hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaStaticMetamodelPopulationSetting.java index 7cf581ee2cf..31cbd86d5fb 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaStaticMetaModelPopulationSetting.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaStaticMetamodelPopulationSetting.java @@ -4,6 +4,7 @@ */ package org.hibernate.metamodel.internal; +import java.util.Locale; import java.util.Map; import org.hibernate.cfg.AvailableSettings; @@ -15,43 +16,40 @@ * * @author Andrea Boriero */ -public enum JpaStaticMetaModelPopulationSetting { +public enum JpaStaticMetamodelPopulationSetting { /** - * ENABLED indicates that Hibernate will look for the JPA static metamodel description + * Indicates that Hibernate will look for the JPA static metamodel description * of the application domain model and populate it. */ ENABLED, /** - * DISABLED indicates that Hibernate will not look for the JPA static metamodel description + * Indicates that Hibernate will not look for the JPA static metamodel description * of the application domain model. */ DISABLED, /** - * SKIP_UNSUPPORTED works as ENABLED but ignores any non-JPA features that would otherwise + * Works as {@link #ENABLED} but ignores any non-JPA features that would otherwise * result in the population failing. */ SKIP_UNSUPPORTED; - public static JpaStaticMetaModelPopulationSetting parse(String setting) { - if ( "enabled".equalsIgnoreCase( setting ) ) { - return ENABLED; - } - else if ( "disabled".equalsIgnoreCase( setting ) ) { - return DISABLED; - } - else { - return SKIP_UNSUPPORTED; - } + public static JpaStaticMetamodelPopulationSetting parse(String setting) { + return switch ( setting.toLowerCase(Locale.ROOT) ) { + case "enabled" -> ENABLED; + case "disabled" -> DISABLED; + default -> SKIP_UNSUPPORTED; + }; } - public static JpaStaticMetaModelPopulationSetting determineJpaStaticMetaModelPopulationSetting(Map configurationValues) { + public static JpaStaticMetamodelPopulationSetting determineJpaStaticMetaModelPopulationSetting(Map configurationValues) { return parse( determineSetting( configurationValues ) ); } private static String determineSetting(Map configurationValues) { return ConfigurationHelper.getString( AvailableSettings.STATIC_METAMODEL_POPULATION, - configurationValues + configurationValues, + "skipUnsupported" ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java index 2bc993acd34..ee718f48f7d 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java @@ -6,7 +6,6 @@ import java.lang.reflect.Field; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -17,6 +16,7 @@ import org.hibernate.AssertionFailure; import org.hibernate.Internal; import org.hibernate.MappingException; +import org.hibernate.boot.query.NamedQueryDefinition; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.boot.registry.classloading.spi.ClassLoadingException; import org.hibernate.boot.spi.MetadataImplementor; @@ -58,6 +58,9 @@ import jakarta.persistence.metamodel.SingularAttribute; import jakarta.persistence.metamodel.Type; +import static java.lang.Character.charCount; +import static java.util.Collections.unmodifiableMap; + /** * Defines a context for storing information during the building of the {@link MappingMetamodelImpl}. @@ -81,8 +84,8 @@ public class MetadataContext { private final Set knownMappedSuperclasses; private final TypeConfiguration typeConfiguration; - private final JpaStaticMetaModelPopulationSetting jpaStaticMetaModelPopulationSetting; - private final JpaMetaModelPopulationSetting jpaMetaModelPopulationSetting; + private final JpaStaticMetamodelPopulationSetting jpaStaticMetaModelPopulationSetting; + private final JpaMetamodelPopulationSetting jpaMetaModelPopulationSetting; private final AttributeFactory attributeFactory = new AttributeFactory( this ); private final Map, EntityDomainType> entityTypes = new HashMap<>(); @@ -110,8 +113,8 @@ public MetadataContext( JpaMetamodelImplementor jpaMetamodel, MappingMetamodel mappingMetamodel, MetadataImplementor bootMetamodel, - JpaStaticMetaModelPopulationSetting jpaStaticMetaModelPopulationSetting, - JpaMetaModelPopulationSetting jpaMetaModelPopulationSetting, + JpaStaticMetamodelPopulationSetting jpaStaticMetaModelPopulationSetting, + JpaMetamodelPopulationSetting jpaMetaModelPopulationSetting, RuntimeModelCreationContext runtimeModelCreationContext) { this.jpaMetamodel = jpaMetamodel; this.classLoaderService = jpaMetamodel.getServiceRegistry().getService( ClassLoaderService.class ); @@ -149,7 +152,7 @@ MappingMetamodel getMetamodel() { * @return The {@linkplain Class java type} to {@link EntityTypeImpl} map. */ public Map, EntityDomainType> getEntityTypeMap() { - return Collections.unmodifiableMap( entityTypes ); + return unmodifiableMap( entityTypes ); } public Set> getEmbeddableTypeSet() { @@ -255,7 +258,7 @@ public IdentifiableDomainType locateIdentifiableType(String entityName) { } public Map> getIdentifiableTypesByName() { - return Collections.unmodifiableMap( identifiableTypesByName ); + return unmodifiableMap( identifiableTypesByName ); } private PersistentAttribute buildAttribute( @@ -292,7 +295,7 @@ public void wrapUp() { } final boolean staticMetamodelScanEnabled = - this.jpaStaticMetaModelPopulationSetting != JpaStaticMetaModelPopulationSetting.DISABLED; + this.jpaStaticMetaModelPopulationSetting != JpaStaticMetamodelPopulationSetting.DISABLED; final Set processedMetamodelClasses = new HashSet<>(); //we need to process types from superclasses to subclasses @@ -459,7 +462,7 @@ private void addAttribute(ManagedDomainType type, PersistentAttribute void populateStaticMetamodel(ManagedDomainType managedType, Set metamodelClass = classLoaderService.classForName( metamodelClassName ); - // we found the class; so populate it... - registerAttributes( metamodelClass, managedType ); - try { - injectField( metamodelClass, "class_", managedType, false ); - } - catch ( NoSuchFieldException e ) { - // ignore - } + final Class metamodelClass = metamodelClass( metamodelClassName ); + if ( metamodelClass != null ) { + populateMetamodelClass( managedType, metamodelClass ); } - catch ( ClassLoadingException ignore ) { - // nothing to do... - } - - // todo : this does not account for @MappedSuperclass, mainly because this is not being tracked in our - // internal metamodel as populated from the annotations properly - ManagedDomainType superType = managedType.getSuperType(); + // todo : this does not account for @MappedSuperclass, mainly + // because this is not being tracked in our internal + // metamodel as populated from the annotations properly + final ManagedDomainType superType = managedType.getSuperType(); if ( superType != null ) { populateStaticMetamodel( superType, processedMetamodelClassName ); } } } + private void populateMetamodelClass(ManagedDomainType managedType, Class metamodelClass) { + registerAttributes( metamodelClass, managedType ); + injectManagedType( managedType, metamodelClass ); + runtimeModelCreationContext.getBootModel() + .visitNamedHqlQueryDefinitions( definition + -> injectTypedQueryReference( definition, metamodelClass) ); + runtimeModelCreationContext.getBootModel() + .visitNamedNativeQueryDefinitions( definition + -> injectTypedQueryReference( definition, metamodelClass) ); + //TODO: named entity graphs + } + + private static void injectManagedType(ManagedDomainType managedType, Class metamodelClass) { + try { + injectField(metamodelClass, "class_", managedType, false ); + } + catch ( NoSuchFieldException e ) { + // ignore + } + } + + private Class metamodelClass(String metamodelClassName) { + try { + return classLoaderService.classForName( metamodelClassName ); + } + catch ( ClassLoadingException ignore ) { + return null; + } + } + + private static void injectTypedQueryReference(NamedQueryDefinition definition, Class metamodelClass) { + try { + injectField( + metamodelClass, + '_' + javaIdentifier( definition.getRegistrationName() ) + '_', + definition, + false + ); + } + catch ( NoSuchFieldException e ) { + // ignore + } + } + + public static String javaIdentifier(String name) { + final StringBuilder result = new StringBuilder(); + int position = 0; + while ( position < name.length() ) { + final int codePoint = name.codePointAt( position ); + if ( Character.isJavaIdentifierPart(codePoint) ) { + result.appendCodePoint( codePoint ); + } + else { + result.append('_'); + } + position += charCount( codePoint ); + } + return result.toString(); + } + private void registerAttributes(Class metamodelClass, ManagedDomainType managedType) { // push the attributes on to the metamodel class... for ( Attribute attribute : managedType.getDeclaredAttributes() ) { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java index 4cfcd1b454d..db23cf66969 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java @@ -5,6 +5,7 @@ package org.hibernate.metamodel.model.domain; import java.io.ObjectStreamException; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; @@ -630,6 +631,7 @@ public MapAttribute getDeclaredMap(String name, Class keyType // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Serialization + @Serial protected Object writeReplace() throws ObjectStreamException { return new SerialForm( metamodel, getJavaType() ); } @@ -643,6 +645,7 @@ public SerialForm(JpaMetamodel jpaMetamodel, Class typeClass) { this.typeClass = typeClass; } + @Serial private Object readResolve() { return jpaMetamodel.managedType( typeClass ); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java index 6af29441880..aefda5ff4ec 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java @@ -37,8 +37,8 @@ import org.hibernate.mapping.MappedSuperclass; import org.hibernate.mapping.PersistentClass; import org.hibernate.metamodel.MappingMetamodel; -import org.hibernate.metamodel.internal.JpaMetaModelPopulationSetting; -import org.hibernate.metamodel.internal.JpaStaticMetaModelPopulationSetting; +import org.hibernate.metamodel.internal.JpaMetamodelPopulationSetting; +import org.hibernate.metamodel.internal.JpaStaticMetamodelPopulationSetting; import org.hibernate.metamodel.internal.MetadataContext; import org.hibernate.metamodel.model.domain.EmbeddableDomainType; import org.hibernate.metamodel.model.domain.EntityDomainType; @@ -92,7 +92,7 @@ private static class ImportInfo { private final Map> managedTypeByName = new TreeMap<>(); private final Map, ManagedDomainType> managedTypeByClass = new HashMap<>(); - private JpaMetaModelPopulationSetting jpaMetaModelPopulationSetting; + private JpaMetamodelPopulationSetting jpaMetaModelPopulationSetting; private final Map> allowedEnumLiteralsToEnumTypeNames = new HashMap<>(); private final Map> enumJavaTypes = new HashMap<>(); @@ -594,8 +594,8 @@ public void processJpa( MetadataImplementor bootMetamodel, MappingMetamodel mappingMetamodel, Map, String> entityProxyInterfaceMap, - JpaStaticMetaModelPopulationSetting jpaStaticMetaModelPopulationSetting, - JpaMetaModelPopulationSetting jpaMetaModelPopulationSetting, + JpaStaticMetamodelPopulationSetting jpaStaticMetaModelPopulationSetting, + JpaMetamodelPopulationSetting jpaMetaModelPopulationSetting, Collection namedEntityGraphDefinitions, RuntimeModelCreationContext runtimeModelCreationContext) { bootMetamodel.getImports() diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java index 55130889058..ce1fcb40c8b 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java @@ -80,8 +80,8 @@ import jakarta.persistence.metamodel.ManagedType; import static org.hibernate.internal.util.collections.ArrayHelper.EMPTY_STRING_ARRAY; -import static org.hibernate.metamodel.internal.JpaMetaModelPopulationSetting.determineJpaMetaModelPopulationSetting; -import static org.hibernate.metamodel.internal.JpaStaticMetaModelPopulationSetting.determineJpaStaticMetaModelPopulationSetting; +import static org.hibernate.metamodel.internal.JpaMetamodelPopulationSetting.determineJpaMetaModelPopulationSetting; +import static org.hibernate.metamodel.internal.JpaStaticMetamodelPopulationSetting.determineJpaStaticMetaModelPopulationSetting; /** * Implementation of the JPA-defined contract {@link jakarta.persistence.metamodel.Metamodel}. diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java index 9dd39a1ecf5..e7394322f4a 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java @@ -51,8 +51,8 @@ import org.hibernate.mapping.Property; import org.hibernate.metamodel.AttributeClassification; import org.hibernate.metamodel.CollectionClassification; -import org.hibernate.metamodel.internal.JpaMetaModelPopulationSetting; -import org.hibernate.metamodel.internal.JpaStaticMetaModelPopulationSetting; +import org.hibernate.metamodel.internal.JpaMetamodelPopulationSetting; +import org.hibernate.metamodel.internal.JpaStaticMetamodelPopulationSetting; import org.hibernate.metamodel.internal.MetadataContext; import org.hibernate.metamodel.internal.RuntimeMetamodelsImpl; import org.hibernate.metamodel.mapping.EntityIdentifierMapping; @@ -217,8 +217,8 @@ public Class classForName(String className) { metamodel.getJpaMetamodel(), metamodel, bootModel, - JpaStaticMetaModelPopulationSetting.DISABLED, - JpaMetaModelPopulationSetting.DISABLED, + JpaStaticMetamodelPopulationSetting.DISABLED, + JpaMetamodelPopulationSetting.DISABLED, this );