modernize enums in metamodel package

Author: gavinking

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

@@ -13,60 +13,64 @@
  *
  * @since 6.0
  *
+ * @see PersistentAttributeType
  */
 @Incubating
 public enum AttributeClassification {
 	/**
 	 * @see jakarta.persistence.Basic
 	 */
-	BASIC( PersistentAttributeType.BASIC ),
+	BASIC,
 
 	/**
 	 * @see jakarta.persistence.Embedded
 	 */
 
-	EMBEDDED( PersistentAttributeType.EMBEDDED ),
+	EMBEDDED,
 
 	/**
 	 * @see org.hibernate.annotations.Any
 	 */
-	ANY( null ),
+	ANY,
 
 	/**
 	 * @see jakarta.persistence.OneToOne
 	 */
-	ONE_TO_ONE( PersistentAttributeType.ONE_TO_ONE ),
+	ONE_TO_ONE,
 
 	/**
 	 * @see jakarta.persistence.ManyToOne
 	 */
-	MANY_TO_ONE( PersistentAttributeType.MANY_TO_ONE ),
+	MANY_TO_ONE,
 
 	/**
 	 * @see jakarta.persistence.ElementCollection
 	 */
-	ELEMENT_COLLECTION( PersistentAttributeType.ELEMENT_COLLECTION ),
+	ELEMENT_COLLECTION,
 
 	/**
 	 * @see jakarta.persistence.OneToMany
 	 */
-	ONE_TO_MANY( PersistentAttributeType.ONE_TO_MANY ),
+	ONE_TO_MANY,
 
 	/**
 	 * @see jakarta.persistence.ManyToMany
 	 */
-	MANY_TO_MANY( PersistentAttributeType.MANY_TO_MANY );
-
-	private final PersistentAttributeType jpaClassification;
-
-	AttributeClassification(PersistentAttributeType jpaClassification) {
-		this.jpaClassification = jpaClassification;
-	}
+	MANY_TO_MANY;
 
 	/**
 	 * The associated {@link PersistentAttributeType}, if one
 	 */
 	public PersistentAttributeType getJpaClassification() {
-		return jpaClassification;
+		return switch ( this ) {
+			case BASIC -> PersistentAttributeType.BASIC;
+			case EMBEDDED -> PersistentAttributeType.EMBEDDED;
+			case ONE_TO_ONE -> PersistentAttributeType.ONE_TO_ONE;
+			case MANY_TO_ONE -> PersistentAttributeType.MANY_TO_ONE;
+			case ELEMENT_COLLECTION -> PersistentAttributeType.ELEMENT_COLLECTION;
+			case ONE_TO_MANY -> PersistentAttributeType.ONE_TO_MANY;
+			case MANY_TO_MANY -> PersistentAttributeType.MANY_TO_MANY;
+			case ANY -> null;
+		};
 	}
 }

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

@@ -25,30 +25,30 @@ public enum CollectionClassification {
 	 * An Object or primitive array.  Roughly follows the semantics
 	 * of {@link #LIST}
 	 */
-	ARRAY( PluralAttribute.CollectionType.COLLECTION, true ),
+	ARRAY,
 
 	/**
 	 * A non-unique, unordered collection.  Represented
 	 * as {@link java.util.Collection} or {@link java.util.List}
 	 */
-	BAG( PluralAttribute.CollectionType.COLLECTION, false ),
+	BAG,
 
 	/**
 	 * A {@link #BAG} with a generated id for each element
 	 */
-	ID_BAG( PluralAttribute.CollectionType.COLLECTION, false ),
+	ID_BAG,
 
 	/**
 	 * A non-unique, ordered collection following the requirements of {@link java.util.List}
 	 *
 	 * @see org.hibernate.cfg.AvailableSettings#DEFAULT_LIST_SEMANTICS
 	 */
-	LIST( PluralAttribute.CollectionType.LIST, true ),
+	LIST,
 
 	/**
 	 * A unique, unordered collection following the requirements of {@link java.util.Set}
 	 */
-	SET( PluralAttribute.CollectionType.SET, false ),
+	SET,
 
 	/**
 	 * A sorted {@link #SET} using either natural sorting of the elements or a
@@ -58,7 +58,7 @@ public enum CollectionClassification {
 	 * @see org.hibernate.annotations.SortNatural
 	 * @see org.hibernate.annotations.SortComparator
 	 */
-	SORTED_SET( PluralAttribute.CollectionType.SET, false ),
+	SORTED_SET,
 
 	/**
 	 * A {@link #SET} that is ordered using an order-by fragment
@@ -69,12 +69,12 @@ public enum CollectionClassification {
 	 * @see jakarta.persistence.OrderBy
 	 * @see org.hibernate.annotations.SQLOrder
 	 */
-	ORDERED_SET( PluralAttribute.CollectionType.SET, false ),
+	ORDERED_SET,
 
 	/**
 	 * A collection following the semantics of {@link java.util.Map}
 	 */
-	MAP( PluralAttribute.CollectionType.MAP, true ),
+	MAP,
 
 	/**
 	 * A sorted {@link #MAP} using either natural sorting of the keys or a
@@ -84,7 +84,7 @@ public enum CollectionClassification {
 	 * @see org.hibernate.annotations.SortNatural
 	 * @see org.hibernate.annotations.SortComparator
 	 */
-	SORTED_MAP( PluralAttribute.CollectionType.MAP, true ),
+	SORTED_MAP,
 
 	/**
 	 * A {@link #MAP} that is ordered using an order-by fragment
@@ -95,22 +95,22 @@ public enum CollectionClassification {
 	 * @see jakarta.persistence.OrderBy
 	 * @see org.hibernate.annotations.SQLOrder
 	 */
-	ORDERED_MAP( PluralAttribute.CollectionType.MAP, true );
-
-	private final PluralAttribute.CollectionType jpaClassification;
-	private final boolean isIndexed;
-
-	CollectionClassification(PluralAttribute.CollectionType jpaClassification, boolean isIndexed) {
-		this.jpaClassification = jpaClassification;
-		this.isIndexed = isIndexed;
-	}
+	ORDERED_MAP;
 
 	public PluralAttribute.CollectionType toJpaClassification() {
-		return jpaClassification;
+		return switch ( this ) {
+			case ARRAY, BAG, ID_BAG -> PluralAttribute.CollectionType.COLLECTION;
+			case LIST -> PluralAttribute.CollectionType.LIST;
+			case SET, SORTED_SET, ORDERED_SET -> PluralAttribute.CollectionType.SET;
+			case MAP, SORTED_MAP, ORDERED_MAP -> PluralAttribute.CollectionType.MAP;
+		};
 	}
 
 	public boolean isIndexed() {
-		return isIndexed;
+		return switch ( this ) {
+			case ARRAY, LIST, MAP, SORTED_MAP, ORDERED_MAP -> true;
+			default -> false;
+		};
 	}
 
 	public boolean isRowUpdatePossible() {

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

@@ -5,10 +5,13 @@
 package org.hibernate.metamodel;
 
 /**
- * At the end of the day, any "value mapping" (id, version, attribute, collection element, etc.)
- * can be one of a few classifications.  This defines an enumeration of those classifications.
+ * Any "value mapping" (id, version, attribute, collection element, etc.)
+ * belongs to one of several broad categories. This enumeration is quite
+ * similar to {@link jakarta.persistence.metamodel.Type.PersistenceType}.
  *
  * @author Steve Ebersole
+ *
+ * @see jakarta.persistence.metamodel.Type.PersistenceType
  */
 public enum ValueClassification {
 	/**