Replace StringBuffer with StringBuilder

avoid unnecessary synchronization
quaff · Sep 3, 2020 · decd57c · decd57c
1 parent 6365204
commit decd57c
Show file tree

Hide file tree

Showing 18 changed files with 21 additions and 26 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/DefaultComponentSafeNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/cfg/DefaultComponentSafeNamingStrategy.java
@@ -61,8 +61,7 @@ public String logicalCollectionTableName(
 			return tableName;
 		}
 		else {
-			//use of a stringbuffer to workaround a JDK bug
-			return new StringBuffer( ownerEntityTable ).append( "_" )
+			return new StringBuilder( ownerEntityTable ).append( "_" )
 					.append(
 							associatedEntityTable != null ?
 									associatedEntityTable :

diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/DefaultNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/cfg/DefaultNamingStrategy.java
@@ -96,8 +96,7 @@ public String logicalCollectionTableName(String tableName,
 			return tableName;
 		}
 		else {
-			//use of a stringbuffer to workaround a JDK bug
-			return new StringBuffer(ownerEntityTable).append("_")
+			return new StringBuilder(ownerEntityTable).append("_")
 					.append(
 						associatedEntityTable != null ?
 						associatedEntityTable :

diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/EJB3NamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/cfg/EJB3NamingStrategy.java
@@ -72,8 +72,7 @@ public String logicalCollectionTableName(
 			return tableName;
 		}
 		else {
-			//use of a stringbuffer to workaround a JDK bug
-			return new StringBuffer( ownerEntityTable ).append( "_" )
+			return new StringBuilder( ownerEntityTable ).append( "_" )
 					.append(
 							associatedEntityTable != null ?
 									associatedEntityTable :

diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/ImprovedNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/cfg/ImprovedNamingStrategy.java
@@ -110,8 +110,7 @@ public String logicalCollectionTableName(String tableName,
 			return tableName;
 		}
 		else {
-			//use of a stringbuffer to workaround a JDK bug
-			return new StringBuffer(ownerEntityTable).append("_")
+			return new StringBuilder(ownerEntityTable).append("_")
 					.append(
 						associatedEntityTable != null ?
 						associatedEntityTable :

diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/QueryTranslatorImpl.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/QueryTranslatorImpl.java
@@ -771,7 +771,7 @@ private void renderIdentifierSelect(QuerySelect sql) {
 	}
 
 	/*private String renderOrderByPropertiesSelect() {
-		StringBuffer buf = new StringBuffer(10);
+		StringBuilder buf = new StringBuilder(10);
 
 		//add the columns we are ordering by to the select ID select clause
 		Iterator iter = orderByTokens.iterator();

diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/criteria/idclass/WidgetId.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/criteria/idclass/WidgetId.java
@@ -49,7 +49,7 @@ public int hashCode( ) {
 
 	@Override
 	public String toString( ) {
-		StringBuffer buf = new StringBuffer( "[id:" );
+		StringBuilder buf = new StringBuilder( "[id:" );
 		buf.append( ( this.getCode( ) == null ) ? "null" : this.getCode( ).toString( ) );
 		buf.append( ";code:" );
 		buf.append( ( this.getDivision( ) == null ) ? "null" : this.getDivision( ) );

diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Version.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Version.java
@@ -44,6 +44,6 @@ public void setMicro(int micro) {
 	}
 
 	public String toString() {
-		return new StringBuffer( major ).append( DOT ).append( minor ).append( DOT ).append( micro ).toString();
+		return new StringBuilder( major ).append( DOT ).append( minor ).append( DOT ).append( micro ).toString();
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Version1.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Version1.java
@@ -44,6 +44,6 @@ public void setMicro(int micro) {
 	}
 
 	public String toString() {
-		return new StringBuffer( major ).append( DOT ).append( minor ).append( DOT ).append( micro ).toString();
+		return new StringBuilder( major ).append( DOT ).append( minor ).append( DOT ).append( micro ).toString();
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Version.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Version.java
@@ -44,6 +44,6 @@ public void setMicro(int micro) {
 	}
 
 	public String toString() {
-		return new StringBuffer( major ).append( DOT ).append( minor ).append( DOT ).append( micro ).toString();
+		return new StringBuilder( major ).append( DOT ).append( minor ).append( DOT ).append( micro ).toString();
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/AlternativeNamingStrategy.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/AlternativeNamingStrategy.java
@@ -63,8 +63,7 @@ public String logicalCollectionTablelName(
 			return tableName;
 		}
 		else {
-			//use of a stringbuffer to workaround a JDK bug
-			return new StringBuffer( ownerEntityTable ).append( "_" )
+			return new StringBuilder( ownerEntityTable ).append( "_" )
 					.append(
 							associatedEntityTable != null ?
 									associatedEntityTable :

diff --git a/...nate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/GetDimensionFunction.java b/...nate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/GetDimensionFunction.java
@@ -23,7 +23,7 @@ class GetDimensionFunction extends SDOObjectMethod {
 	}
 
 	public String render(Type firstArgumentType, final List args, final SessionFactoryImplementor factory) {
-		final StringBuffer buf = new StringBuffer();
+		final StringBuilder buf = new StringBuilder();
 		if ( args.isEmpty() ) {
 			throw new IllegalArgumentException(
 					"First Argument in arglist must be object to "

diff --git a/...e-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/GetGeometryTypeFunction.java b/...e-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/GetGeometryTypeFunction.java
@@ -23,7 +23,7 @@ class GetGeometryTypeFunction extends SDOObjectMethod {
 	}
 
 	public String render(Type firstArgumentType, final List args, final SessionFactoryImplementor factory) {
-		final StringBuffer buf = new StringBuffer();
+		final StringBuilder buf = new StringBuilder();
 		if ( args.isEmpty() ) {
 			throw new IllegalArgumentException(
 					"First Argument in arglist must be object to which"

diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSDOSupport.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSDOSupport.java
@@ -106,7 +106,7 @@ public String getSpatialRelateSQL(String columnName, int spatialRelation) {
 	}
 
 	public String getOGCSpatialRelateSQL(String arg1, String arg2, int spatialRelation) {
-		final StringBuffer ogcFunction = new StringBuffer( "MDSYS." );
+		final StringBuilder ogcFunction = new StringBuilder( "MDSYS." );
 		switch ( spatialRelation ) {
 			case SpatialRelation.INTERSECTS:
 				ogcFunction.append( "OGC_INTERSECTS" );
@@ -229,7 +229,7 @@ String getNativeSpatialRelateSQL(String arg1, String arg2, int spatialRelation)
 	 */
 	@Override
 	public String getSpatialFilterExpression(String columnName) {
-		final StringBuffer buffer = new StringBuffer( "SDO_FILTER(" );
+		final StringBuilder buffer = new StringBuilder( "SDO_FILTER(" );
 		buffer.append( columnName );
 		buffer.append( ",?) = 'TRUE' " );
 		return buffer.toString();
@@ -245,7 +245,7 @@ public String getSpatialFilterExpression(String columnName) {
 	 */
 	@Override
 	public String getSpatialAggregateSQL(String columnName, int aggregation) {
-		final StringBuffer aggregateFunction = new StringBuffer();
+		final StringBuilder aggregateFunction = new StringBuilder();
 		final SpatialAggregate sa = new SpatialAggregate( aggregation );
 
 		if ( sa.getAggregateSyntax() == null ) {

diff --git a/...te-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatialFunctions.java b/...te-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSpatialFunctions.java
@@ -175,7 +175,7 @@ class OracleSpatialFunctions extends SpatialFunctionsRegistry {
 
 	static String getOGCSpatialAnalysisSQL(List args, int spatialAnalysisFunction) {
 		boolean[] geomArgs;
-		final StringBuffer ogcFunction = new StringBuffer( "MDSYS." );
+		final StringBuilder ogcFunction = new StringBuilder( "MDSYS." );
 		boolean isGeomReturn = true;
 		switch ( spatialAnalysisFunction ) {
 			case SpatialAnalysis.BUFFER:
@@ -240,7 +240,7 @@ static String getOGCSpatialAnalysisSQL(List args, int spatialAnalysisFunction) {
 		return ogcFunction.toString();
 	}
 
-	private static StringBuffer wrapInSTGeometry(String geomColumn, StringBuffer toAdd) {
+	private static StringBuilder wrapInSTGeometry(String geomColumn, StringBuilder toAdd) {
 		return toAdd.append( "MDSYS.ST_GEOMETRY(" ).append( geomColumn )
 				.append( ")" );
 	}

diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOObjectMethod.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOObjectMethod.java
@@ -67,7 +67,7 @@ public String getName() {
 	 */
 
 	public String render(Type firstArgumentType, List args, SessionFactoryImplementor factory) throws QueryException {
-		final StringBuffer buf = new StringBuffer();
+		final StringBuilder buf = new StringBuilder();
 		if ( args.isEmpty() ) {
 			throw new QueryException(
 					"First Argument in arglist must be object to which method is applied"

diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOObjectProperty.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/SDOObjectProperty.java
@@ -68,7 +68,7 @@ public String getName() {
 
 	public String render(Type firstArgtype, List args, SessionFactoryImplementor factory)
 			throws QueryException {
-		final StringBuffer buf = new StringBuffer();
+		final StringBuilder buf = new StringBuilder();
 		if ( args.isEmpty() ) {
 			throw new QueryException(
 					"First Argument in arglist must be object of which property is queried"

diff --git a/...src/main/java/org/hibernate/spatial/dialect/oracle/criterion/OracleSpatialProjection.java b/...src/main/java/org/hibernate/spatial/dialect/oracle/criterion/OracleSpatialProjection.java
@@ -49,7 +49,7 @@ public String toSqlString(Criteria criteria, int position, CriteriaQuery criteri
 		if ( dialect instanceof SpatialDialect ) {
 			final SpatialDialect seDialect = (SpatialDialect) dialect;
 
-			return new StringBuffer(
+			return new StringBuilder(
 					seDialect.getSpatialAggregateSQL(
 							columns[0], this.aggregate
 					)

diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerMethod.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/sqlserver/SqlServerMethod.java
@@ -24,7 +24,7 @@ public SqlServerMethod(String name) {
 
 	@Override
 	public String render(Type firstArgumentType, List arguments, SessionFactoryImplementor sessionFactory) {
-		final StringBuffer buf = new StringBuffer();
+		final StringBuilder buf = new StringBuilder();
 		if ( arguments.size() < 1 ) {
 			buf.append( getName() ).append( "()" );
 		}