fix some warnings in IntelliJ (unnecessary StringBuilder)

gavinking · gavinking · commit bd8bf15e00a5 · 2022-01-09T21:58:05.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AnnotatedColumn.java b/hibernate-core/src/main/java/org/hibernate/cfg/AnnotatedColumn.java
@@ -830,10 +830,9 @@ void addUniqueKey(String uniqueKeyName, boolean inSecondPass) {
 
 	@Override
 	public String toString() {
-		return "Ejb3Column" + "{table=" + getTable()
-				+ ", mappingColumn=" + mappingColumn.getName()
-				+ ", insertable=" + insertable
-				+ ", updatable=" + updatable
-				+ ", unique=" + unique + '}';
+		return String.format(
+				"Ejb3Column{table=%s, mappingColumn=%s, insertable=%s, updatable=%s, unique=%s}",
+				getTable(), mappingColumn.getName(), insertable, updatable, unique
+		);
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AnnotatedDiscriminatorColumn.java b/hibernate-core/src/main/java/org/hibernate/cfg/AnnotatedDiscriminatorColumn.java
@@ -85,11 +85,8 @@ else if ( DiscriminatorType.STRING.equals( type ) || type == null ) {
 
 	@Override
 	public String toString() {
-		final StringBuilder sb = new StringBuilder();
-		sb.append( "Ejb3DiscriminatorColumn" );
-		sb.append( "{logicalColumnName'" ).append( getLogicalColumnName() ).append( '\'' );
-		sb.append( ", discriminatorTypeName='" ).append( discriminatorTypeName ).append( '\'' );
-		sb.append( '}' );
-		return sb.toString();
+		return String.format("Ejb3DiscriminatorColumn{logicalColumnName'%s', discriminatorTypeName='%s'}",
+				getLogicalColumnName(), discriminatorTypeName
+		);
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AnnotatedJoinColumn.java b/hibernate-core/src/main/java/org/hibernate/cfg/AnnotatedJoinColumn.java
@@ -972,12 +972,9 @@ public void setMappedBy(String entityName, String jpaEntityName, String logicalT
 
 	@Override
 	public String toString() {
-		final StringBuilder sb = new StringBuilder();
-		sb.append( "Ejb3JoinColumn" );
-		sb.append( "{logicalColumnName='" ).append( getLogicalColumnName() ).append( '\'' );
-		sb.append( ", referencedColumn='" ).append( referencedColumn ).append( '\'' );
-		sb.append( ", mappedBy='" ).append( mappedBy ).append( '\'' );
-		sb.append( '}' );
-		return sb.toString();
+		return String.format(
+				"Ejb3JoinColumn{logicalColumnName='%s', referencedColumn='%s', mappedBy='%s'}",
+				getLogicalColumnName(), referencedColumn, mappedBy
+		);
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/BinderHelper.java b/hibernate-core/src/main/java/org/hibernate/cfg/BinderHelper.java
@@ -133,10 +133,9 @@ public static void createSyntheticPropertyReference(
 			 * We need to shallow copy those properties to mark them
 			 * as non insertable / non updatable
 			 */
-			StringBuilder propertyNameBuffer = new StringBuilder( "_" );
-			propertyNameBuffer.append( associatedClass.getEntityName().replace( '.', '_' ) );
-			propertyNameBuffer.append( "_" ).append( columns[0].getPropertyName().replace( '.', '_' ) );
-			String syntheticPropertyName = propertyNameBuffer.toString();
+			String syntheticPropertyName =
+					"_" + associatedClass.getEntityName().replace('.', '_') +
+					"_" + columns[0].getPropertyName().replace('.', '_');
 			//find properties associated to a certain column
 			Object columnOwner = findColumnOwner( ownerEntity, columns[0].getReferencedColumn(), context );
 			List<Property> properties = findPropertiesByColumns( columnOwner, columns, context );
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/CollectionSecondPass.java b/hibernate-core/src/main/java/org/hibernate/cfg/CollectionSecondPass.java
@@ -73,9 +73,9 @@ abstract public void secondPass(Map persistentClasses, Map inheritedMetas)
 
 	private static String columns(Value val) {
 		StringBuilder columns = new StringBuilder();
-		Iterator iter = val.getColumnIterator();
+		Iterator<Selectable> iter = val.getColumnIterator();
 		while ( iter.hasNext() ) {
-			columns.append( ( (Selectable) iter.next() ).getText() );
+			columns.append( iter.next().getText() );
 			if ( iter.hasNext() ) columns.append( ", " );
 		}
 		return columns.toString();
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/DefaultComponentSafeNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/cfg/DefaultComponentSafeNamingStrategy.java
@@ -29,14 +29,8 @@ public String collectionTableName(
 			String ownerEntity, String ownerEntityTable, String associatedEntity, String associatedEntityTable,
 			String propertyName
 	) {
-		return tableName(
-				new StringBuilder( ownerEntityTable ).append( "_" )
-						.append(
-								associatedEntityTable != null ?
-										associatedEntityTable :
-										addUnderscores( propertyName )
-						).toString()
-		);
+		String entityTableName = associatedEntityTable != null ? associatedEntityTable : addUnderscores(propertyName);
+		return tableName( ownerEntityTable + "_" + entityTableName );
 	}
 
 
@@ -61,12 +55,8 @@ public String logicalCollectionTableName(
 			return tableName;
 		}
 		else {
-			return new StringBuilder( ownerEntityTable ).append( "_" )
-					.append(
-							associatedEntityTable != null ?
-									associatedEntityTable :
-									propertyName
-					).toString();
+			String entityTableName = associatedEntityTable != null ? associatedEntityTable : propertyName;
+			return ownerEntityTable + "_" + entityTableName;
 		}
 
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/DefaultNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/cfg/DefaultNamingStrategy.java
@@ -97,12 +97,10 @@ public String logicalCollectionTableName(String tableName,
 			return tableName;
 		}
 		else {
-			return new StringBuilder(ownerEntityTable).append("_")
-					.append(
-						associatedEntityTable != null ?
-						associatedEntityTable :
-						StringHelper.unqualify( propertyName )
-					).toString();
+			String entityTableName = associatedEntityTable != null
+					? associatedEntityTable
+					: StringHelper.unqualify(propertyName);
+			return ownerEntityTable + "_" + entityTableName;
 		}
 	}
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/ImprovedNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/cfg/ImprovedNamingStrategy.java
@@ -111,12 +111,10 @@ public String logicalCollectionTableName(String tableName,
 			return tableName;
 		}
 		else {
-			return new StringBuilder(ownerEntityTable).append("_")
-					.append(
-						associatedEntityTable != null ?
-						associatedEntityTable :
-						StringHelper.unqualify( propertyName )
-					).toString();
+			String entityTableName = associatedEntityTable != null
+					? associatedEntityTable
+					: StringHelper.unqualify(propertyName);
+			return ownerEntityTable + "_" + entityTableName;
 		}
 	}
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/PersistenceStandardNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/cfg/PersistenceStandardNamingStrategy.java
@@ -38,14 +38,10 @@ public String collectionTableName(
 			String ownerEntity, String ownerEntityTable, String associatedEntity, String associatedEntityTable,
 			String propertyName
 	) {
-		return tableName(
-				new StringBuilder( ownerEntityTable ).append( "_" )
-						.append(
-								associatedEntityTable != null ?
-										associatedEntityTable :
-										StringHelper.unqualify( propertyName )
-						).toString()
-		);
+		String entityTableName = associatedEntityTable != null
+				? associatedEntityTable
+				: StringHelper.unqualify(propertyName);
+		return tableName( ownerEntityTable + "_" + entityTableName );
 	}
 
 	public String joinKeyColumnName(String joinedColumn, String joinedTable) {
@@ -72,12 +68,10 @@ public String logicalCollectionTableName(
 			return tableName;
 		}
 		else {
-			return new StringBuilder( ownerEntityTable ).append( "_" )
-					.append(
-							associatedEntityTable != null ?
-									associatedEntityTable :
-									StringHelper.unqualify( propertyName )
-					).toString();
+			String entityTableName = associatedEntityTable != null
+					? associatedEntityTable
+					: StringHelper.unqualify(propertyName);
+			return ownerEntityTable + "_" + entityTableName;
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/PropertyInferredData.java b/hibernate-core/src/main/java/org/hibernate/cfg/PropertyInferredData.java
@@ -28,12 +28,7 @@ public class PropertyInferredData implements PropertyData {
 
 	@Override
 	public String toString() {
-		final StringBuilder sb = new StringBuilder();
-		sb.append( "PropertyInferredData" );
-		sb.append( "{property=" ).append( property );
-		sb.append( ", declaringClass=" ).append( declaringClass );
-		sb.append( '}' );
-		return sb.toString();
+		return String.format( "PropertyInferredData{property=%s, declaringClass=%s}", property, declaringClass );
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -830,10 +830,9 @@ void addUniqueKey(String uniqueKeyName, boolean inSecondPass) {`
`830`	`830`
`831`	`831`	`@Override`
`832`	`832`	`public String toString() {`
`833`		`- return "Ejb3Column" + "{table=" + getTable()`
`834`		`- + ", mappingColumn=" + mappingColumn.getName()`
`835`		`- + ", insertable=" + insertable`
`836`		`- + ", updatable=" + updatable`
`837`		`- + ", unique=" + unique + '}';`
	`833`	`+ return String.format(`
	`834`	`+ "Ejb3Column{table=%s, mappingColumn=%s, insertable=%s, updatable=%s, unique=%s}",`
	`835`	`+ getTable(), mappingColumn.getName(), insertable, updatable, unique`
	`836`	`+ );`
`838`	`837`	`}`
`839`	`838`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,11 +85,8 @@ else if ( DiscriminatorType.STRING.equals( type ) \|\| type == null ) {`
`85`	`85`
`86`	`86`	`@Override`
`87`	`87`	`public String toString() {`
`88`		`- final StringBuilder sb = new StringBuilder();`
`89`		`- sb.append( "Ejb3DiscriminatorColumn" );`
`90`		`- sb.append( "{logicalColumnName'" ).append( getLogicalColumnName() ).append( '\'' );`
`91`		`- sb.append( ", discriminatorTypeName='" ).append( discriminatorTypeName ).append( '\'' );`
`92`		`- sb.append( '}' );`
`93`		`- return sb.toString();`
	`88`	`+ return String.format("Ejb3DiscriminatorColumn{logicalColumnName'%s', discriminatorTypeName='%s'}",`
	`89`	`+ getLogicalColumnName(), discriminatorTypeName`
	`90`	`+ );`
`94`	`91`	`}`
`95`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,12 +97,10 @@ public String logicalCollectionTableName(String tableName,`
`97`	`97`	`return tableName;`
`98`	`98`	`}`
`99`	`99`	`else {`
`100`		`- return new StringBuilder(ownerEntityTable).append("_")`
`101`		`- .append(`
`102`		`- associatedEntityTable != null ?`
`103`		`- associatedEntityTable :`
`104`		`- StringHelper.unqualify( propertyName )`
`105`		`- ).toString();`
	`100`	`+ String entityTableName = associatedEntityTable != null`
	`101`	`+ ? associatedEntityTable`
	`102`	`+ : StringHelper.unqualify(propertyName);`
	`103`	`+ return ownerEntityTable + "_" + entityTableName;`
`106`	`104`	`}`
`107`	`105`	`}`
`108`	`106`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -111,12 +111,10 @@ public String logicalCollectionTableName(String tableName,`
`111`	`111`	`return tableName;`
`112`	`112`	`}`
`113`	`113`	`else {`
`114`		`- return new StringBuilder(ownerEntityTable).append("_")`
`115`		`- .append(`
`116`		`- associatedEntityTable != null ?`
`117`		`- associatedEntityTable :`
`118`		`- StringHelper.unqualify( propertyName )`
`119`		`- ).toString();`
	`114`	`+ String entityTableName = associatedEntityTable != null`
	`115`	`+ ? associatedEntityTable`
	`116`	`+ : StringHelper.unqualify(propertyName);`
	`117`	`+ return ownerEntityTable + "_" + entityTableName;`
`120`	`118`	`}`
`121`	`119`	`}`
`122`	`120`	`/**`