Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 25, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion hibernate-core/src/main/java/org/hibernate/type/BasicArrayType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 8 additions & 5 deletions hibernate-core/src/main/java/org/hibernate/type/BasicCollectionType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>}
*
Expand All @@ -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;
}
Expand Down
4 changes: 3 additions & 1 deletion hibernate-core/src/main/java/org/hibernate/type/ConvertedBasicArrayType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
*
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ByteArrayMappingTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() ) {
Expand Down Expand Up @@ -130,7 +130,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;

Expand All @@ -147,15 +147,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;
}
Expand Down