HHH-17460 - Ongoing JPA 32 work

- mapping defaults & persistence unit defaults

hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java

@@ -145,7 +145,7 @@ public class InFlightMetadataCollectorImpl implements InFlightMetadataCollector,
 	private final MetadataBuildingOptions options;
 
 	private final GlobalRegistrations globalRegistrations;
-	private PersistenceUnitMetadata persistenceUnitMetadata;
+	private final PersistenceUnitMetadata persistenceUnitMetadata;
 
 	private final AttributeConverterManager attributeConverterManager = new AttributeConverterManager();
 
@@ -204,6 +204,7 @@ public class InFlightMetadataCollectorImpl implements InFlightMetadataCollector,
 		this.uuid = UUID.randomUUID();
 
 		this.globalRegistrations = new GlobalRegistrationsImpl( sourceModelBuildingContext );
+		this.persistenceUnitMetadata = new PersistenceUnitMetadataImpl();
 
 		for ( Map.Entry<String, SqmFunctionDescriptor> sqlFunctionEntry : bootstrapContext.getSqlFunctions().entrySet() ) {
 			if ( sqlFunctionMap == null ) {
@@ -728,11 +729,6 @@ public class InFlightMetadataCollectorImpl implements InFlightMetadataCollector,
 		}
 	}
 
-	@Override
-	public void addPersistenceUnitMetadata(PersistenceUnitMetadata persistenceUnitMetadata) {
-		this.persistenceUnitMetadata = persistenceUnitMetadata;
-	}
-
 	@Override
 	public void addDefaultIdentifierGenerator(IdentifierGeneratorDefinition generator) {
 		this.addIdentifierGenerator( generator );

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

@@ -424,7 +424,6 @@ public class MetadataBuildingProcess {
 
 		assert metadataCollector.getPersistenceUnitMetadata() == xmlPreProcessingResult.getPersistenceUnitMetadata();
 
-		metadataCollector.addPersistenceUnitMetadata( xmlPreProcessingResult.getPersistenceUnitMetadata() );
 		//noinspection unchecked
 		final List<String> allKnownClassNames = mutableJoin(
 				managedResources.getAnnotatedClassReferences().stream().map( Class::getName ).collect( Collectors.toList() ),

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

@@ -253,8 +253,6 @@ public interface InFlightMetadataCollector extends MetadataImplementor {
 
 	void addIdentifierGenerator(IdentifierGeneratorDefinition generatorDefinition);
 
-	void addPersistenceUnitMetadata(PersistenceUnitMetadata persistenceUnitMetadata);
-
 	/**
 	 * Obtain the {@link ConverterRegistry} which may be
 	 * used to register {@link AttributeConverter}s.