HHH-12444 - Introduce BootstrapContext

HHH-12443 - Introduce TypeConfiguration

hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java

@@ -24,7 +24,6 @@
 
 import org.hibernate.HibernateException;
 import org.hibernate.boot.archive.spi.InputStreamAccess;
-import org.hibernate.boot.internal.ClassmateContext;
 import org.hibernate.boot.internal.MetadataBuilderImpl;
 import org.hibernate.boot.jaxb.Origin;
 import org.hibernate.boot.jaxb.SourceType;
@@ -61,10 +60,10 @@ public class MetadataSources implements Serializable {
 
 	private XmlMappingBinderAccess xmlMappingBinderAccess;
 
-	private List<Binding> xmlBindings = new ArrayList<Binding>();
-	private LinkedHashSet<Class<?>> annotatedClasses = new LinkedHashSet<Class<?>>();
-	private LinkedHashSet<String> annotatedClassNames = new LinkedHashSet<String>();
-	private LinkedHashSet<String> annotatedPackages = new LinkedHashSet<String>();
+	private List<Binding> xmlBindings = new ArrayList<>();
+	private LinkedHashSet<Class<?>> annotatedClasses = new LinkedHashSet<>();
+	private LinkedHashSet<String> annotatedClassNames = new LinkedHashSet<>();
+	private LinkedHashSet<String> annotatedPackages = new LinkedHashSet<>();
 
 	public MetadataSources() {
 		this( new BootstrapServiceRegistryBuilder().build() );
@@ -127,16 +126,6 @@ public MetadataBuilder getMetadataBuilder() {
 		return getCustomBuilderOrDefault( defaultBuilder );
 	}
 
-	/**
-	 * Get a builder for metadata where non-default options can be specified.
-	 *
-	 * @return The built metadata.
-	 */
-	public MetadataBuilder getMetadataBuilder(StandardServiceRegistry serviceRegistry, ClassmateContext classmateContext) {
-		MetadataBuilderImpl defaultBuilder = new MetadataBuilderImpl( this, serviceRegistry, classmateContext );
-		return getCustomBuilderOrDefault( defaultBuilder );
-	}
-
 	/**
 	 * Get a builder for metadata where non-default options can be specified.
 	 *
@@ -145,7 +134,8 @@ public MetadataBuilder getMetadataBuilder(StandardServiceRegistry serviceRegistr
 	 */
 	@Deprecated
 	public MetadataBuilder getMetadataBuilder(StandardServiceRegistry serviceRegistry) {
-		return getMetadataBuilder( serviceRegistry, new ClassmateContext() );
+		MetadataBuilderImpl defaultBuilder = new MetadataBuilderImpl( this, serviceRegistry );
+		return getCustomBuilderOrDefault( defaultBuilder );
 	}
 
 	/**
@@ -163,7 +153,7 @@ private MetadataBuilder getCustomBuilderOrDefault(MetadataBuilderImpl defaultBui
 			final MetadataBuilder returnedBuilder = discoveredBuilderFactory.getMetadataBuilder( this, defaultBuilder );
 			if ( returnedBuilder != null ) {
 				if ( activeFactoryNames == null ) {
-					activeFactoryNames = new ArrayList<String>();
+					activeFactoryNames = new ArrayList<>();
 				}
 				activeFactoryNames.add( discoveredBuilderFactory.getClass().getName() );
 				builder = returnedBuilder;

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

@@ -32,7 +32,6 @@
 import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.boot.spi.ClassLoaderAccess;
 import org.hibernate.boot.spi.MetadataBuildingOptions;
-import org.hibernate.cfg.AttributeConverterDefinition;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.annotations.reflection.JPAMetadataProvider;
 import org.hibernate.dialect.function.SQLFunction;
@@ -73,10 +72,9 @@ public class BootstrapContextImpl implements BootstrapContext {
 
 	public BootstrapContextImpl(
 			StandardServiceRegistry serviceRegistry,
-			ClassmateContext classmateContext,
 			MetadataBuildingOptions metadataBuildingOptions) {
 		this.serviceRegistry = serviceRegistry;
-		this.classmateContext = classmateContext;
+		this.classmateContext = new ClassmateContext();
 		this.metadataBuildingOptions = metadataBuildingOptions;
 
 		final ClassLoaderService classLoaderService = serviceRegistry.getService( ClassLoaderService.class );

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

@@ -377,6 +377,12 @@ private void addTypeDefinition(String registrationKey, TypeDefinition typeDefini
 		}
 	}
 
+	@Override
+	public ClassmateContext getClassmateContext() {
+		return bootstrapContext.getClassmateContext();
+	}
+
+
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// attribute converters
 
@@ -2219,7 +2225,7 @@ public boolean isInSecondPass() {
 	 */
 	public MetadataImpl buildMetadataInstance(MetadataBuildingContext buildingContext) {
 		processSecondPasses( buildingContext );
-		processExportableProducers( buildingContext );
+		processExportableProducers( );
 
 		try {
 			return new MetadataImpl(
@@ -2251,7 +2257,7 @@ public MetadataImpl buildMetadataInstance(MetadataBuildingContext buildingContex
 		}
 	}
 
-	private void processExportableProducers(MetadataBuildingContext buildingContext) {
+	private void processExportableProducers() {
 		// for now we only handle id generators as ExportableProducers
 
 		final Dialect dialect = getDatabase().getJdbcEnvironment().getDialect();

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

@@ -9,13 +9,15 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.Callable;
 import javax.persistence.AttributeConverter;
 import javax.persistence.SharedCacheMode;
 
 import org.hibernate.HibernateException;
 import org.hibernate.MultiTenancyStrategy;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.annotations.common.reflection.ReflectionManager;
 import org.hibernate.boot.AttributeConverterInfo;
 import org.hibernate.boot.CacheRegionDefinition;
 import org.hibernate.boot.MetadataBuilder;
@@ -84,11 +86,7 @@ public class MetadataBuilderImpl implements MetadataBuilderImplementor, TypeCont
 	private final MetadataBuildingOptionsImpl options;
 
 	public MetadataBuilderImpl(MetadataSources sources) {
-		this(
-				sources,
-				getStandardServiceRegistry( sources.getServiceRegistry() ),
-				new ClassmateContext()
-		);
+		this( sources, getStandardServiceRegistry( sources.getServiceRegistry() ) );
 	}
 
 	private static StandardServiceRegistry getStandardServiceRegistry(ServiceRegistry serviceRegistry) {
@@ -116,10 +114,12 @@ else if ( BootstrapServiceRegistry.class.isInstance( serviceRegistry ) ) {
 		}
 	}
 
-	public MetadataBuilderImpl(MetadataSources sources, StandardServiceRegistry serviceRegistry, ClassmateContext classmateContext) {
+	public MetadataBuilderImpl(MetadataSources sources, StandardServiceRegistry serviceRegistry) {
 		this.sources = sources;
 		this.options = new MetadataBuildingOptionsImpl( serviceRegistry );
-		this.bootstrapContext = new BootstrapContextImpl( serviceRegistry, classmateContext, options );
+		this.bootstrapContext = new BootstrapContextImpl( serviceRegistry, options );
+		//this is needed only fro implementig deprecated method
+		options.setBootstrapContext( bootstrapContext );
 
 		for ( MetadataSourcesContributor contributor :
 				sources.getServiceRegistry()
@@ -312,7 +312,6 @@ public MetadataBuilder allowSpecjSyntax() {
 		return this;
 	}
 
-
 	@Override
 	public MetadataBuilder applySqlFunction(String functionName, SQLFunction function) {
 		this.bootstrapContext.addSqlFunction( functionName, function );
@@ -436,11 +435,6 @@ public MetadataBuilder applyIdGenerationTypeInterpreter(IdGeneratorStrategyInter
 		return this;
 	}
 
-//	public MetadataBuilder with(PersistentAttributeMemberResolver resolver) {
-//		options.persistentAttributeMemberResolver = resolver;
-//		return this;
-//	}
-
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T extends MetadataBuilder> T unwrap(Class<T> type) {
@@ -582,6 +576,8 @@ public static class MetadataBuildingOptionsImpl
 			implements MetadataBuildingOptions, JpaOrmXmlPersistenceUnitDefaultAware {
 		private final StandardServiceRegistry serviceRegistry;
 		private final MappingDefaultsImpl mappingDefaults;
+		// todo (6.0) : remove bootstrapContext property along with the deprecated methods
+		private BootstrapContext bootstrapContext;
 
 		private ArrayList<BasicTypeRegistration> basicTypeRegistrations = new ArrayList<>();
 
@@ -602,9 +598,6 @@ public static class MetadataBuildingOptionsImpl
 
 		private String schemaCharset;
 
-//		private PersistentAttributeMemberResolver persistentAttributeMemberResolver =
-//				StandardPersistentAttributeMemberResolver.INSTANCE;
-
 		public MetadataBuildingOptionsImpl(StandardServiceRegistry serviceRegistry) {
 			this.serviceRegistry = serviceRegistry;
 
@@ -769,6 +762,41 @@ public List<BasicTypeRegistration> getBasicTypeRegistrations() {
 			return basicTypeRegistrations;
 		}
 
+		@Override
+		public ReflectionManager getReflectionManager() {
+			return bootstrapContext.getReflectionManager();
+		}
+
+		@Override
+		public IndexView getJandexView() {
+			return bootstrapContext.getJandexView();
+		}
+
+		@Override
+		public ScanOptions getScanOptions() {
+			return bootstrapContext.getScanOptions();
+		}
+
+		@Override
+		public ScanEnvironment getScanEnvironment() {
+			return bootstrapContext.getScanEnvironment();
+		}
+
+		@Override
+		public Object getScanner() {
+			return bootstrapContext.getScanner();
+		}
+
+		@Override
+		public ArchiveDescriptorFactory getArchiveDescriptorFactory() {
+			return bootstrapContext.getArchiveDescriptorFactory();
+		}
+
+		@Override
+		public ClassLoader getTempClassLoader() {
+			return bootstrapContext.getJpaTempClassLoader();
+		}
+
 		@Override
 		public ImplicitNamingStrategy getImplicitNamingStrategy() {
 			return implicitNamingStrategy;
@@ -799,6 +827,11 @@ public IdGeneratorStrategyInterpreter getIdGenerationTypeInterpreter() {
 			return idGenerationTypeInterpreter;
 		}
 
+		@Override
+		public List<CacheRegionDefinition> getCacheRegionDefinitions() {
+			return new ArrayList<>( bootstrapContext.getCacheRegionDefinitions() );
+		}
+
 		@Override
 		public boolean ignoreExplicitDiscriminatorsForJoinedInheritance() {
 			return !explicitDiscriminatorsForJoinedInheritanceSupported;
@@ -829,6 +862,22 @@ public List<MetadataSourceType> getSourceProcessOrdering() {
 			return sourceProcessOrdering;
 		}
 
+		@Override
+		public Map<String, SQLFunction> getSqlFunctions() {
+			return bootstrapContext.getSqlFunctions();
+		}
+
+		@Override
+		public List<AuxiliaryDatabaseObject> getAuxiliaryDatabaseObjectList() {
+			return new ArrayList<>( bootstrapContext.getAuxiliaryDatabaseObjectList());
+		}
+
+		@Override
+		public List<AttributeConverterInfo> getAttributeConverters() {
+			return new ArrayList<>( bootstrapContext.getAttributeConverters() );
+		}
+
+		@Override
 		public String getSchemaCharset() {
 			return schemaCharset;
 		}
@@ -856,9 +905,8 @@ public void apply(JpaOrmXmlPersistenceUnitDefaults jpaOrmXmlPersistenceUnitDefau
 			}
 		}
 
-		//		@Override
-//		public PersistentAttributeMemberResolver getPersistentAttributeMemberResolver() {
-//			return persistentAttributeMemberResolver;
-//		}
+		public void setBootstrapContext(BootstrapContextImpl bootstrapContext) {
+			this.bootstrapContext = bootstrapContext;
+		}
 	}
 }

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

@@ -8,6 +8,7 @@
 
 import org.hibernate.boot.model.naming.ObjectNameNormalizer;
 import org.hibernate.boot.spi.BootstrapContext;
+import org.hibernate.boot.spi.ClassLoaderAccess;
 import org.hibernate.boot.spi.InFlightMetadataCollector;
 import org.hibernate.boot.spi.MappingDefaults;
 import org.hibernate.boot.spi.MetadataBuildingContext;
@@ -59,6 +60,11 @@ public InFlightMetadataCollector getMetadataCollector() {
 		return metadataCollector;
 	}
 
+	@Override
+	public ClassLoaderAccess getClassLoaderAccess() {
+		return bootstrapContext.getClassLoaderAccess();
+	}
+
 	@Override
 	public ObjectNameNormalizer getObjectNameNormalizer() {
 		return objectNameNormalizer;

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

@@ -430,6 +430,11 @@ public SessionFactoryBuilder enableJpaClosedCompliance(boolean enabled) {
 		return this;
 	}
 
+	@Override
+	public void markAsJpaBootstrap() {
+		this.bootstrapContext.markAsJpaBootstrap();
+	}
+
 	@Override
 	public void disableRefreshDetachedEntity() {
 		this.optionsBuilder.disableRefreshDetachedEntity();

hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/Helper.java

@@ -116,7 +116,7 @@ public static Map<String, String> extractParameters(List<JaxbHbmConfigParameterT
 		if ( xmlParamElements == null || xmlParamElements.isEmpty() ) {
 			return Collections.emptyMap();
 		}
-		final HashMap<String,String> params = new HashMap<String, String>();
+		final HashMap<String,String> params = new HashMap<>();
 		for ( JaxbHbmConfigParameterType paramElement : xmlParamElements ) {
 			params.put( paramElement.getName(), paramElement.getValue() );
 		}
@@ -200,8 +200,8 @@ public static TableSpecificationSource createTableSource(
 		return createTableSource( mappingDocument, entityElement, inLineViewNameInferrer, null, null, null );
 	}
 
-	public static interface InLineViewNameInferrer {
-		public String inferInLineViewName();
+	public interface InLineViewNameInferrer {
+		String inferInLineViewName();
 	}
 
 	public static TableSpecificationSource createTableSource(
@@ -270,20 +270,6 @@ public static Class reflectedPropertyClass(
 			MetadataBuildingContext buildingContext,
 			Class attributeOwnerClass,
 			final String attributeName) {
-//		return BeanInfoHelper.visitBeanInfo(
-//				attributeOwnerClass,
-//				new BeanInfoHelper.ReturningBeanInfoDelegate<Class>() {
-//					@Override
-//					public Class processBeanInfo(BeanInfo beanInfo) throws Exception {
-//						for ( PropertyDescriptor propertyDescriptor : beanInfo.getPropertyDescriptors() ) {
-//							if ( propertyDescriptor.getName().equals( attributeName ) ) {
-//								return propertyDescriptor.getPropertyType();
-//							}
-//						}
-//						return null;
-//					}
-//				}
-//		);
 		return ReflectHelper.reflectedPropertyClass( attributeOwnerClass, attributeName );
 	}
 }

hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/MappingDocument.java

@@ -25,6 +25,7 @@
 import org.hibernate.boot.model.source.spi.MetadataSourceProcessor;
 import org.hibernate.boot.model.source.spi.ToolingHintContext;
 import org.hibernate.boot.spi.BootstrapContext;
+import org.hibernate.boot.spi.ClassLoaderAccess;
 import org.hibernate.boot.spi.InFlightMetadataCollector;
 import org.hibernate.boot.spi.MappingDefaults;
 import org.hibernate.boot.spi.MetadataBuildingContext;
@@ -142,6 +143,11 @@ public InFlightMetadataCollector getMetadataCollector() {
 		return rootBuildingContext.getMetadataCollector();
 	}
 
+	@Override
+	public ClassLoaderAccess getClassLoaderAccess() {
+		return rootBuildingContext.getClassLoaderAccess();
+	}
+
 	@Override
 	public ObjectNameNormalizer getObjectNameNormalizer() {
 		return rootBuildingContext.getObjectNameNormalizer();