HHH-16115 - Develop an intermediate metamodel binding model

sebersole · sebersole · commit ff6d79ca6366 · 2023-03-05T12:54:59.000-06:00
HHH-16116 - Bind intermediate metamodel into PersistentClass, et al.
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java b/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java
@@ -23,6 +23,7 @@
 import org.hibernate.boot.archive.spi.InputStreamAccess;
 import org.hibernate.boot.internal.MetadataBuilderImpl;
 import org.hibernate.boot.jaxb.internal.XmlSources;
+import org.hibernate.boot.jaxb.spi.BindableMappingDescriptor;
 import org.hibernate.boot.jaxb.spi.Binding;
 import org.hibernate.boot.jaxb.spi.XmlSource;
 import org.hibernate.boot.registry.BootstrapServiceRegistry;
@@ -64,7 +65,7 @@ public class MetadataSources implements Serializable {
 
 	private XmlMappingBinderAccess xmlMappingBinderAccess;
 
-	private List<Binding<?>> xmlBindings;
+	private List<Binding<BindableMappingDescriptor>> xmlBindings;
 	private LinkedHashSet<Class<?>> annotatedClasses;
 	private LinkedHashSet<String> annotatedClassNames;
 	private LinkedHashSet<String> annotatedPackages;
@@ -120,7 +121,7 @@ public XmlMappingBinderAccess getXmlMappingBinderAccess() {
 		return xmlMappingBinderAccess;
 	}
 
-	public List<Binding<?>> getXmlBindings() {
+	public List<Binding<BindableMappingDescriptor>> getXmlBindings() {
 		return xmlBindings == null ? Collections.emptyList() : xmlBindings;
 	}
 
@@ -371,7 +372,8 @@ public MetadataSources addFile(File file) {
 	 * @return this (for method chaining purposes)
 	 */
 	public MetadataSources addXmlBinding(Binding<?> binding) {
-		getXmlBindingsForWrite().add( binding );
+		//noinspection unchecked
+		getXmlBindingsForWrite().add( (Binding<BindableMappingDescriptor>) binding );
 		return this;
 	}
 
@@ -547,7 +549,7 @@ public MetadataSources addJar(File jar) {
 		return this;
 	}
 
-	private List<Binding<?>> getXmlBindingsForWrite() {
+	private List<Binding<BindableMappingDescriptor>> getXmlBindingsForWrite() {
 		if ( xmlBindings == null ) {
 			xmlBindings = new ArrayList<>();
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java
@@ -513,6 +513,10 @@ public ConverterRegistry getConverterRegistry() {
 		return this;
 	}
 
+	public AttributeConverterManager getAttributeConverterManager() {
+		return attributeConverterManager;
+	}
+
 	@Override
 	public void addAttributeConverter(Class<? extends AttributeConverter<?,?>> converterClass) {
 		attributeConverterManager.addConverter(
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AttributeConverterManager.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AttributeConverterManager.java
@@ -46,6 +46,13 @@ public class AttributeConverterManager implements ConverterAutoApplyHandler {
 	private Map<Class<?>, ConverterDescriptor> attributeConverterDescriptorsByClass;
 	private Map<Class<?>, RegisteredConversion> registeredConversionsByDomainType;
 
+	public RegisteredConversion findRegisteredConversion(Class<?> domainType) {
+		if ( registeredConversionsByDomainType == null ) {
+			return null;
+		}
+		return registeredConversionsByDomainType.get( domainType );
+	}
+
 	public void addConverter(ConverterDescriptor descriptor) {
 		if ( log.isTraceEnabled() ) {
 			log.tracef( "Starting AttributeConverterManager#addConverter : `%s`",
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/InheritanceState.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/InheritanceState.java
@@ -317,7 +317,7 @@ private void addMappedSuperClassInMetadata(PersistentClass persistentClass) {
 			//add MappedSuperclass if not already there
 			mappedSuperclass = buildingContext.getMetadataCollector().getMappedSuperclass( type );
 			if ( mappedSuperclass == null ) {
-				mappedSuperclass = new org.hibernate.mapping.MappedSuperclass( parentSuperclass, superEntity );
+				mappedSuperclass = new org.hibernate.mapping.MappedSuperclass( parentSuperclass, superEntity, persistentClass.getImplicitTable() );
 				mappedSuperclass.setMappedClass( type );
 				buildingContext.getMetadataCollector().addMappedSuperclass( type, mappedSuperclass );
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/Identifier.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/Identifier.java
@@ -242,6 +242,12 @@ public boolean equals(Object o) {
 		return getCanonicalName().equals( that.getCanonicalName() );
 	}
 
+	public boolean matches(String name) {
+		return isQuoted()
+				? text.equals( name )
+				: text.equalsIgnoreCase( name );
+	}
+
 	@Override
 	public int hashCode() {
 		return isQuoted ? text.hashCode() : text.toLowerCase( Locale.ENGLISH ).hashCode();
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ManagedResourcesImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ManagedResourcesImpl.java
@@ -17,20 +17,23 @@
 
 import org.hibernate.Internal;
 import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.jaxb.spi.BindableMappingDescriptor;
 import org.hibernate.boot.jaxb.spi.Binding;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 import org.hibernate.boot.model.process.spi.ManagedResources;
 import org.hibernate.boot.spi.BootstrapContext;
 
+import jakarta.persistence.AttributeConverter;
+
 /**
  * @author Steve Ebersole
  */
 public class ManagedResourcesImpl implements ManagedResources {
-	private Map<Class, ConverterDescriptor> attributeConverterDescriptorMap = new HashMap<>();
-	private Set<Class> annotatedClassReferences = new LinkedHashSet<>();
-	private Set<String> annotatedClassNames = new LinkedHashSet<>();
-	private Set<String> annotatedPackageNames = new LinkedHashSet<>();
-	private List<Binding> mappingFileBindings = new ArrayList<>();
+	private final Map<Class<? extends AttributeConverter>, ConverterDescriptor> attributeConverterDescriptorMap = new HashMap<>();
+	private final Set<Class<?>> annotatedClassReferences = new LinkedHashSet<>();
+	private final Set<String> annotatedClassNames = new LinkedHashSet<>();
+	private final Set<String> annotatedPackageNames = new LinkedHashSet<>();
+	private final List<Binding<BindableMappingDescriptor>> mappingFileBindings = new ArrayList<>();
 	private Map<String, Class<?>> extraQueryImports;
 
 	public static ManagedResourcesImpl baseline(MetadataSources sources, BootstrapContext bootstrapContext) {
@@ -44,7 +47,7 @@ public static ManagedResourcesImpl baseline(MetadataSources sources, BootstrapCo
 		return impl;
 	}
 
-	private ManagedResourcesImpl() {
+	public ManagedResourcesImpl() {
 	}
 
 	@Override
@@ -53,7 +56,7 @@ public Collection<ConverterDescriptor> getAttributeConverterDescriptors() {
 	}
 
 	@Override
-	public Collection<Class> getAnnotatedClassReferences() {
+	public Collection<Class<?>> getAnnotatedClassReferences() {
 		return Collections.unmodifiableSet( annotatedClassReferences );
 	}
 
@@ -68,7 +71,7 @@ public Collection<String> getAnnotatedPackageNames() {
 	}
 
 	@Override
-	public Collection<Binding> getXmlMappingBindings() {
+	public Collection<Binding<BindableMappingDescriptor>> getXmlMappingBindings() {
 		return Collections.unmodifiableList( mappingFileBindings );
 	}
 
@@ -87,7 +90,7 @@ public void addAttributeConverterDefinition(ConverterDescriptor descriptor) {
 	}
 
 	@Internal
-	public void addAnnotatedClassReference(Class annotatedClassReference) {
+	public void addAnnotatedClassReference(Class<?> annotatedClassReference) {
 		annotatedClassReferences.add( annotatedClassReference );
 	}
 
@@ -102,7 +105,7 @@ public void addAnnotatedPackageName(String annotatedPackageName) {
 	}
 
 	@Internal
-	public void addXmlBinding(Binding binding) {
+	public void addXmlBinding(Binding<BindableMappingDescriptor> binding) {
 		mappingFileBindings.add( binding );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/ManagedResources.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/ManagedResources.java
@@ -9,6 +9,7 @@
 import java.util.Collection;
 import java.util.Map;
 
+import org.hibernate.boot.jaxb.spi.BindableMappingDescriptor;
 import org.hibernate.boot.jaxb.spi.Binding;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 
@@ -40,7 +41,7 @@ public interface ManagedResources {
 	 *
 	 * @return The list of entity/component classes known by Class reference.
 	 */
-	Collection<Class> getAnnotatedClassReferences();
+	Collection<Class<?>> getAnnotatedClassReferences();
 
 	/**
 	 * Informational access to any entity and component classes in the user domain model known by name.
@@ -64,7 +65,7 @@ public interface ManagedResources {
 	 *
 	 * @return The list of bindings for all known XML mapping files.
 	 */
-	Collection<Binding> getXmlMappingBindings();
+	Collection<Binding<BindableMappingDescriptor>> getXmlMappingBindings();
 
 	Map<String,Class<?>> getExtraQueryImports();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HbmMetadataSourceProcessorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/HbmMetadataSourceProcessorImpl.java
@@ -12,6 +12,7 @@
 import java.util.Set;
 
 import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmHibernateMapping;
+import org.hibernate.boot.jaxb.spi.BindableMappingDescriptor;
 import org.hibernate.boot.jaxb.spi.Binding;
 import org.hibernate.boot.model.process.spi.ManagedResources;
 import org.hibernate.boot.model.source.spi.MetadataSourceProcessor;
@@ -40,16 +41,15 @@ public HbmMetadataSourceProcessorImpl(
 		this( managedResources.getXmlMappingBindings(), rootBuildingContext );
 	}
 
-	@SuppressWarnings("unchecked")
 	public HbmMetadataSourceProcessorImpl(
-			Collection<Binding> xmlBindings,
+			Collection<Binding<BindableMappingDescriptor>> xmlBindings,
 			MetadataBuildingContext rootBuildingContext) {
 		this.rootBuildingContext = rootBuildingContext;
 		final EntityHierarchyBuilder hierarchyBuilder = new EntityHierarchyBuilder();
 
 		this.mappingDocuments = new ArrayList<>();
 
-		for ( Binding xmlBinding : xmlBindings ) {
+		for ( Binding<BindableMappingDescriptor> xmlBinding : xmlBindings ) {
 			if ( !(xmlBinding.getRoot() instanceof JaxbHbmHibernateMapping) ) {
 				continue;
 			}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/IdentifiableTypeClass.java b/hibernate-core/src/main/java/org/hibernate/mapping/IdentifiableTypeClass.java
@@ -0,0 +1,26 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
+ */
+package org.hibernate.mapping;
+
+import java.util.List;
+
+/**
+ * Commonality between {@link PersistentClass} and {@link MappedSuperclass},
+ * what JPA calls an {@linkplain jakarta.persistence.metamodel.IdentifiableType identifiable type}.
+ *
+ * @author Steve Ebersole
+ */
+public interface IdentifiableTypeClass extends TableContainer {
+	IdentifiableTypeClass getSuperType();
+	List<IdentifiableTypeClass> getSubTypes();
+
+	List<Property> getDeclaredProperties();
+
+	Table getImplicitTable();
+
+	void applyProperty(Property property);
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/MappedSuperclass.java b/hibernate-core/src/main/java/org/hibernate/mapping/MappedSuperclass.java
@@ -17,18 +17,23 @@
  *
  * @author Emmanuel Bernard
  */
-public class MappedSuperclass {
+public class MappedSuperclass implements IdentifiableTypeClass {
 	private final MappedSuperclass superMappedSuperclass;
 	private final PersistentClass superPersistentClass;
 	private final List<Property> declaredProperties;
+	private final Table implicitTable;
 	private Class<?> mappedClass;
 	private Property identifierProperty;
 	private Property version;
 	private Component identifierMapper;
 
-	public MappedSuperclass(MappedSuperclass superMappedSuperclass, PersistentClass superPersistentClass) {
+	public MappedSuperclass(
+			MappedSuperclass superMappedSuperclass,
+			PersistentClass superPersistentClass,
+			Table implicitTable) {
 		this.superMappedSuperclass = superMappedSuperclass;
 		this.superPersistentClass = superPersistentClass;
+		this.implicitTable = implicitTable;
 		this.declaredProperties = new ArrayList<>();
 	}
 
@@ -205,4 +210,49 @@ && getSuperPersistentClass().isPropertyDefinedInHierarchy( name ) ) {
 	public void prepareForMappingModel() {
 		declaredProperties.sort( Comparator.comparing( Property::getName ) );
 	}
+
+	@Override
+	public Table findTable(String name) {
+		return null;
+	}
+
+	@Override
+	public Table getTable(String name) {
+		return null;
+	}
+
+	@Override
+	public Join findSecondaryTable(String name) {
+		return null;
+	}
+
+	@Override
+	public Join getSecondaryTable(String name) {
+		return null;
+	}
+
+	@Override
+	public IdentifiableTypeClass getSuperType() {
+		if ( superPersistentClass != null ) {
+			return superPersistentClass;
+		}
+		return superMappedSuperclass;
+	}
+
+	@Override
+	public List<IdentifiableTypeClass> getSubTypes() {
+		throw new UnsupportedOperationException( "Not implemented yet" );
+	}
+
+	@Override
+	public Table getImplicitTable() {
+		return implicitTable;
+	}
+
+	@Override
+	public void applyProperty(Property property) {
+		assert property.getValue().getTable() != null;
+		assert property.getValue().getTable().equals( getImplicitTable() );
+		addDeclaredProperty( property );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java b/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/TableContainer.java b/hibernate-core/src/main/java/org/hibernate/mapping/TableContainer.java

Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ private void addMappedSuperClassInMetadata(PersistentClass persistentClass) {`
`317`	`317`	`//add MappedSuperclass if not already there`
`318`	`318`	`mappedSuperclass = buildingContext.getMetadataCollector().getMappedSuperclass( type );`
`319`	`319`	`if ( mappedSuperclass == null ) {`
`320`		`- mappedSuperclass = new org.hibernate.mapping.MappedSuperclass( parentSuperclass, superEntity );`
	`320`	`+ mappedSuperclass = new org.hibernate.mapping.MappedSuperclass( parentSuperclass, superEntity, persistentClass.getImplicitTable() );`
`321`	`321`	`mappedSuperclass.setMappedClass( type );`
`322`	`322`	`buildingContext.getMetadataCollector().addMappedSuperclass( type, mappedSuperclass );`
`323`	`323`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,20 +17,23 @@`
`17`	`17`
`18`	`18`	`import org.hibernate.Internal;`
`19`	`19`	`import org.hibernate.boot.MetadataSources;`
	`20`	`+import org.hibernate.boot.jaxb.spi.BindableMappingDescriptor;`
`20`	`21`	`import org.hibernate.boot.jaxb.spi.Binding;`
`21`	`22`	`import org.hibernate.boot.model.convert.spi.ConverterDescriptor;`
`22`	`23`	`import org.hibernate.boot.model.process.spi.ManagedResources;`
`23`	`24`	`import org.hibernate.boot.spi.BootstrapContext;`
`24`	`25`
	`26`	`+import jakarta.persistence.AttributeConverter;`
	`27`	`+`
`25`	`28`	`/**`
`26`	`29`	`* @author Steve Ebersole`
`27`	`30`	`*/`
`28`	`31`	`public class ManagedResourcesImpl implements ManagedResources {`
`29`		`- private Map<Class, ConverterDescriptor> attributeConverterDescriptorMap = new HashMap<>();`
`30`		`- private Set<Class> annotatedClassReferences = new LinkedHashSet<>();`
`31`		`- private Set<String> annotatedClassNames = new LinkedHashSet<>();`
`32`		`- private Set<String> annotatedPackageNames = new LinkedHashSet<>();`
`33`		`- private List<Binding> mappingFileBindings = new ArrayList<>();`
	`32`	`+ private final Map<Class<? extends AttributeConverter>, ConverterDescriptor> attributeConverterDescriptorMap = new HashMap<>();`
	`33`	`+ private final Set<Class<?>> annotatedClassReferences = new LinkedHashSet<>();`
	`34`	`+ private final Set<String> annotatedClassNames = new LinkedHashSet<>();`
	`35`	`+ private final Set<String> annotatedPackageNames = new LinkedHashSet<>();`
	`36`	`+ private final List<Binding<BindableMappingDescriptor>> mappingFileBindings = new ArrayList<>();`
`34`	`37`	`private Map<String, Class<?>> extraQueryImports;`
`35`	`38`
`36`	`39`	`public static ManagedResourcesImpl baseline(MetadataSources sources, BootstrapContext bootstrapContext) {`
`@@ -44,7 +47,7 @@ public static ManagedResourcesImpl baseline(MetadataSources sources, BootstrapCo`
`44`	`47`	`return impl;`
`45`	`48`	`}`
`46`	`49`
`47`		`- private ManagedResourcesImpl() {`
	`50`	`+ public ManagedResourcesImpl() {`
`48`	`51`	`}`
`49`	`52`
`50`	`53`	`@Override`
`@@ -53,7 +56,7 @@ public Collection<ConverterDescriptor> getAttributeConverterDescriptors() {`
`53`	`56`	`}`
`54`	`57`
`55`	`58`	`@Override`
`56`		`- public Collection<Class> getAnnotatedClassReferences() {`
	`59`	`+ public Collection<Class<?>> getAnnotatedClassReferences() {`
`57`	`60`	`return Collections.unmodifiableSet( annotatedClassReferences );`
`58`	`61`	`}`
`59`	`62`
`@@ -68,7 +71,7 @@ public Collection<String> getAnnotatedPackageNames() {`
`68`	`71`	`}`
`69`	`72`
`70`	`73`	`@Override`
`71`		`- public Collection<Binding> getXmlMappingBindings() {`
	`74`	`+ public Collection<Binding<BindableMappingDescriptor>> getXmlMappingBindings() {`
`72`	`75`	`return Collections.unmodifiableList( mappingFileBindings );`
`73`	`76`	`}`
`74`	`77`
`@@ -87,7 +90,7 @@ public void addAttributeConverterDefinition(ConverterDescriptor descriptor) {`
`87`	`90`	`}`
`88`	`91`
`89`	`92`	`@Internal`
`90`		`- public void addAnnotatedClassReference(Class annotatedClassReference) {`
	`93`	`+ public void addAnnotatedClassReference(Class<?> annotatedClassReference) {`
`91`	`94`	`annotatedClassReferences.add( annotatedClassReference );`
`92`	`95`	`}`
`93`	`96`
`@@ -102,7 +105,7 @@ public void addAnnotatedPackageName(String annotatedPackageName) {`
`102`	`105`	`}`
`103`	`106`
`104`	`107`	`@Internal`
`105`		`- public void addXmlBinding(Binding binding) {`
	`108`	`+ public void addXmlBinding(Binding<BindableMappingDescriptor> binding) {`
`106`	`109`	`mappingFileBindings.add( binding );`
`107`	`110`	`}`
`108`	`111`	`}`