Use StringBuilder instead of StringBuffer

h2/src/main/org/h2/bnf/Bnf.java

@@ -168,9 +168,8 @@ public class Bnf {
                 page = "functions.html";
             }
             String link = StringUtils.urlEncode(found.getTopic().toLowerCase());
-            buff.append("<a href=\""+page+"#"+link+"\">");
-            buff.append(s);
-            buff.append("</a>");
+            buff.append("<a href=\"").append(page).append("#").
+                append(link).append("\">").append(s).append("</a>");
         }
         return buff.toString();
     }

h2/src/main/org/h2/command/ddl/AlterTableAlterColumn.java

@@ -260,8 +260,7 @@ public class AlterTableAlterColumn extends SchemaCommand {
         } else {
             buff.append(columnList);
         }
-        buff.append(" FROM ");
-        buff.append(table.getSQL());
+        buff.append(" FROM ").append(table.getSQL());
         String newTableSQL = buff.toString();
         execute(newTableSQL, true);
         newTable = (TableData) newTable.getSchema().getTableOrView(session, newTable.getName());

h2/src/main/org/h2/command/dml/ScriptCommand.java

@@ -336,8 +336,7 @@ public class ScriptCommand extends ScriptBase {
                     if (len <= 0) {
                         break;
                     }
-                    buff.append(ByteUtils.convertBytesToString(bytes, len));
-                    buff.append("')");
+                    buff.append(ByteUtils.convertBytesToString(bytes, len)).append("')");
                     String sql = buff.toString();
                     add(sql, true);
                 }
@@ -357,8 +356,8 @@ public class ScriptCommand extends ScriptBase {
                     if (len < 0) {
                         break;
                     }
-                    buff.append(StringUtils.quoteStringSQL(new String(chars, 0, len)));
-                    buff.append(", NULL)");
+                    buff.append(StringUtils.quoteStringSQL(new String(chars, 0, len))).
+                        append(", NULL)");
                     String sql = buff.toString();
                     add(sql, true);
                 }

h2/src/main/org/h2/constraint/ConstraintReferential.java

@@ -616,14 +616,14 @@ public class ConstraintReferential extends Constraint {
             buff.appendExceptFirst(", ");
             buff.append(c.getSQL());
         }
-        buff.append(") C WHERE NOT EXISTS(SELECT 1 FROM ");
-        buff.append(refTable.getSQL()).append(" P WHERE ");
+        buff.append(") C WHERE NOT EXISTS(SELECT 1 FROM ").
+            append(refTable.getSQL()).append(" P WHERE ");
         buff.resetCount();
         int i = 0;
         for (IndexColumn c : columns) {
             buff.appendExceptFirst(" AND ");
-            buff.append("C.").append(c.getSQL()).append('=');
-            buff.append("P.").append(refColumns[i++].getSQL());
+            buff.append("C.").append(c.getSQL()).append('=').
+                append("P.").append(refColumns[i++].getSQL());
         }
         buff.append(')');
         String sql = buff.toString();

h2/src/main/org/h2/result/UpdatableRow.java

