use isBlank() instead of isEmpty() to better handle annotation values

Author: gavinking

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

@@ -176,12 +176,12 @@ public void applyJoinAnnotation(JoinColumn joinColumn, String defaultName) {
 			setImplicit( false );
 
 			final String name = joinColumn.name();
-			if ( !name.isEmpty() ) {
+			if ( !name.isBlank() ) {
 				setLogicalColumnName( name );
 			}
 
 			final String columnDefinition = joinColumn.columnDefinition();
-			if ( !columnDefinition.isEmpty() ) {
+			if ( !columnDefinition.isBlank() ) {
 				setSqlType( getBuildingContext().getObjectNameNormalizer().applyGlobalQuoting( columnDefinition ) );
 			}
 
@@ -194,7 +194,7 @@ public void applyJoinAnnotation(JoinColumn joinColumn, String defaultName) {
 			setOptions( joinColumn.options() );
 
 			final String table = joinColumn.table();
-			if ( table.isEmpty() ) {
+			if ( table.isBlank() ) {
 				setExplicitTableName( "" );
 			}
 			else {
@@ -248,11 +248,10 @@ private static AnnotatedJoinColumn buildExplicitInheritanceJoinColumn(
 		}
 
 		final ObjectNameNormalizer normalizer = context.getObjectNameNormalizer();
-		final String columnDef = columnDefinition.isEmpty() ? null
-				: normalizer.toDatabaseIdentifierText( columnDefinition );
-		final String logicalColumnName = columnName.isEmpty()
-				? normalizer.normalizeIdentifierQuotingAsString( defaultColumnName )
-				: normalizer.normalizeIdentifierQuotingAsString( columnName );
+		final String columnDef =
+				columnDefinition.isBlank() ? null : normalizer.toDatabaseIdentifierText( columnDefinition );
+		final String logicalColumnName =
+				normalizer.normalizeIdentifierQuotingAsString( columnName.isBlank() ? defaultColumnName : columnName );
 		final AnnotatedJoinColumn column = new AnnotatedJoinColumn();
 		column.setSqlType( columnDef );
 		column.setLogicalColumnName( logicalColumnName );
@@ -321,8 +320,9 @@ public void linkValueUsingDefaultColumnNaming(
 			Column referencedColumn,
 			PersistentClass referencedEntity,
 			SimpleValue value) {
-		final String logicalReferencedColumn = getBuildingContext().getMetadataCollector()
-				.getLogicalColumnName( referencedEntity.getTable(), referencedColumn.getQuotedName() );
+		final String logicalReferencedColumn =
+				getBuildingContext().getMetadataCollector()
+						.getLogicalColumnName( referencedEntity.getTable(), referencedColumn.getQuotedName() );
 		final String columnName = defaultColumnName( columnIndex, referencedEntity, logicalReferencedColumn );
 		//yuk side effect on an implicit column
 		setLogicalColumnName( columnName );
@@ -411,11 +411,10 @@ protected void addColumnBinding(SimpleValue value) {
 					? unquotedLogColName
 					: getParent().getPropertyName() + '_' + unquotedRefColumn;
 			final InFlightMetadataCollector collector = getBuildingContext().getMetadataCollector();
-			final String logicalCollectionColumnName = collector.getDatabase()
-					.getJdbcEnvironment()
-					.getIdentifierHelper()
-					.toIdentifier( collectionColName, isLogicalColumnQuoted )
-					.render();
+			final String logicalCollectionColumnName =
+					collector.getDatabase().getJdbcEnvironment().getIdentifierHelper()
+							.toIdentifier( collectionColName, isLogicalColumnQuoted )
+							.render();
 			collector.addColumnNameBinding( value.getTable(), logicalCollectionColumnName, getMappingColumn() );
 		}
 	}

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

@@ -45,7 +45,8 @@
 
 import static org.hibernate.boot.model.internal.BinderHelper.findReferencedColumnOwner;
 import static org.hibernate.boot.model.internal.BinderHelper.getRelativePath;
-import static org.hibernate.internal.util.StringHelper.isNotEmpty;
+import static org.hibernate.internal.util.StringHelper.isBlank;
+import static org.hibernate.internal.util.StringHelper.isNotBlank;
 import static org.hibernate.internal.util.StringHelper.isQuoted;
 import static org.hibernate.internal.util.StringHelper.nullIfEmpty;
 import static org.hibernate.internal.util.StringHelper.qualify;
@@ -94,7 +95,7 @@ public static AnnotatedJoinColumns buildJoinColumnsOrFormulas(
 			final JoinFormula formula = columnOrFormula.formula();
 			final JoinColumn column = columnOrFormula.column();
 			final String annotationString = formula.value();
-			if ( isNotEmpty( annotationString ) ) {
+			if ( isNotBlank( annotationString ) ) {
 				AnnotatedJoinColumn.buildJoinFormula( formula, parent );
 			}
 			else {
@@ -114,8 +115,8 @@ private static void handlePropertyRef(MemberDetails attributeMember, AnnotatedJo
 		}
 
 		final String referencedPropertyName = propertyRefUsage.value();
-		if ( StringHelper.isEmpty( referencedPropertyName ) ) {
-			throw new AnnotationException( "@PropertyRef did not specify target attribute name : " + attributeMember );
+		if ( isBlank( referencedPropertyName ) ) {
+			throw new AnnotationException( "@PropertyRef did not specify target attribute name: " + attributeMember );
 		}
 		parent.referencedProperty = referencedPropertyName;
 	}
@@ -165,7 +166,7 @@ public static AnnotatedJoinColumns buildJoinColumnsWithDefaultColumnSuffix(
 			PropertyData inferredData,
 			String defaultColumnSuffix,
 			MetadataBuildingContext context) {
-		assert mappedBy == null || !mappedBy.isEmpty();
+		assert mappedBy == null || !mappedBy.isBlank();
 		final String propertyName = inferredData.getPropertyName();
 		final String path = qualify( propertyHolder.getPath(), propertyName );
 		final JoinColumn[] overrides = propertyHolder.getOverriddenJoinColumn( path );