Skip to content

Commit f9bdf86

Browse files
committed
use isBlank() instead of isEmpty() to better handle blank column names
1 parent c5d6546 commit f9bdf86

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@ private static String getTableName(
760760
jakarta.persistence.Column column,
761761
Database database) {
762762
final String table = column.table();
763-
return table.isEmpty()
763+
return table.isBlank()
764764
? ""
765765
: database.getJdbcEnvironment().getIdentifierHelper().toIdentifier( table ).render();
766766
}
@@ -769,7 +769,7 @@ private static String getSqlType(
769769
MetadataBuildingContext context,
770770
jakarta.persistence.Column column) {
771771
final String columnDefinition = column.columnDefinition();
772-
return columnDefinition.isEmpty()
772+
return columnDefinition.isBlank()
773773
? null
774774
: context.getObjectNameNormalizer().applyGlobalQuoting( columnDefinition );
775775
}
@@ -844,7 +844,7 @@ private static String logicalColumnName(
844844

845845
private static String getColumnName(Database database, jakarta.persistence.Column column) {
846846
final String name = column.name();
847-
return name.isEmpty()
847+
return name.isBlank()
848848
? null
849849
: database.getJdbcEnvironment().getIdentifierHelper().toIdentifier( name ).render();
850850
}
@@ -1040,7 +1040,7 @@ private void applyColumnOptions(jakarta.persistence.Column column) {
10401040
}
10411041

10421042
private void applyColumnComment(jakarta.persistence.Column column) {
1043-
if ( !column.comment().isEmpty() ) {
1043+
if ( !column.comment().isBlank() ) {
10441044
comment = column.comment();
10451045
}
10461046
}

hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedDiscriminatorColumn.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ public static AnnotatedDiscriminatorColumn buildDiscriminatorColumn(
6565
else if ( discriminatorColumn != null ) {
6666
discriminatorType = discriminatorColumn.discriminatorType();
6767
column.setImplicit( false );
68-
if ( !discriminatorColumn.columnDefinition().isEmpty() ) {
68+
if ( !discriminatorColumn.columnDefinition().isBlank() ) {
6969
column.setSqlType( discriminatorColumn.columnDefinition() );
7070
}
71-
if ( !discriminatorColumn.name().isEmpty() ) {
71+
if ( !discriminatorColumn.name().isBlank() ) {
7272
column.setLogicalColumnName( discriminatorColumn.name() );
7373
}
7474
column.setNullable( false );
@@ -82,7 +82,7 @@ else if ( discriminatorColumn != null ) {
8282
column.setLogicalColumnName( columnOverride.name() );
8383

8484
final String columnDefinition = columnOverride.columnDefinition();
85-
if ( !columnDefinition.isEmpty() ) {
85+
if ( !columnDefinition.isBlank() ) {
8686
column.setSqlType( columnDefinition );
8787
}
8888
}

hibernate-core/src/main/java/org/hibernate/boot/model/naming/Identifier.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import org.hibernate.dialect.Dialect;
1010
import org.hibernate.internal.util.StringHelper;
1111

12+
import static org.hibernate.internal.util.StringHelper.isBlank;
13+
1214
/**
1315
* Models an identifier (name), which may or may not be quoted.
1416
*
@@ -75,7 +77,7 @@ public static Identifier toIdentifier(String text, boolean quote) {
7577
* @return The identifier form, or {@code null} if text was {@code null}
7678
*/
7779
public static Identifier toIdentifier(String text, boolean quote, boolean quoteOnNonIdentifierChar) {
78-
if ( StringHelper.isEmpty( text ) ) {
80+
if ( isBlank( text ) ) {
7981
return null;
8082
}
8183
int start = 0;

0 commit comments

Comments
 (0)