HHH-19324 - Switch tests using hbm.xml to use mapping.xml

Author: sebersole

hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbBasicMapping.java

@@ -11,6 +11,12 @@
  * @author Steve Ebersole
  */
 public interface JaxbBasicMapping {
+	/**
+	 * The attribute's name
+	 */
+	String getName();
+	void setName(String name);
+
 	JaxbUserTypeImpl getType();
 
 	void setType(JaxbUserTypeImpl value);

hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEmbeddable.java

@@ -4,8 +4,13 @@
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
+
 /**
  * @author Steve Ebersole
  */
 public interface JaxbEmbeddable extends JaxbManagedType {
+	@Nullable
+	String getName();
+	void setName(@Nullable String name);
 }

hibernate-core/src/main/java/org/hibernate/boot/model/internal/IdGeneratorResolverSecondPass.java

@@ -12,6 +12,7 @@
 import org.hibernate.boot.model.IdentifierGeneratorDefinition;
 import org.hibernate.boot.models.HibernateAnnotations;
 import org.hibernate.boot.models.JpaAnnotations;
+import org.hibernate.boot.models.annotations.internal.GenericGeneratorAnnotation;
 import org.hibernate.boot.models.spi.GenericGeneratorRegistration;
 import org.hibernate.boot.models.spi.GlobalRegistrations;
 import org.hibernate.boot.models.spi.SequenceGeneratorRegistration;
@@ -351,6 +352,21 @@ protected void handleNamedAutoGenerator() {
 	}
 
 	private boolean handleAsLocalAutoGenerator() {
+		if ( "increment".equals( generatedValue.generator() ) ) {
+			final GenericGeneratorAnnotation incrementGenerator = new GenericGeneratorAnnotation( buildingContext.getBootstrapContext().getModelsContext() );
+			incrementGenerator.name( "increment" );
+			incrementGenerator.strategy( "increment" );
+
+			GeneratorAnnotationHelper.handleGenericGenerator(
+					generatedValue.generator(),
+					incrementGenerator,
+					entityMapping,
+					idValue,
+					buildingContext
+			);
+			return true;
+		}
+
 		final String generator = generatedValue.generator();
 		assert !generator.isEmpty();
 

hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java

@@ -432,18 +432,22 @@ public static DomainModelSource processManagedResources(
 		);
 
 		final HashSet<String> categorizedClassNames = new HashSet<>();
-		allKnownClassNames.forEach( (className) -> applyKnownClass(
-				className,
-				categorizedClassNames,
-				classDetailsRegistry,
-				modelCategorizationCollector
-		) );
-		xmlPreProcessingResult.getMappedNames().forEach( (className) -> applyKnownClass(
-				className,
-				categorizedClassNames,
-				classDetailsRegistry,
-				modelCategorizationCollector
-		) );
+		// apply known classes
+		allKnownClassNames.forEach( (className) -> {
+			if ( categorizedClassNames.add( className ) ) {
+				// not known yet
+				final ClassDetails classDetails = classDetailsRegistry.resolveClassDetails( className );
+				applyKnownClass( classDetails, categorizedClassNames, classDetailsRegistry, modelCategorizationCollector );
+			}
+		} );
+		// apply known "names" - generally this handles dynamic models
+		xmlPreProcessingResult.getMappedNames().forEach( (mappedName) -> {
+			if ( categorizedClassNames.add( mappedName ) ) {
+				// not known yet
+				final ClassDetails classDetails = classDetailsRegistry.resolveClassDetails( mappedName );
+				applyKnownClass( classDetails, categorizedClassNames, classDetailsRegistry, modelCategorizationCollector );
+			}
+		} );
 
 		xmlProcessingResult.apply();
 

hibernate-core/src/main/java/org/hibernate/boot/models/xml/UnknownAttributeTypeException.java

@@ -0,0 +1,18 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.boot.models.xml;
+
+import org.hibernate.HibernateException;
+
+/**
+ * Indicates a problem resolving an attribute's type details - typically with dynamic models.
+ *
+ * @author Steve Ebersole
+ */
+public class UnknownAttributeTypeException extends HibernateException {
+	public UnknownAttributeTypeException(String message) {
+		super( message );
+	}
+}