HHH-18534 - Remove the org.hibernate.boot.models.categorize package

Author: sebersole

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

@@ -59,7 +59,7 @@
 import org.hibernate.boot.model.relational.SqlStringGenerationContext;
 import org.hibernate.boot.model.source.internal.ImplicitColumnNamingSecondPass;
 import org.hibernate.boot.model.source.spi.LocalMetadataBuildingContext;
-import org.hibernate.boot.models.categorize.internal.ClassLoaderServiceLoading;
+import org.hibernate.boot.models.internal.ClassLoaderServiceLoading;
 import org.hibernate.boot.models.internal.GlobalRegistrationsImpl;
 import org.hibernate.boot.models.internal.ModelsHelper;
 import org.hibernate.boot.models.spi.GlobalRegistrations;

hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java

@@ -230,7 +230,8 @@ public static MetadataImplementor complete(
 		return metadataCollector.buildMetadataInstance( rootMetadataBuildingContext );
 	}
 
-	private static void coordinateProcessors(
+	@Internal
+	public static void coordinateProcessors(
 			ManagedResources managedResources,
 			MetadataBuildingOptions options,
 			MetadataBuildingContextRootImpl rootMetadataBuildingContext,

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

@@ -0,0 +1,21 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.boot.models;
+
+/**
+ * An enum defining the nature (categorization) of a persistent attribute.
+ *
+ * @see jakarta.persistence.metamodel.Attribute.PersistentAttributeType
+ */
+public enum AttributeNature {
+	BASIC,
+	EMBEDDED,
+	ANY,
+	TO_ONE,
+	ELEMENT_COLLECTION,
+	MANY_TO_ANY,
+	MANY_TO_MANY,
+	ONE_TO_MANY
+}

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

@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.boot.models.categorize.spi;
+package org.hibernate.boot.models;
 
 /**
  * JPA defines 2 ways events callbacks can happen...

hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/JpaEventListenerStyle.java renamed to hibernate-core/src/main/java/org/hibernate/boot/models/JpaEventListenerStyle.java

@@ -6,20 +6,21 @@
 
 import java.util.EnumSet;
 
-import org.hibernate.MappingException;
-import org.hibernate.boot.models.categorize.spi.AttributeMetadata;
+import org.hibernate.AnnotationException;
+import org.hibernate.Incubating;
 
 /**
- * Condition where an attribute indicates multiple {@linkplain AttributeMetadata.AttributeNature natures}
+ * Condition where an attribute indicates multiple {@linkplain AttributeNature natures}
  *
  * @author Steve Ebersole
  */
-public class MultipleAttributeNaturesException extends MappingException {
+@Incubating
+public class MultipleAttributeNaturesException extends AnnotationException {
 	private final String attributeName;
 
 	public MultipleAttributeNaturesException(
 			String attributeName,
-			EnumSet<AttributeMetadata.AttributeNature> natures) {
+			EnumSet<AttributeNature> natures) {
 		super( craftMessage( attributeName, natures ) );
 		this.attributeName = attributeName;
 	}
@@ -28,12 +29,12 @@ public String getAttributeName() {
 		return attributeName;
 	}
 
-	private static String craftMessage(String attributeName, EnumSet<AttributeMetadata.AttributeNature> natures) {
+	private static String craftMessage(String attributeName, EnumSet<AttributeNature> natures) {
 		final StringBuilder buffer = new StringBuilder( "Attribute `" )
 				.append( attributeName )
 				.append( "` expressed multiple natures [" );
 		String separator = "";
-		for ( AttributeMetadata.AttributeNature nature : natures ) {
+		for ( AttributeNature nature : natures ) {
 			buffer.append( separator );
 			buffer.append( nature.name() );
 			separator = ",";