HHH-8893 delay binding of xml resources until building Metadata,

introduce ClassLoaderAccess into transformer, removed old XmlBinder

Author: brmeyer

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

@@ -61,9 +61,9 @@
 import org.hibernate.metamodel.source.internal.jaxb.JaxbMappedSuperclass;
 import org.hibernate.metamodel.source.internal.jaxb.JaxbPersistenceUnitDefaults;
 import org.hibernate.metamodel.source.internal.jaxb.JaxbPersistenceUnitMetadata;
-import org.hibernate.metamodel.source.spi.InvalidMappingException;
 import org.hibernate.metamodel.source.spi.MappingException;
 import org.hibernate.metamodel.source.spi.MappingNotFoundException;
+import org.hibernate.metamodel.spi.ClassLoaderAccess;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.type.SerializationException;
 import org.hibernate.xml.internal.jaxb.UnifiedMappingBinder;
@@ -86,16 +86,13 @@ public class MetadataSources {
 	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( MetadataSources.class );
 
 	private final ServiceRegistry serviceRegistry;
-	private final UnifiedMappingBinder jaxbProcessor;
 	private List<BindResult> bindResultList = new ArrayList<BindResult>();
 	private LinkedHashSet<Class<?>> annotatedClasses = new LinkedHashSet<Class<?>>();
 	private LinkedHashSet<String> annotatedClassNames = new LinkedHashSet<String>();
 	private LinkedHashSet<String> annotatedPackages = new LinkedHashSet<String>();
 
 	private List<Class<? extends AttributeConverter>> converterClasses;
 
-	private boolean hasOrmXmlJaxbRoots;
-
 	public MetadataSources() {
 		this( new BootstrapServiceRegistryBuilder().build() );
 	}
@@ -115,13 +112,19 @@ public MetadataSources(ServiceRegistry serviceRegistry) {
 			);
 		}
 		this.serviceRegistry = serviceRegistry;
-		this.jaxbProcessor = new UnifiedMappingBinder();
 	}
 
 	protected static boolean isExpectedServiceRegistryType(ServiceRegistry serviceRegistry) {
 		return BootstrapServiceRegistry.class.isInstance( serviceRegistry )
 				|| StandardServiceRegistry.class.isInstance( serviceRegistry );
 	}
