HHH-19573 Special case primitive type names for plural basic types

Author: beikov

hibernate-core/src/main/java/org/hibernate/type/BasicArrayType.java

@@ -26,7 +26,20 @@ public class BasicArrayType<T,E>
 	public BasicArrayType(BasicType<E> baseDescriptor, JdbcType arrayJdbcType, JavaType<T> arrayTypeDescriptor) {
 		super( arrayJdbcType, arrayTypeDescriptor );
 		this.baseDescriptor = baseDescriptor;
-		this.name = baseDescriptor.getName() + "[]";
+		this.name = determineArrayTypeName( baseDescriptor );
+	}
+
+	static String determineElementTypeName(BasicType<?> baseDescriptor) {
+		final String elementName = baseDescriptor.getName();
+		return switch ( elementName ) {
+			case "boolean", "byte", "char", "short", "int", "long", "float", "double" ->
+					Character.toUpperCase( elementName.charAt( 0 ) ) + elementName.substring( 1 );
+			default -> elementName;
+		};
+	}
+
+	static String determineArrayTypeName(BasicType<?> baseDescriptor) {
+		return determineElementTypeName( baseDescriptor ) + "[]";
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/type/BasicCollectionType.java

@@ -12,6 +12,8 @@
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
 
+import static org.hibernate.type.BasicArrayType.determineElementTypeName;
+
 /**
  * A type that maps between {@link java.sql.Types#ARRAY ARRAY} and {@code Collection<T>}
  *
@@ -34,18 +36,19 @@ public BasicCollectionType(
 	}
 
 	private static String determineName(BasicCollectionJavaType<?, ?> collectionTypeDescriptor, BasicType<?> baseDescriptor) {
+		final String elementTypeName = determineElementTypeName( baseDescriptor );
 		switch ( collectionTypeDescriptor.getSemantics().getCollectionClassification() ) {
 			case BAG:
 			case ID_BAG:
-				return "Collection<" + baseDescriptor.getName() + ">";
+				return "Collection<" + elementTypeName + ">";
 			case LIST:
-				return "List<" + baseDescriptor.getName() + ">";
+				return "List<" + elementTypeName + ">";
 			case SET:
-				return "Set<" + baseDescriptor.getName() + ">";
+				return "Set<" + elementTypeName + ">";
 			case SORTED_SET:
-				return "SortedSet<" + baseDescriptor.getName() + ">";
+				return "SortedSet<" + elementTypeName + ">";
 			case ORDERED_SET:
-				return "OrderedSet<" + baseDescriptor.getName() + ">";
+				return "OrderedSet<" + elementTypeName + ">";
 		}
 		return null;
 	}

hibernate-core/src/main/java/org/hibernate/type/ConvertedBasicArrayType.java

@@ -14,6 +14,8 @@
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
 
+import static org.hibernate.type.BasicArrayType.determineArrayTypeName;
+
 /**
  * Given a {@link BasicValueConverter} for an array type,
  *
@@ -48,7 +50,7 @@ public ConvertedBasicArrayType(
 		this.jdbcValueExtractor = (ValueExtractor<T>) arrayJdbcType.getExtractor( converter.getRelationalJavaType() );
 		this.jdbcLiteralFormatter = (JdbcLiteralFormatter<T>) arrayJdbcType.getJdbcLiteralFormatter( converter.getRelationalJavaType() );
 		this.baseDescriptor = baseDescriptor;
-		this.name = baseDescriptor.getName() + "[]";
+		this.name = determineArrayTypeName( baseDescriptor );
 	}
 
 	@Override

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ByteArrayMappingTests.java

@@ -63,7 +63,7 @@ public void verifyMappings(SessionFactoryScope scope) {
 		}
 
 		{
-			final BasicAttributeMapping primitive = (BasicAttributeMapping) entityDescriptor.findAttributeMapping("wrapper");
+			final BasicAttributeMapping primitive = (BasicAttributeMapping) entityDescriptor.findAttributeMapping("boxed");
 			final JdbcMapping jdbcMapping = primitive.getJdbcMapping();
 			assertThat(jdbcMapping.getJavaTypeDescriptor().getJavaTypeClass(), equalTo(Byte[].class));
 			if ( dialect.supportsStandardArrays() ) {
@@ -132,7 +132,7 @@ public static class EntityOfByteArrays {
 		//tag::basic-bytearray-example[]
 		// mapped as VARBINARY
 		private byte[] primitive;
-		private Byte[] wrapper;
+		private Byte[] boxed;
 		@JavaType( ByteArrayJavaType.class )
 		private Byte[] wrapperOld;
 
@@ -149,15 +149,15 @@ public EntityOfByteArrays() {
 		public EntityOfByteArrays(Integer id, byte[] primitive, Byte[] wrapper) {
 			this.id = id;
 			this.primitive = primitive;
-			this.wrapper = wrapper;
+			this.boxed = wrapper;
 			this.primitiveLob = primitive;
 			this.wrapperLob = wrapper;
 		}
 
 		public EntityOfByteArrays(Integer id, byte[] primitive, Byte[] wrapper, byte[] primitiveLob, Byte[] wrapperLob) {
 			this.id = id;
 			this.primitive = primitive;
-			this.wrapper = wrapper;
+			this.boxed = wrapper;
 			this.primitiveLob = primitiveLob;
 			this.wrapperLob = wrapperLob;
 		}