HHH-19276 - Add test for issue

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/enums/OrdinalEnumTypeTest.java

@@ -10,6 +10,9 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.type.BasicType;
+import org.hibernate.type.SqlTypes;
 import org.hibernate.type.descriptor.JdbcBindingLogging;
 
 import org.hibernate.testing.orm.junit.JiraKey;
@@ -19,10 +22,15 @@
 import org.hibernate.testing.orm.junit.MessageKeyWatcher;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.spi.TypeConfiguration;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
@@ -134,6 +142,41 @@ public void hqlTestEnumQualifiedShortHandSyntaxInPredicate(SessionFactoryScope s
 		);
 	}
 
+	@Test
+	@Jira( "https://hibernate.atlassian.net/browse/HHH-19276" )
+	public void testNoEnumMemoryLeak(SessionFactoryScope scope) {
+		final List<HairColor> colors = List.of(HairColor.BLACK, HairColor.BROWN);
+		final TypeConfiguration typeConfiguration = scope.getSessionFactory().getTypeConfiguration();
+		final JavaType<HairColor> hairColorJavaType = getEnumJavaType( typeConfiguration, HairColor.class );
+		final BasicType<HairColor> hairColorBasicType = getBasicTypeForEnumJavaType( typeConfiguration, HairColor.class );
+		// Basically, multiple runs of this should not result in the creation of additional
+		// EnumJavaTypes (or BasicTypes for that matter), as was the case before the fix for HHH-19276
+		for (int counter = 1; counter <= 10; counter++ ) {
+			scope.inTransaction(
+					(session) -> {
+						var result = session.createNativeQuery(
+										"SELECT * FROM Person WHERE hairColor in (:colors) FOR UPDATE SKIP LOCKED",
+										Person.class
+								)
+								.setParameter( "colors", colors )
+								.list();
+					}
+			);
+			JavaType<HairColor> enumJavaType = getEnumJavaType( typeConfiguration, HairColor.class );
+			BasicType<HairColor> basicType = getBasicTypeForEnumJavaType( typeConfiguration, HairColor.class );
+			assertSame( hairColorJavaType, enumJavaType );
+			assertSame( hairColorBasicType, basicType );
+		}
+	}
+
+	private <T> JavaType<T> getEnumJavaType(TypeConfiguration typeConfiguration, Class<T> enumJavaType) {
+		return typeConfiguration.getJavaTypeRegistry().resolveDescriptor(enumJavaType);
+	}
+
+	private <T> BasicType<T> getBasicTypeForEnumJavaType(TypeConfiguration typeConfiguration, Class<T> enumJavaType) {
+		return typeConfiguration.getBasicTypeRegistry().resolve(enumJavaType, SqlTypes.TINYINT );
+	}
+
 	@Entity(name = "Person")
 	public static class Person {