@@ -151,8 +151,8 @@ public class UpdatableRow {
 
 //    public boolean isRowDeleted(Value[] row) throws SQLException {
 //        StringBuilder buff = new StringBuilder();
-//        buff.append("SELECT COUNT(*) FROM ");
-//        buff.append(StringUtils.quoteIdentifier(tableName));
+//        buff.append("SELECT COUNT(*) FROM ").
+//               append(StringUtils.quoteIdentifier(tableName));
 //        appendKeyCondition(buff);
 //        PreparedStatement prep = conn.prepareStatement(buff.toString());
 //        setKey(prep, 1, row);

h2/src/main/org/h2/table/TableData.java

@@ -551,8 +551,7 @@ public class TableData extends Table implements RecordReader {
         } else {
             buff.append("MEMORY ");
         }
-        buff.append("TABLE ");
-        buff.append(getSQL());
+        buff.append("TABLE ").append(getSQL());
         if (comment != null) {
             buff.append(" COMMENT ").append(StringUtils.quoteStringSQL(comment));
         }

h2/src/main/org/h2/tools/MultiDimension.java

@@ -109,14 +109,12 @@ public class MultiDimension {
      */
     public String generatePreparedQuery(String table, String scalarColumn, String[] columns) {
         StringBuilder buff = new StringBuilder("SELECT D.* FROM ");
-        buff.append(StringUtils.quoteIdentifier(table));
-        buff.append(" D, TABLE(_FROM_ BIGINT=?, _TO_ BIGINT=?) WHERE ");
-        buff.append(StringUtils.quoteIdentifier(scalarColumn));
-        buff.append(" BETWEEN _FROM_ AND _TO_");
+        buff.append(StringUtils.quoteIdentifier(table)).
+            append(" D, TABLE(_FROM_ BIGINT=?, _TO_ BIGINT=?) WHERE ").
+            append(StringUtils.quoteIdentifier(scalarColumn)).
+            append(" BETWEEN _FROM_ AND _TO_");
         for (String col : columns) {
-            buff.append(" AND ");
-            buff.append(StringUtils.quoteIdentifier(col));
-            buff.append("+1 BETWEEN ?+1 AND ?+1");
+            buff.append(" AND ").append(StringUtils.quoteIdentifier(col)).append("+1 BETWEEN ?+1 AND ?+1");
         }
         return buff.toString();
     }

h2/src/main/org/h2/tools/Recover.java

@@ -260,13 +260,13 @@ public class Recover extends Tool implements DataHandler {
                     byte[] passwordHash = sha.getHashWithSalt(userPasswordHash, salt);
                     boolean admin = sql.indexOf("ADMIN") >= 0;
                     StringBuilder buff = new StringBuilder();
-                    buff.append("CREATE USER ");
-                    buff.append(Parser.quoteIdentifier(userName));
-                    buff.append(" SALT '");
-                    buff.append(ByteUtils.convertBytesToString(salt));
-                    buff.append("' HASH '");
-                    buff.append(ByteUtils.convertBytesToString(passwordHash));
-                    buff.append('\'');
+                    buff.append("CREATE USER ").
+                        append(Parser.quoteIdentifier(userName)).
+                        append(" SALT '").
+                        append(ByteUtils.convertBytesToString(salt)).
+                        append("' HASH '").
+                        append(ByteUtils.convertBytesToString(passwordHash)).
+                        append('\'');
                     if (admin) {
                         buff.append(" ADMIN");
                     }
@@ -1025,11 +1025,11 @@ public class Recover extends Tool implements DataHandler {
                             byte[] salt = RandomUtils.getSecureBytes(Constants.SALT_LEN);
                             byte[] passwordHash = sha.getHashWithSalt(userPasswordHash, salt);
                             StringBuilder buff = new StringBuilder();
-                            buff.append("SALT '");
-                            buff.append(ByteUtils.convertBytesToString(salt));
-                            buff.append("' HASH '");
-                            buff.append(ByteUtils.convertBytesToString(passwordHash));
-                            buff.append('\'');
+                            buff.append("SALT '").
+                                append(ByteUtils.convertBytesToString(salt)).
+                                append("' HASH '").
+                                append(ByteUtils.convertBytesToString(passwordHash)).
+                                append('\'');
                             byte[] replacement = buff.toString().getBytes();
                             System.arraycopy(replacement, 0, s.getBytes(), saltIndex, replacement.length);
                             store.seek(pageSize * pageId);

h2/src/main/org/h2/tools/Server.java

@@ -268,8 +268,10 @@ public class Server extends Tool implements Runnable, ShutdownHandler {
     public String getStatus() {
         StringBuilder buff = new StringBuilder();
         if (isRunning(false)) {
-            buff.append(service.getType()).append(" server running on ");
-            buff.append(service.getURL()).append(" (");
+            buff.append(service.getType()).
+                append(" server running on ").
+                append(service.getURL()).
+                append(" (");
             if (service.getAllowOthers()) {
                 buff.append("others can connect");
             } else {
@@ -277,8 +279,10 @@ public class Server extends Tool implements Runnable, ShutdownHandler {
             }
             buff.append(')');
         } else {
-            buff.append("The " + service.getType() + " server could not be started. Possible cause: another server is already running on ");
-            buff.append(service.getURL());
+            buff.append("The ").
+                append(service.getType()).
+                append(" server could not be started. Possible cause: another server is already running on ").
+                append(service.getURL());
         }
         return buff.toString();
     }

h2/src/main/org/h2/tools/Shell.java

@@ -482,8 +482,7 @@ public class Shell extends Tool {
                     for (int j = label.length(); j < longest; j++) {
                         buff.append(' ');
                     }
-                    buff.append(": ");
-                    buff.append(rs.getString(i + 1));
+                    buff.append(": ").append(rs.getString(i + 1));
                 }
             } else {
                 for (int i = 0; i < len; i++) {
@@ -512,8 +511,7 @@ public class Shell extends Tool {
         }
         if (rowCount == 0 && listMode) {
             for (String label : columns) {
-                buff.append(label);
-                buff.append('\n');
+                buff.append(label).append('\n');
             }
             println(buff.toString());
         }

h2/src/main/org/h2/util/ScriptReader.java

@@ -141,8 +141,7 @@ public class ScriptReader {
                     insideRemark = true;
                     blockRemark = true;
                     if (!skipRemarks) {
-                        buff.append((char) last);
-                        buff.append((char) c);
+                        buff.append((char) last).append((char) c);
                     }
                     while (true) {
                         c = read();
@@ -173,8 +172,7 @@ public class ScriptReader {
                     insideRemark = true;
                     blockRemark = false;
                     if (!skipRemarks) {
-                        buff.append((char) last);
-                        buff.append((char) c);
+                        buff.append((char) last).append((char) c);
                     }
                     while (true) {
                         c = read();
@@ -205,8 +203,7 @@ public class ScriptReader {
                     insideRemark = true;
                     blockRemark = false;
                     if (!skipRemarks) {
-                        buff.append((char) last);
-                        buff.append((char) c);
+                        buff.append((char) last).append((char) c);
                     }
                     while (true) {
                         c = read();

h2/src/main/org/h2/util/StringUtils.java

@@ -706,9 +706,9 @@ public class StringUtils {
                 break;
             default:
                 if (ch < ' ' || ch > 127) {
-                    buff.append("&#x");
-                    buff.append(Integer.toHexString(ch));
-                    buff.append(';');
+                    buff.append("&#x").
+                        append(Integer.toHexString(ch)).
+                        append(';');
                 } else {
                     buff.append(ch);
                 }
@@ -734,8 +734,7 @@ public class StringUtils {
                 buff.append(s.substring(index));
                 break;
             }
-            buff.append(s.substring(index, next));
-            buff.append(after);
+            buff.append(s.substring(index, next)).append(after);
             index = next + before.length();
         }
         return buff.toString();

h2/src/test/org/h2/test/TestAll.java

@@ -292,11 +292,8 @@ java org.h2.test.TestAll timer
 
 /*
 
-recover tool: move
-alter table add constraint behind insert into select
-
-j > 0 -> StatementBuilder
-buff.append... chain
+shell tool: document encoding problem. mac: use
+java -Dfile.encoding=UTF-8;
 
 BaseIndex or TableData should have its own compareMode
 (default is: Database.compareMode when created).
@@ -307,9 +304,6 @@ this mean changing the collation is allowed if there are tables.
 
 test case for running out of disk space (using a special file system)
 
-shell tool: document encoding problem. mac: use
-java -Dfile.encoding=UTF-8
-
 auto-build: prepare release
 
 documentation: rolling review at roadmap.html: done

h2/src/tools/org/h2/build/BuildBase.java

@@ -444,8 +444,8 @@ public class BuildBase {
         StringBuilder buff = new StringBuilder(value.length * 2);
         for (byte c : value) {
             int x = c & 0xff;
-            buff.append(Integer.toString(x >> 4, 16));
-            buff.append(Integer.toString(x & 0xf, 16));
+            buff.append(Integer.toString(x >> 4, 16)).
+                append(Integer.toString(x & 0xf, 16));
         }
         return buff.toString();
     }