remove deprecated and very obsolete EnumType

Author: gavinking

hibernate-core/src/main/java/org/hibernate/type/EnumType.java renamed to hibernate-core/src/test/java/org/hibernate/orm/test/EnumType.java

@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.type;
+package org.hibernate.orm.test;
 
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
@@ -18,8 +18,8 @@
 import org.hibernate.annotations.Nationalized;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.util.ReflectHelper;
+import org.hibernate.type.SqlTypes;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.EnumJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
@@ -31,8 +31,6 @@
 import org.hibernate.usertype.EnhancedUserType;
 import org.hibernate.usertype.LoggableUserType;
 
-import org.jboss.logging.Logger;
-
 import static jakarta.persistence.EnumType.ORDINAL;
 import static jakarta.persistence.EnumType.STRING;
 import static org.hibernate.internal.util.config.ConfigurationHelper.getBoolean;
@@ -49,7 +47,6 @@
 @Deprecated(since="6.2", forRemoval=true)
 public class EnumType<T extends Enum<T>>
 		implements EnhancedUserType<T>, DynamicParameterizedType, LoggableUserType, TypeConfigurationAware, Serializable {
-	private static final Logger LOG = CoreLogging.logger( EnumType.class );
 
 	public static final String ENUM = "enumClass";
 	public static final String NAMED = "useNamed";
@@ -156,14 +153,6 @@ else if ( reader != null ) {
 			jdbcType = descriptor.getRecommendedJdbcType( indicators );
 			isOrdinal = indicators.getEnumeratedType() != STRING;
 		}
-
-		if ( LOG.isDebugEnabled() ) {
-			LOG.debugf(
-					"Using %s-based conversion for Enum %s",
-					isOrdinal() ? "ORDINAL" : "NAMED",
-					enumClass.getName()
-			);
-		}
 	}
 
 	private jakarta.persistence.EnumType getEnumType(ParameterType reader) {

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_types/FirstLetterType.java

@@ -9,13 +9,14 @@
 import java.sql.SQLException;
 import java.sql.Types;
 
+import org.hibernate.orm.test.EnumType;
 import org.hibernate.orm.test.annotations.enumerated.enums.FirstLetter;
 import org.hibernate.type.descriptor.WrapperOptions;
 
 /**
  * @author Janario Oliveira
  */
-public class FirstLetterType extends org.hibernate.type.EnumType<FirstLetter> {
+public class FirstLetterType extends EnumType<FirstLetter> {
 
 	@Override
 	public int getSqlType() {

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/custom_types/LastNumberType.java

@@ -9,13 +9,14 @@
 import java.sql.SQLException;
 import java.sql.Types;
 
+import org.hibernate.orm.test.EnumType;
 import org.hibernate.orm.test.annotations.enumerated.enums.LastNumber;
 import org.hibernate.type.descriptor.WrapperOptions;
 
 /**
  * @author Janario Oliveira
  */
-public class LastNumberType extends org.hibernate.type.EnumType<LastNumber> {
+public class LastNumberType extends EnumType<LastNumber> {
 
 	@Override
 	public int getSqlType() {

hibernate-core/src/test/java/org/hibernate/orm/test/cdi/lifecycle/ExtendedBeanManagerNotAvailableDuringTypeResolutionTest.java

@@ -64,7 +64,7 @@ public static class TheEntity {
 				"        </id>\n" +
 				"        <property name=\"name\" />\n" +
 				"        <property name=\"myEnum\" >\n" +
-				"            <type name=\"org.hibernate.type.EnumType\">\n" +
+				"            <type name=\"org.hibernate.orm.test.EnumType\">\n" +
 				"                <param name=\"enumClass\">" + MyEnum.class.getName() + "</param>\n" +
 				"            </type>\n" +
 				"        </property>\n" +

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/typedef/NamedEnumUserType.java

@@ -6,7 +6,7 @@
 
 import java.util.Properties;
 
-import org.hibernate.type.EnumType;
+import org.hibernate.orm.test.EnumType;
 
 /**
  * A simple user type where we force enums to be saved by name, not ordinal

hibernate-core/src/test/resources/org/hibernate/orm/test/mapping/converted/enums/Person.hbm.xml

@@ -16,20 +16,20 @@
     </id>
 
     <property name="gender" not-null="true">
-		<type name="org.hibernate.type.EnumType">
+		<type name="org.hibernate.orm.test.EnumType">
 			<param name="enumClass">org.hibernate.orm.test.mapping.converted.enums.Gender</param>
 			<param name="type">12</param>
 		</type>
 	</property>
 
     <property name="hairColor" not-null="true">
-		<type name="org.hibernate.type.EnumType">
+		<type name="org.hibernate.orm.test.EnumType">
 			<param name="enumClass">org.hibernate.orm.test.mapping.converted.enums.HairColor</param>
 		</type>
 	</property>
 
     <property name="originalHairColor">
-        <type name="org.hibernate.type.EnumType">
+        <type name="org.hibernate.orm.test.EnumType">
             <param name="enumClass">org.hibernate.orm.test.mapping.converted.enums.HairColor</param>
             <param name="type">12</param>
         </type>

hibernate-core/src/test/resources/org/hibernate/orm/test/mapping/converted/enums/mappings.hbm.xml

@@ -12,13 +12,13 @@
             <generator class="increment" />
         </id>
         <property name="enum1">
-            <type name="org.hibernate.type.EnumType">
+            <type name="org.hibernate.orm.test.EnumType">
                 <!--<param name="useNamed">true</param>-->
                 <param name="enumClass">org.hibernate.orm.test.mapping.converted.enums.UnspecifiedEnumTypeEntity$E1</param>
             </type>
         </property>
         <property name="enum2">
-            <type name="org.hibernate.type.EnumType">
+            <type name="org.hibernate.orm.test.EnumType">
                 <!--<param name="useNamed">false</param>-->
                 <param name="enumClass">org.hibernate.orm.test.mapping.converted.enums.UnspecifiedEnumTypeEntity$E2</param>
             </type>

hibernate-core/src/test/resources/org/hibernate/orm/test/quote/DataPoint.hbm.xml

@@ -11,7 +11,7 @@
         "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" >
 
 <hibernate-mapping package="org.hibernate.orm.test.quote">
-	<typedef name="enumType" class="org.hibernate.type.EnumType">
+	<typedef name="enumType" class="org.hibernate.orm.test.EnumType">
 		<param name="enumClass">org.hibernate.orm.test.quote.DataPoint$DataPointEnum</param>
 	</typedef>
 

hibernate-core/src/test/resources/org/hibernate/query/hhh12076/Settlement.hbm.xml

@@ -36,7 +36,7 @@
         </property>
         <property name="status">
             <column name="status" not-null="true"/>
-            <type name="org.hibernate.type.EnumType">
+            <type name="org.hibernate.orm.test.EnumType">
                 <param name="type">12</param>
                 <param name="enumClass">org.hibernate.orm.test.query.hhh12076.SettlementStatus</param>
             </type>

hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/BasicMetadataGenerator.java

@@ -14,8 +14,6 @@
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.Value;
 import org.hibernate.type.BasicType;
-import org.hibernate.type.CustomType;
-import org.hibernate.type.EnumType;
 import org.hibernate.type.Type;
 
 /**
@@ -58,21 +56,6 @@ public boolean addBasic(
 		return false;
 	}
 
-	private void mapEnumerationType(TypeSpecification typeDefinition, EnumType type, Properties parameters) {
-		if ( parameters.getProperty( EnumType.ENUM ) != null ) {
-			typeDefinition.setParameter( EnumType.ENUM, parameters.getProperty( EnumType.ENUM ) );
-		}
-		else {
-			typeDefinition.setParameter( EnumType.ENUM, type.getEnumClass().getName() );
-		}
-		if ( parameters.getProperty( EnumType.NAMED ) != null ) {
-			typeDefinition.setParameter( EnumType.NAMED, parameters.getProperty( EnumType.NAMED ) );
-		}
-		else {
-			typeDefinition.setParameter( EnumType.NAMED, Boolean.toString( !type.isOrdinal() ) );
-		}
-	}
-
 	private boolean isAddNestedType(Value value) {
 		if ( value instanceof SimpleValue simpleValue ) {
 			return simpleValue.getTypeParameters() != null;
@@ -99,19 +82,12 @@ private void applyNestedType(SimpleValue value, BasicAttribute attribute) {
 		final TypeSpecification typeSpecification = new TypeSpecification( typeName );
 		attribute.setType( typeSpecification );
 
-		Type type = value.getType();
-		if ( type instanceof CustomType && ((CustomType<?>) type).getUserType() instanceof EnumType ) {
-			// Proper handling of nasty legacy EnumType
-			mapEnumerationType( typeSpecification, (EnumType) ((CustomType<?>) type).getUserType(), typeParameters );
-		}
-		else {
-			// By default, copying all Hibernate properties
-			for ( Object object : typeParameters.keySet() ) {
-				final String keyType = (String) object;
-				final String property = typeParameters.getProperty( keyType );
-				if ( property != null ) {
-					typeSpecification.setParameter( keyType, property );
-				}
+		// By default, copying all Hibernate properties
+		for ( Object object : typeParameters.keySet() ) {
+			final String keyType = (String) object;
+			final String property = typeParameters.getProperty( keyType );
+			if ( property != null ) {
+				typeSpecification.setParameter( keyType, property );
 			}
 		}
 	}