+	
+	public void buildBindResults(ClassLoaderAccess classLoaderAccess) {
+		final UnifiedMappingBinder jaxbProcessor = new UnifiedMappingBinder( classLoaderAccess );
+		for ( BindResult bindResult : bindResultList ) {
+			bindResult.bind( jaxbProcessor );
+		}
+	}
 
 	public List<BindResult> getBindResultList() {
 		return bindResultList;
@@ -243,24 +246,9 @@ private ClassLoaderService classLoaderService() {
 	}
 
 	private BindResult add(InputStream inputStream, Origin origin, boolean close) {
-		try {
-			BindResult bindResult = new BindResult( jaxbProcessor.bind( inputStream, origin ), origin );
-			addJaxbRoot( bindResult );
-			return bindResult;
-		}
-		catch ( Exception e ) {
-			throw new InvalidMappingException( origin, e );
-		}
-		finally {
-			if ( close ) {
-				try {
-					inputStream.close();
-				}
-				catch ( IOException ignore ) {
-					LOG.trace( "Was unable to close input stream" );
-				}
-			}
-		}
+		BindResult bindResult = new BindResult( inputStream, origin, close );
+		bindResultList.add( bindResult );
+		return bindResult;
 	}
 
 	/**
@@ -419,7 +407,7 @@ public MetadataSources addCacheableFileStrictly(File file) throws SerializationE
 		}
 
 		LOG.readingCachedMappings( cachedFile );
-		addJaxbRoot( (BindResult) SerializationHelper.deserialize( new FileInputStream( cachedFile ) ) );
+		bindResultList.add( (BindResult) SerializationHelper.deserialize( new FileInputStream( cachedFile ) ) );
 		return this;
 	}
 
@@ -470,16 +458,10 @@ public MetadataSources addURL(URL url) {
 	@Deprecated
 	public MetadataSources addDocument(Document document) {
 		final Origin origin = new Origin( SourceType.DOM, Origin.UNKNOWN_FILE_PATH );
-		BindResult bindResult = new BindResult( jaxbProcessor.bind( new DOMSource( document ), origin ), origin );
-		addJaxbRoot( bindResult );
+		bindResultList.add( new BindResult( new DOMSource( document ), origin ) );
 		return this;
 	}
 
-	private void addJaxbRoot(BindResult bindResult) {
-		hasOrmXmlJaxbRoots = hasOrmXmlJaxbRoots || JaxbEntityMappings.class.isInstance( bindResult.getRoot() );
-		bindResultList.add( bindResult );
-	}
-
 	/**
 	 * Read all mappings from a jar file.
 	 * <p/>

hibernate-core/src/main/java/org/hibernate/metamodel/internal/ClassLoaderAccessImpl.java

@@ -25,11 +25,10 @@
 
 import java.net.URL;
 
-import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
 import org.hibernate.metamodel.spi.ClassLoaderAccess;
-
+import org.hibernate.service.ServiceRegistry;
 import org.jboss.logging.Logger;
 
 /**
@@ -48,7 +47,7 @@ public ClassLoaderAccessImpl(
 		this.classLoaderService = classLoaderService;
 	}
 
-	public ClassLoaderAccessImpl(ClassLoader tempClassLoader, StandardServiceRegistry serviceRegistry) {
+	public ClassLoaderAccessImpl(ClassLoader tempClassLoader, ServiceRegistry serviceRegistry) {
 		this( tempClassLoader, serviceRegistry.getService( ClassLoaderService.class ) );
 	}
 

hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataBuildingProcess.java

@@ -148,9 +148,13 @@ public static MetadataImpl build(MetadataSources sources, final MetadataBuilding
 				options.getTempClassLoader(),
 				options.getServiceRegistry()
 		);
+		
+		// It's necessary to delay the binding of XML resources until now.  ClassLoaderAccess is needed for
+		// reflection, etc.
+		sources.buildBindResults( classLoaderAccess );
 
 		final JandexInitManager jandexInitializer = buildJandexInitializer( options, classLoaderAccess );
-
+		
 		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		// scanning - Jandex initialization and source discovery
 		if ( options.getScanEnvironment() != null ) {

hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/jandex/EntityMappingsMocker.java

@@ -39,8 +39,6 @@
 import org.hibernate.metamodel.source.internal.jaxb.JaxbPersistenceUnitMetadata;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.xml.spi.BindResult;
-import org.hibernate.xml.spi.Origin;
-import org.hibernate.xml.spi.SourceType;
 import org.jboss.jandex.Index;
 import org.jboss.jandex.IndexView;
 
@@ -68,30 +66,6 @@ public EntityMappingsMocker(List<BindResult<JaxbEntityMappings>> xmlBindings, In
 		this.globalAnnotations = new GlobalAnnotations();
 	}
 
-	public EntityMappingsMocker(
-			List<JaxbEntityMappings> xmlEntityMappingsList,
-			Index index,
-			ServiceRegistry serviceRegistry) {
-		this(
-				grabJaxbEntityMappings( xmlEntityMappingsList ),
-				index,
-				serviceRegistry
-		);
-	}
-
-	private static List<BindResult<JaxbEntityMappings>> grabJaxbEntityMappings(List<JaxbEntityMappings> xmlEntityMappingsList) {
-		final List<BindResult<JaxbEntityMappings>> result = new ArrayList<BindResult<JaxbEntityMappings>>();
-		for ( JaxbEntityMappings binding : xmlEntityMappingsList ) {
-			result.add(
-					new BindResult<JaxbEntityMappings>(
-							binding,
-							new Origin( SourceType.OTHER, Origin.UNKNOWN_FILE_PATH )
-					)
-			);
-		}
-		return result;
-	}
-
 	/**
 	 * Create new {@link Index} with mocking JPA annotations from {@link org.hibernate.metamodel.source.internal.jaxb.JaxbEntityMappings}
 	 * and merge them with existing {@link Index}

hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/jaxb/hbm/HbmXmlTransformer.java

@@ -30,7 +30,6 @@
 
 import org.hibernate.FlushMode;
 import org.hibernate.internal.util.StringHelper;
-import org.hibernate.metamodel.source.internal.jandex.MockHelper;
 import org.hibernate.metamodel.source.internal.jaxb.JaxbAny;
 import org.hibernate.metamodel.source.internal.jaxb.JaxbAttributes;
 import org.hibernate.metamodel.source.internal.jaxb.JaxbBasic;
@@ -62,7 +61,6 @@
 import org.hibernate.metamodel.source.internal.jaxb.JaxbId;
 import org.hibernate.metamodel.source.internal.jaxb.JaxbIdClass;
 import org.hibernate.metamodel.source.internal.jaxb.JaxbJoinColumn;
-import org.hibernate.metamodel.source.internal.jaxb.JaxbJoinTable;
 import org.hibernate.metamodel.source.internal.jaxb.JaxbManyToOne;
 import org.hibernate.metamodel.source.internal.jaxb.JaxbNamedNativeQuery;
 import org.hibernate.metamodel.source.internal.jaxb.JaxbNamedQuery;
@@ -72,6 +70,7 @@
 import org.hibernate.metamodel.source.internal.jaxb.JaxbQueryParamType;
 import org.hibernate.metamodel.source.internal.jaxb.JaxbSynchronizeType;
 import org.hibernate.metamodel.source.internal.jaxb.JaxbTable;
+import org.hibernate.metamodel.spi.ClassLoaderAccess;
 import org.hibernate.xml.spi.Origin;
 import org.jboss.logging.Logger;
 
@@ -91,9 +90,12 @@ public class HbmXmlTransformer {
 
 	private Origin origin;
 	private JaxbEntityMappings ormRoot;
+	private ClassLoaderAccess classLoaderAccess;
 
-	public JaxbEntityMappings transform(JaxbHibernateMapping hbmXmlMapping, Origin origin) {
+	public JaxbEntityMappings transform(JaxbHibernateMapping hbmXmlMapping, Origin origin,
+			ClassLoaderAccess classLoaderAccess) {
 		this.origin = origin;
+		this.classLoaderAccess = classLoaderAccess;
 
 		ormRoot = new JaxbEntityMappings();
 		ormRoot.setDescription(