HHH-14000 - Allow a custom Type that was registered via Type Contributors to be resolved by its class, not just its name

hibernate-core/src/main/java/org/hibernate/boot/spi/BasicTypeRegistration.java

@@ -6,6 +6,10 @@
  */
 package org.hibernate.boot.spi;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 import org.hibernate.type.BasicType;
 import org.hibernate.type.CompositeCustomType;
 import org.hibernate.type.CustomType;
@@ -25,8 +29,24 @@ public class BasicTypeRegistration {
 
 	public BasicTypeRegistration(BasicType basicType, String[] registrationKeys) {
 		this.basicType = basicType;
+		Class returnedClass = basicType.getReturnedClass();
+
+		if ( returnedClass != null ) {
+			String returnedClassName = returnedClass.getName();
+
+			List<String> registrationKeysList = registrationKeys == null || registrationKeys.length == 0 ?
+					new ArrayList<>() :
+					new ArrayList<>( Arrays.asList( registrationKeys ) );
+
+			if ( !registrationKeysList.contains( returnedClassName ) ) {
+				registrationKeysList.add( returnedClassName );
+			}
+			this.registrationKeys = registrationKeysList.toArray( new String[] {} );
+		}
+		else {
 			this.registrationKeys = registrationKeys;
 		}
+	}
 
 	public BasicTypeRegistration(UserType type, String[] keys) {
 		this( new CustomType( type, keys ), keys );

hibernate-core/src/test/java/org/hibernate/test/type/contributor/ArrayTypeContributorTest.java

@@ -6,14 +6,14 @@
  */
 package org.hibernate.test.type.contributor;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
+import javax.persistence.ColumnResult;
+import javax.persistence.ConstructorResult;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.SqlResultSetMapping;
 
-import org.hibernate.Session;
 import org.hibernate.annotations.Type;
 import org.hibernate.boot.spi.MetadataBuilderContributor;
 import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
@@ -25,13 +25,12 @@ import org.junit.Test;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 /**
  * @author Vlad Mihalcea
  */
-@TestForIssue( jiraKey = "HHH-11409" )
+@TestForIssue(jiraKey = "HHH-11409")
 public class ArrayTypeContributorTest extends BaseEntityManagerFunctionalTestCase {
 
 	@Override
@@ -46,7 +45,8 @@ public class ArrayTypeContributorTest extends BaseEntityManagerFunctionalTestCas
 				(MetadataBuilderContributor) metadataBuilder ->
 						metadataBuilder.applyTypes( (typeContributions, serviceRegistry) -> {
 							typeContributions.contributeType( ArrayType.INSTANCE );
-						} ));
+						} )
+		);
 	}
 
 	@Override
@@ -84,9 +84,33 @@ public class ArrayTypeContributorTest extends BaseEntityManagerFunctionalTestCas
 
 			assertEquals( 1, emails.size() );
 		} );
+
+		doInJPA( this::entityManagerFactory, entityManager -> {
+			List<CorporateUserDTO> emails = entityManager.createNativeQuery(
+					"select " +
+							"	u.userName as userName, " +
+							"	u.emailAddresses as emailAddresses " +
+							"from CorporateUser u " +
+							"where u.userName = :name", "CorporateUserDTO" )
+					.setParameter( "name", "Vlad" )
+					.getResultList();
+
+			assertEquals( 1, emails.size() );
+		} );
 	}
 
 	@Entity(name = "CorporateUser")
+	@SqlResultSetMapping(
+			name = "CorporateUserDTO",
+			classes = @ConstructorResult(
+					targetClass = CorporateUserDTO.class,
+					columns = {
+							@ColumnResult(name = "userName", type = String.class),
+							@ColumnResult(name = "emailAddresses", type = Array.class),
+					}
+			)
+
+	)
 	public static class CorporateUser {
 
 		@Id
@@ -108,6 +132,24 @@ public class ArrayTypeContributorTest extends BaseEntityManagerFunctionalTestCas
 		}
 	}
 
+	public static class CorporateUserDTO {
 
+		private String userName;
+
+		private Array emailAddresses = new Array();
+
+		public CorporateUserDTO(String userName, Array emailAddresses) {
+			this.userName = userName;
+			this.emailAddresses = emailAddresses;
+		}
+
+		public String getUserName() {
+			return userName;
+		}
+
+		public Array getEmailAddresses() {
+			return emailAddresses;
+		}
+	}
 }