HHH-17504 - Ongoing JPA 32 work

HHH-17350 - Work on hibernate-models, XSD and JAXB
HHH-16114 - Improve boot metamodel binding
HHH-15996 - Develop an abstraction for Annotation in annotation processing
HHH-16012 - Develop an abstraction for domain model Class refs
HHH-15997 - Support for dynamic models in orm.xml
HHH-15698 - Support for entity-name in mapping.xsd

hibernate-core/src/main/java/org/hibernate/boot/models/bind/internal/AnyKeyType.java → hibernate-core/src/main/java/org/hibernate/boot/internal/AnyKeyType.java

@@ -1,10 +1,10 @@
 /*
  * Hibernate, Relational Persistence for Idiomatic Java
  *
- * SPDX-License-Identifier: Apache-2.0
- * Copyright: Red Hat Inc. and Hibernate Authors
+ * 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.boot.models.bind.internal;
+package org.hibernate.boot.internal;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

hibernate-core/src/main/java/org/hibernate/boot/models/HibernateAnnotations.java

@@ -11,6 +11,7 @@
 
 import org.hibernate.annotations.*;
 import org.hibernate.boot.internal.Abstract;
+import org.hibernate.boot.internal.AnyKeyType;
 import org.hibernate.boot.internal.CollectionClassification;
 import org.hibernate.boot.internal.Extends;
 import org.hibernate.boot.internal.Target;
@@ -172,6 +173,7 @@ public interface HibernateAnnotations {
 	AnnotationDescriptor<WhereJoinTable> WHERE_JOIN_TABLE = createOrmDescriptor( WhereJoinTable.class );
 
 	AnnotationDescriptor<Abstract> ABSTRACT = createOrmDescriptor( Abstract.class );
+	AnnotationDescriptor<AnyKeyType> ANY_KEY_TYPE = createOrmDescriptor( AnyKeyType.class );
 	AnnotationDescriptor<CollectionClassification> COLLECTION_CLASSIFICATION = createOrmDescriptor( CollectionClassification.class );
 	AnnotationDescriptor<Extends> EXTENDS = createOrmDescriptor( Extends.class );
 	AnnotationDescriptor<Target> TARGET = createOrmDescriptor( Target.class );

hibernate-core/src/main/java/org/hibernate/boot/models/bind/internal/AttributeBinding.java

@@ -14,12 +14,10 @@
 import org.hibernate.annotations.NaturalId;
 import org.hibernate.annotations.OptimisticLock;
 import org.hibernate.boot.model.convert.internal.ClassBasedConverterDescriptor;
-import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.models.AnnotationPlacementException;
 import org.hibernate.boot.models.bind.spi.BindingContext;
 import org.hibernate.boot.models.bind.spi.BindingOptions;
 import org.hibernate.boot.models.bind.spi.BindingState;
-import org.hibernate.boot.models.bind.spi.TableReference;
 import org.hibernate.boot.models.categorize.spi.AttributeMetadata;
 import org.hibernate.mapping.BasicValue;
 import org.hibernate.mapping.Component;
@@ -233,21 +231,6 @@ public <A extends Annotation> void processColumn(
 				bindingState,
 				bindingContext
 		);
-		// todo : implicit column
-		final var columnAnn = member.getAnnotationUsage( annotation );
-		final var column = ColumnHelper.bindColumn( columnAnn, property::getName );
-
-		var tableName = BindingHelper.getValue( columnAnn, "table", "" );
-		if ( "".equals( tableName ) || tableName == null ) {
-			basicValue.setTable( primaryTable );
-		}
-		else {
-			final Identifier identifier = Identifier.toIdentifier( tableName );
-			final TableReference tableByName = bindingState.getTableByName( identifier.getCanonicalName() );
-			basicValue.setTable( tableByName.table() );
-		}
-
-		basicValue.addColumn( column );
 	}
 
 	private void applyNaturalId(AttributeMetadata attributeMetadata, Property property) {

hibernate-core/src/main/java/org/hibernate/boot/models/bind/internal/EntityBinding.java

@@ -17,6 +17,7 @@
 import org.hibernate.boot.models.bind.spi.BindingContext;
 import org.hibernate.boot.models.bind.spi.BindingOptions;
 import org.hibernate.boot.models.bind.spi.BindingState;
+import org.hibernate.boot.models.bind.spi.TableReference;
 import org.hibernate.boot.models.categorize.spi.AttributeMetadata;
 import org.hibernate.boot.models.categorize.spi.EntityHierarchy;
 import org.hibernate.boot.models.categorize.spi.EntityTypeMetadata;
@@ -356,21 +357,14 @@ private static Method findCallbackMethod(
 		}
 	}
 
-	protected void processSecondaryTables() {
-		final List<SecondaryTable> secondaryTables = TableHelper.bindSecondaryTables(
+	protected void processSecondaryTables(TableReference primaryTableReference) {
+		TableHelper.bindSecondaryTables(
 				this,
+				primaryTableReference,
 				bindingOptions,
 				bindingState,
 				bindingContext
 		);
-
-		secondaryTables.forEach( (secondaryTable) -> {
-			final Join join = new Join();
-			join.setTable( secondaryTable.table() );
-			join.setPersistentClass( getPersistentClass() );
-			join.setOptional( secondaryTable.optional() );
-			join.setInverse( !secondaryTable.owned() );
-		} );
 	}
 
 	protected void prepareSubclassBindings() {

hibernate-core/src/main/java/org/hibernate/boot/models/bind/internal/RootEntityBinding.java

@@ -83,7 +83,7 @@ public RootEntityBinding(
 				bindingContext
 		);
 
-		processSecondaryTables();
+		processSecondaryTables( this.tableReference );
 
 		bindingState.registerTypeBinding( typeMetadata, this );
 
@@ -111,8 +111,6 @@ public RootEntityBinding(
 		applyFilters( typeMetadata, rootClass );
 		applyJpaEventListeners( typeMetadata, rootClass );
 
-		// todo : handle any super mapped-superclasses
-
 		prepareAttributeBindings( tableReference.table() );
 
 		prepareSubclassBindings();

hibernate-core/src/main/java/org/hibernate/boot/models/bind/internal/TableHelper.java

@@ -132,15 +132,14 @@ else if ( entityTypeMetadata.getHierarchy().getInheritanceType() == InheritanceT
 		return tableReference;
 	}
 
-	public static List<SecondaryTable> bindSecondaryTables(
+	public static void bindSecondaryTables(
 			EntityBinding entityBinding,
+			TableReference primaryTableReference,
 			BindingOptions bindingOptions,
 			BindingState bindingState,
 			BindingContext bindingContext) {
 		final ClassDetails typeClassDetails = entityBinding.getTypeMetadata().getClassDetails();
-
 		final List<AnnotationUsage<jakarta.persistence.SecondaryTable>> secondaryTableAnns = typeClassDetails.getRepeatedAnnotationUsages( jakarta.persistence.SecondaryTable.class );
-		final List<SecondaryTable> result = new ArrayList<>( secondaryTableAnns.size() );
 
 		secondaryTableAnns.forEach( (secondaryTableAnn) -> {
 			final AnnotationUsage<SecondaryRow> secondaryRowAnn = typeClassDetails.getNamedAnnotationUsage(
@@ -150,20 +149,20 @@ public static List<SecondaryTable> bindSecondaryTables(
 			);
 			final SecondaryTable binding = bindSecondaryTable(
 					entityBinding,
+					primaryTableReference,
 					secondaryTableAnn,
 					secondaryRowAnn,
 					bindingOptions,
 					bindingState,
 					bindingContext
 			);
-			result.add( binding );
 			bindingState.addSecondaryTable( binding );
 		} );
-		return result;
 	}
 
 	public static SecondaryTable bindSecondaryTable(
 			EntityBinding entityBinding,
+			TableReference primaryTableReference,
 			AnnotationUsage<jakarta.persistence.SecondaryTable> secondaryTableAnn,
 			AnnotationUsage<SecondaryRow> secondaryRowAnn,
 			BindingOptions bindingOptions,
@@ -197,7 +196,7 @@ public static SecondaryTable bindSecondaryTable(
 				bindingContext
 		);
 
-		final var binding = bindingState.getMetadataBuildingContext().getMetadataCollector().addTable(
+		final var secondaryTable = bindingState.getMetadataBuildingContext().getMetadataCollector().addTable(
 				toCanonicalName( schemaName ),
 				toCanonicalName( catalogName ),
 				logicalName.getCanonicalName(),
@@ -206,15 +205,15 @@ public static SecondaryTable bindSecondaryTable(
 				bindingState.getMetadataBuildingContext()
 		);
 
-		applyComment( binding, secondaryTableAnn, findCommentAnnotation(
+		applyComment( secondaryTable, secondaryTableAnn, findCommentAnnotation(
 				entityBinding.getTypeMetadata(),
 				logicalName,
 				false
 		) );
-		applyOptions( binding, secondaryTableAnn );
+		applyOptions( secondaryTable, secondaryTableAnn );
 
 		final Join join = new Join();
-		join.setTable( binding );
+		join.setTable( secondaryTable );
 		join.setOptional( BindingHelper.getValue( secondaryRowAnn, "optional", true ) );
 		join.setInverse( !BindingHelper.getValue( secondaryRowAnn, "owned", true ) );
 		join.setPersistentClass( entityBinding.getPersistentClass() );
@@ -231,7 +230,7 @@ public static SecondaryTable bindSecondaryTable(
 				physicalNamingStrategy.toPhysicalSchemaName( schemaName, jdbcEnvironment ),
 				BindingHelper.getValue( secondaryRowAnn, "optional", true ),
 				BindingHelper.getValue( secondaryRowAnn, "owned", true ),
-				binding
+				secondaryTable
 		);
 	}
 

hibernate-core/src/main/java/org/hibernate/boot/models/categorize/xml/internal/attr/AnyMappingAttributeProcessing.java

@@ -18,7 +18,7 @@
 import org.hibernate.boot.jaxb.mapping.spi.JaxbAnyMappingImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbAnyMappingKeyImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbColumnImpl;
-import org.hibernate.boot.models.bind.internal.AnyKeyType;
+import org.hibernate.boot.internal.AnyKeyType;
 import org.hibernate.boot.models.categorize.xml.internal.XmlProcessingHelper;
 import org.hibernate.boot.models.categorize.xml.internal.db.ColumnProcessing;
 import org.hibernate.boot.models.categorize.xml.spi.XmlDocumentContext;

hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/process/ManagedResourcesImpl.java → hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/ManagedResourcesImpl.java

@@ -4,7 +4,7 @@
  * 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.orm.test.boot.models.process;
+package org.hibernate.orm.test.boot.models;
 
 import java.util.ArrayList;
 import java.util.Collection;

hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/process/MyStringConverter.java → hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/MyStringConverter.java

@@ -4,7 +4,7 @@
  * 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.orm.test.boot.models.process;
+package org.hibernate.orm.test.boot.models;
 
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;

hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/process/MyUuidConverter.java → hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/MyUuidConverter.java

@@ -4,7 +4,7 @@
  * 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.orm.test.boot.models.process;
+package org.hibernate.orm.test.boot.models;
 
 import java.util.UUID;
 

hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/bind/BindingTestingHelper.java

@@ -24,7 +24,7 @@
 import org.hibernate.boot.models.categorize.spi.ManagedResourcesProcessor;
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.orm.test.boot.models.process.ManagedResourcesImpl;
+import org.hibernate.orm.test.boot.models.ManagedResourcesImpl;
 
 /**
  * @author Steve Ebersole

hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/resources/ManagedResourcesSmokeTests.java → hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/process/ManagedResourcesSmokeTests.java

@@ -4,7 +4,7 @@
  * 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.orm.test.boot.models.resources;
+package org.hibernate.orm.test.boot.models.process;
 
 import java.util.Iterator;
 import java.util.Set;
@@ -50,7 +50,7 @@
  * set of "managed classes" (JPA's term) which Hibernate will process for annotations -
  * {@code @Entity}, {@code @Converter}, ...
  * <p/>
- * And is the likely place that hibernate-models-source would hook in to.  Let's see how that might work...
+ * Let's see how using that with hibernate-models that might work...
  *
  * @author Steve Ebersole
  */

hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/process/Person.java

@@ -14,6 +14,7 @@
 import org.hibernate.annotations.JavaTypeRegistration;
 import org.hibernate.annotations.ParamDef;
 import org.hibernate.id.IncrementGenerator;
+import org.hibernate.orm.test.boot.models.MyUuidConverter;
 import org.hibernate.type.descriptor.java.StringJavaType;
 
 import jakarta.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/process/SimpleProcessorTests.java

@@ -12,6 +12,9 @@
 import org.hibernate.boot.internal.MetadataBuilderImpl;
 import org.hibernate.boot.model.process.spi.ManagedResources;
 import org.hibernate.orm.test.boot.models.BootstrapContextTesting;
+import org.hibernate.orm.test.boot.models.ManagedResourcesImpl;
+import org.hibernate.orm.test.boot.models.MyStringConverter;
+import org.hibernate.orm.test.boot.models.MyUuidConverter;
 import org.hibernate.orm.test.boot.models.SourceModelTestHelper;
 import org.hibernate.boot.models.categorize.spi.CategorizedDomainModel;
 import org.hibernate.boot.models.categorize.spi.EntityHierarchy;
@@ -37,6 +40,8 @@
 import static org.hibernate.models.internal.SimpleClassLoading.SIMPLE_CLASS_LOADING;
 
 /**
+ * Tests the general process / flow of using hibernate-models
+ *
  * @author Steve Ebersole
  */
 public class SimpleProcessorTests {
@@ -71,12 +76,6 @@ void testSimpleUsage() {
 		);
 		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-
-		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		// Above here is work done before hibernate-models.
-		// Below here is work done by hibernate-models.
-		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 		try (StandardServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder().build()) {
 			final MetadataBuilderImpl.MetadataBuildingOptionsImpl metadataBuildingOptions = new MetadataBuilderImpl.MetadataBuildingOptionsImpl( serviceRegistry );
 			final BootstrapContextTesting bootstrapContext = new BootstrapContextTesting( jandexIndex, serviceRegistry, metadataBuildingOptions );