HHH-18649 populate TypedQueryReference in static metamodel

also rename two enums since "metamodel" is a word

Author: gavinking

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<String, Object> getHints() {
+		return hints;
+	}
 }

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:<ol>
-	 *     <li>{@linkplain GeneratedValue#strategy()} set to {@linkplain jakarta.persistence.GenerationType#SEQUENCE}</li>
-	 *     <li>{@linkplain GeneratedValue#generator()} set to a non-empty String, but with no matching {@linkplain SequenceGenerator}</li>
+	 *     <li>{@linkplain jakarta.persistence.GeneratedValue#strategy()} set to {@linkplain jakarta.persistence.GenerationType#SEQUENCE}</li>
+	 *     <li>{@linkplain jakarta.persistence.GeneratedValue#generator()} set to a non-empty String, but with no matching {@linkplain SequenceGenerator}</li>
 	 * </ol>
 	 */
 	public SequenceGeneratorJpaAnnotation(String name, SourceModelBuildingContext modelContext) {

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:<ol>
-	 *     <li>{@linkplain GeneratedValue#strategy()} set to {@linkplain jakarta.persistence.GenerationType#TABLE}</li>
-	 *     <li>{@linkplain GeneratedValue#generator()} set to a non-empty String, but with no matching {@linkplain TableGenerator}</li>
+	 *     <li>{@linkplain jakarta.persistence.GeneratedValue#strategy()} set to {@linkplain jakarta.persistence.GenerationType#TABLE}</li>
+	 *     <li>{@linkplain jakarta.persistence.GeneratedValue#generator()} set to a non-empty String, but with no matching {@linkplain TableGenerator}</li>
 	 * </ol>
 	 */
 	public TableGeneratorJpaAnnotation(String name, SourceModelBuildingContext modelContext) {

hibernate-core/src/main/java/org/hibernate/boot/query/NamedQueryDefinition.java

@@ -4,19 +4,26 @@
  */
 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
  *
  * @author Steve Ebersole
  * @author Gavin King
  */
-public interface NamedQueryDefinition<E> {
+public interface NamedQueryDefinition<E> extends TypedQueryReference<E> {
+	@Override
+	default String getName() {
+		return getRegistrationName();
+	}
+
 	/**
 	 * The name under which the query is to be registered
 	 */

hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractNamedQueryDefinition.java

@@ -110,6 +110,7 @@ public String getComment() {
 		return comment;
 	}
 
+	@Override
 	public Map<String, Object> getHints() {
 		return hints;
 	}

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:<ul>
 	 *     <li>
-	 *         <b>enabled</b> - Do the build
+	 *         {@code enabled} &mdash; do the build
 	 *     </li>
 	 *     <li>
-	 *         <b>disabled</b> - Do not do the build
+	 *         {@code disabled} &mdash; do not do the build
 	 *     </li>
 	 *     <li>
-	 *         <b>ignoreUnsupported</b> - Do the build, but ignore any non-JPA
-	 *         features that would otherwise result in a failure.
+	 *         {@code ignoreUnsupported} &mdash; do the build, but ignore any
+	 *         non-JPA features that would otherwise result in a failure.
 	 *     </li>
 	 * </ul>
+	 *
+	 * @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:<ul>
 	 *     <li>
-	 *         <b>enabled</b> - Do the population
+	 *         {@code enabled} &mdash; do populate the static metamodel,
 	 *     </li>
 	 *     <li>
-	 *         <b>disabled</b> - Do not do the population
+	 *         {@code disabled} &mdash; do not populate the static metamodel, or
 	 *     </li>
 	 *     <li>
-	 *         <b>skipUnsupported</b> - Do the population, but ignore any non-JPA
-	 *         features that would otherwise result in the population failing.
+	 *         {@code skipUnsupported} &mdash; do populate the static metamodel,
+	 *         but ignore any non-JPA features that would otherwise result in
+	 *         the process failing.
 	 *     </li>
 	 * </ul>
+	 *
+	 * @settingDefault {@code skipUnsupported}
 	 */
 	String STATIC_METAMODEL_POPULATION = "hibernate.jpa.static_metamodel.population";
 

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 );
 		}
 	}

hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaMetaModelPopulationSetting.java renamed to 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 );
 	}
 }

hibernate-core/src/main/java/org/hibernate/metamodel/internal/JpaStaticMetaModelPopulationSetting.java renamed to 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"
 		);
 	}
 }