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

HHH-19310 - Simplified declaration of type for basic mappings in XML

Author: sebersole

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

@@ -341,13 +341,13 @@ public Column[] getOverriddenColumn(String propertyName) {
 
 	private String extractUserPropertyName(String redundantString, String propertyName) {
 		String className = component.getOwner().getClassName();
-		boolean specialCase = propertyName.startsWith(className)
-				&& propertyName.length() > className.length() + 2 + redundantString.length() // .id.
-				&& propertyName.substring( className.length() + 1, className.length() + 1 + redundantString.length() )
-						.equals(redundantString);
-		if (specialCase) {
-			//remove id we might be in a @IdClass case
-			return className + propertyName.substring( className.length() + 1 + redundantString.length() );
+		if ( className != null && propertyName.startsWith( className ) ) {
+			boolean specialCase = propertyName.length() > className.length() + 2 + redundantString.length()
+					&& propertyName.substring( className.length() + 1, className.length() + 1 + redundantString.length() ).equals( redundantString );
+			if ( specialCase ) {
+				//remove id we might be in a @IdClass case
+				return className + propertyName.substring( className.length() + 1 + redundantString.length() );
+			}
 		}
 		return null;
 	}

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

@@ -69,6 +69,7 @@
 import org.hibernate.engine.config.spi.ConfigurationService;
 import org.hibernate.engine.config.spi.StandardConverters;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.mapping.Table;
 import org.hibernate.models.internal.MutableClassDetailsRegistry;
 import org.hibernate.models.spi.ClassDetails;
@@ -452,7 +453,7 @@ public static DomainModelSource processManagedResources(
 
 		return new DomainModelSource(
 				classDetailsRegistry,
-				allKnownClassNames,
+				CollectionHelper.mutableJoin( allKnownClassNames, xmlPreProcessingResult.getMappedNames() ),
 				modelCategorizationCollector.getGlobalRegistrations(),
 				rootMappingDefaults,
 				xmlPreProcessingResult.getPersistenceUnitMetadata()

hibernate-core/src/main/java/org/hibernate/boot/models/internal/ModelsHelper.java

@@ -4,10 +4,14 @@
  */
 package org.hibernate.boot.models.internal;
 
+import java.sql.Blob;
+import java.sql.Clob;
+import java.sql.NClob;
 import java.util.function.Supplier;
 
 import org.hibernate.annotations.TenantId;
 import org.hibernate.models.internal.MutableClassDetailsRegistry;
+import org.hibernate.models.internal.jdk.JdkClassDetails;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.ClassDetailsRegistry;
 import org.hibernate.models.spi.RegistryPrimer;
@@ -21,6 +25,18 @@ public class ModelsHelper {
 	public static void preFillRegistries(RegistryPrimer.Contributions contributions, SourceModelBuildingContext buildingContext) {
 		OrmAnnotationHelper.forEachOrmAnnotation( contributions::registerAnnotation );
 
+		registerPrimitive( boolean.class, buildingContext );
+		registerPrimitive( byte.class, buildingContext );
+		registerPrimitive( short.class, buildingContext );
+		registerPrimitive( int.class, buildingContext );
+		registerPrimitive( long.class, buildingContext );
+		registerPrimitive( double.class, buildingContext );
+		registerPrimitive( float.class, buildingContext );
+		registerPrimitive( char.class, buildingContext );
+		registerPrimitive( Blob.class, buildingContext );
+		registerPrimitive( Clob.class, buildingContext );
+		registerPrimitive( NClob.class, buildingContext );
+
 		buildingContext.getAnnotationDescriptorRegistry().getDescriptor( TenantId.class );
 
 //		if ( buildingContext instanceof JandexModelBuildingContext ) {
@@ -57,6 +73,12 @@ public static void preFillRegistries(RegistryPrimer.Contributions contributions,
 //		}
 	}
 
+	private static void registerPrimitive(Class<?> theClass, SourceModelBuildingContext buildingContext) {
+		final MutableClassDetailsRegistry classDetailsRegistry = buildingContext.getClassDetailsRegistry().as( MutableClassDetailsRegistry.class );
+		classDetailsRegistry.addClassDetails( new JdkClassDetails( theClass, buildingContext ) );
+
+	}
+
 	public static ClassDetails resolveClassDetails(
 			String className,
 			ClassDetailsRegistry classDetailsRegistry,