move ClassmateContext to SPI package, since it occurs in BootstrapContext

it was previously in an internal package, and leaked onto the SPI

Author: gavinking

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

@@ -24,6 +24,7 @@
 import org.hibernate.boot.registry.selector.spi.StrategySelector;
 import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.boot.spi.ClassLoaderAccess;
+import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.spi.MetadataBuildingOptions;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.config.spi.ConfigurationService;

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

@@ -6,7 +6,7 @@
 
 import java.util.List;
 
-import org.hibernate.boot.internal.ClassmateContext;
+import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.model.convert.spi.AutoApplicableConverterDescriptor;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 import org.hibernate.boot.model.convert.spi.JpaAttributeConverterCreationContext;

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

@@ -4,7 +4,7 @@
  */
 package org.hibernate.boot.model.convert.internal;
 
-import org.hibernate.boot.internal.ClassmateContext;
+import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.model.convert.spi.JpaAttributeConverterCreationContext;
 import org.hibernate.resource.beans.spi.ManagedBean;
 

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

@@ -12,7 +12,7 @@
 
 import org.hibernate.AnnotationException;
 import org.hibernate.HibernateException;
-import org.hibernate.boot.internal.ClassmateContext;
+import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.internal.util.GenericsHelper;
 import org.hibernate.internal.util.type.PrimitiveWrapperHelper;

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

@@ -4,7 +4,7 @@
  */
 package org.hibernate.boot.model.convert.internal;
 
-import org.hibernate.boot.internal.ClassmateContext;
+import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.model.convert.spi.JpaAttributeConverterCreationContext;
 import org.hibernate.resource.beans.spi.ManagedBean;
 import org.hibernate.resource.beans.spi.ProvidedInstanceManagedBeanImpl;

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

@@ -11,7 +11,7 @@
 import java.util.Map;
 
 import org.hibernate.AnnotationException;
-import org.hibernate.boot.internal.ClassmateContext;
+import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbConverterImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityListenerContainerImpl;

hibernate-core/src/main/java/org/hibernate/boot/models/spi/ConversionRegistration.java

@@ -8,7 +8,7 @@
 import java.util.List;
 import java.util.Objects;
 
-import org.hibernate.boot.internal.ClassmateContext;
+import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.model.convert.internal.AutoApplicableConverterDescriptorBypassedImpl;
 import org.hibernate.boot.model.convert.internal.AutoApplicableConverterDescriptorStandardImpl;
 import org.hibernate.boot.model.convert.internal.ConverterHelper;

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

@@ -13,8 +13,6 @@
 import org.hibernate.boot.archive.scan.spi.ScanEnvironment;
 import org.hibernate.boot.archive.scan.spi.ScanOptions;
 import org.hibernate.boot.archive.spi.ArchiveDescriptorFactory;
-import org.hibernate.boot.internal.ClassmateContext;
-import org.hibernate.boot.internal.TypeBeanInstanceProducer;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject;
 import org.hibernate.boot.registry.StandardServiceRegistry;
@@ -62,7 +60,7 @@ public interface BootstrapContext {
 	/**
 	 * The {@link BeanInstanceProducer} to use when creating custom type references.
 	 *
-	 * @implNote Usually a {@link TypeBeanInstanceProducer}.
+	 * @implNote Usually a {@link org.hibernate.boot.internal.TypeBeanInstanceProducer}.
 	 */
 	BeanInstanceProducer getCustomTypeProducer();
 
@@ -105,9 +103,8 @@ public interface BootstrapContext {
 	/**
 	 * Access to the shared {@link ClassmateContext} object used
 	 * throughout the bootstrap process.
-	 *
-	 * @return Access to the shared {@link ClassmateContext} delegates.
 	 */
+	@Incubating
 	ClassmateContext getClassmateContext();
 
 	/**

hibernate-core/src/main/java/org/hibernate/boot/internal/ClassmateContext.java renamed to hibernate-core/src/main/java/org/hibernate/boot/spi/ClassmateContext.java

@@ -2,14 +2,18 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.boot.internal;
+package org.hibernate.boot.spi;
 
 import com.fasterxml.classmate.MemberResolver;
 import com.fasterxml.classmate.TypeResolver;
+import org.hibernate.Incubating;
 
 /**
+ * Exposes the Classmate {@link TypeResolver} and {@link MemberResolver}.
+ *
  * @author Steve Ebersole
  */
+@Incubating
 public class ClassmateContext {
 	private TypeResolver typeResolver = new TypeResolver();
 	private MemberResolver memberResolver = new MemberResolver( typeResolver );

hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java

@@ -26,7 +26,7 @@
 import org.hibernate.boot.MetadataBuilder;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.SessionFactoryBuilder;
-import org.hibernate.boot.internal.ClassmateContext;
+import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.jaxb.spi.Binding;
 import org.hibernate.boot.model.FunctionContributor;
 import org.hibernate.boot.model.NamedEntityGraphDefinition;