Replace String.valueOf(int) with Integer.toString(int) or other alternatives

h2/src/main/org/h2/jdbc/JdbcConnection.java

@@ -1866,10 +1866,9 @@ public class JdbcConnection extends TraceObject
                 }
             }
 
-            p.setProperty(NUM_SERVERS, String.valueOf(serverList.size()));
+            p.setProperty(NUM_SERVERS, Integer.toString(serverList.size()));
             for (int i = 0; i < serverList.size(); i++) {
-                p.setProperty(PREFIX_SERVER + String.valueOf(i),
-                        serverList.get(i));
+                p.setProperty(PREFIX_SERVER + i, serverList.get(i));
             }
 
             return p;

h2/src/main/org/h2/jdbcx/JdbcDataSource.java

@@ -335,7 +335,7 @@ public class JdbcDataSource extends TraceObject implements XADataSource,
         ref.add(new StringRefAddr("url", url));
         ref.add(new StringRefAddr("user", userName));
         ref.add(new StringRefAddr("password", convertToString(passwordChars)));
-        ref.add(new StringRefAddr("loginTimeout", String.valueOf(loginTimeout)));
+        ref.add(new StringRefAddr("loginTimeout", Integer.toString(loginTimeout)));
         ref.add(new StringRefAddr("description", description));
         return ref;
     }

h2/src/main/org/h2/server/web/WebApp.java

@@ -349,7 +349,7 @@ public class WebApp {
         try {
             Properties prop = new SortedProperties();
             int port = Integer.decode((String) attributes.get("port"));
-            prop.setProperty("webPort", String.valueOf(port));
+            prop.setProperty("webPort", Integer.toString(port));
             server.setPort(port);
             boolean allowOthers = Utils.parseBoolean((String) attributes.get("allowOthers"), false, false);
             prop.setProperty("webAllowOthers", String.valueOf(allowOthers));

h2/src/main/org/h2/server/web/WebServer.java

@@ -645,7 +645,7 @@ public class WebServer implements Service {
                 }
             } else {
                 for (int i = 0;; i++) {
-                    String data = prop.getProperty(String.valueOf(i));
+                    String data = prop.getProperty(Integer.toString(i));
                     if (data == null) {
                         break;
                     }
@@ -689,7 +689,7 @@ public class WebServer implements Service {
             for (int i = 0; i < len; i++) {
                 ConnectionInfo info = settings.get(i);
                 if (info != null) {
-                    prop.setProperty(String.valueOf(len - i - 1), info.getString());
+                    prop.setProperty(Integer.toString(len - i - 1), info.getString());
                 }
             }
             if (!"null".equals(serverPropertiesDir)) {

h2/src/main/org/h2/store/FileLock.java

@@ -401,7 +401,7 @@ public class FileLock implements Runnable {
             serverSocket = NetUtils.createServerSocket(0, false);
             int port = serverSocket.getLocalPort();
             properties.setProperty("ipAddress", ipAddress);
-            properties.setProperty("port", String.valueOf(port));
+            properties.setProperty("port", Integer.toString(port));
         } catch (Exception e) {
             trace.debug(e, "lock");
             serverSocket = null;

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

@@ -843,7 +843,7 @@ public class MetaTable extends Table {
                             // COLUMN_NAME
                             identifier(c.getName()),
                             // ORDINAL_POSITION
-                            String.valueOf(j + 1),
+                            Integer.toString(j + 1),
                             // COLUMN_DEFAULT
                             c.getDefaultSQL(),
                             // IS_NULLABLE
@@ -1104,9 +1104,9 @@ public class MetaTable extends Table {
                         // TYPE_NAME
                         t.name,
                         // DATA_TYPE
-                        String.valueOf(t.sqlType),
+                        Integer.toString(t.sqlType),
                         // PRECISION
-                        String.valueOf(MathUtils.convertLongToInt(t.maxPrecision)),
+                        Integer.toString(MathUtils.convertLongToInt(t.maxPrecision)),
                         // PREFIX
                         t.prefix,
                         // SUFFIX
@@ -1116,13 +1116,13 @@ public class MetaTable extends Table {
                         // AUTO_INCREMENT
                         String.valueOf(t.autoIncrement),
                         // MINIMUM_SCALE
-                        String.valueOf(t.minScale),
+                        Integer.toString(t.minScale),
                         // MAXIMUM_SCALE
-                        String.valueOf(t.maxScale),
+                        Integer.toString(t.maxScale),
                         // RADIX
                         t.decimal ? "10" : null,
                         // POS
-                        String.valueOf(t.sqlTypePos),
+                        Integer.toString(t.sqlTypePos),
                         // CASE_SENSITIVE
                         String.valueOf(t.caseSensitive),
                         // NULLABLE
@@ -1145,7 +1145,7 @@ public class MetaTable extends Table {
                 for (int i = 0; rs.next(); i++) {
                     add(rows,
                         // ID
-                        String.valueOf(i),
+                        Integer.toString(i),
                         // SECTION
                         rs.getString(1).trim(),
                         // TOPIC
@@ -1627,11 +1627,11 @@ public class MetaTable extends Table {
                             // FKCOLUMN_NAME
                             identifier(cols[j].column.getName()),
                             // ORDINAL_POSITION
-                            String.valueOf(j + 1),
+                            Integer.toString(j + 1),
                             // UPDATE_RULE SMALLINT
-                            String.valueOf(update),
+                            Integer.toString(update),
                             // DELETE_RULE SMALLINT
-                            String.valueOf(delete),
+                            Integer.toString(delete),
                             // FK_NAME
                             identifier(ref.getName()),
                             // PK_NAME

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

@@ -1070,7 +1070,7 @@ public class Recover extends Tool implements DataHandler {
 
     private String setStorage(int storageId) {
         this.storageId = storageId;
-        this.storageName = "O_" + String.valueOf(storageId).replace('-', 'M');
+        this.storageName = "O_" + Integer.toString(storageId).replace('-', 'M');
         return storageName;
     }
 

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

@@ -333,7 +333,7 @@ public class Shell extends Tool implements Runnable {
             String data = null;
             boolean found = false;
             for (int i = 0;; i++) {
-                String d = prop.getProperty(String.valueOf(i));
+                String d = prop.getProperty(Integer.toString(i));
                 if (d == null) {
                     break;
                 }

h2/src/main/org/h2/value/ValueByte.java

@@ -115,7 +115,7 @@ public class ValueByte extends Value {
 
     @Override
     public String getString() {
-        return String.valueOf(value);
+        return Integer.toString(value);
     }
 
     @Override

h2/src/main/org/h2/value/ValueInt.java

@@ -148,7 +148,7 @@ public class ValueInt extends Value {
 
     @Override
     public String getString() {
-        return String.valueOf(value);
+        return Integer.toString(value);
     }
 
     @Override

h2/src/main/org/h2/value/ValueShort.java

@@ -115,7 +115,7 @@ public class ValueShort extends Value {
 
     @Override
     public String getString() {
-        return String.valueOf(value);
+        return Integer.toString(value);
     }
 
     @Override

h2/src/test/org/h2/samples/Function.java

@@ -102,7 +102,7 @@ public class Function {
      * @return true if it is a prime number
      */
     public static boolean isPrime(int value) {
-        return new BigInteger(String.valueOf(value)).isProbablePrime(100);
+        return BigInteger.valueOf(value).isProbablePrime(100);
     }
 
     /**

h2/src/test/org/h2/test/bench/BenchCRandom.java

@@ -157,7 +157,7 @@ public class BenchCRandom {
      * @return the big decimal object
      */
     BigDecimal getBigDecimal(int value, int scale) {
-        return new BigDecimal(new BigInteger(String.valueOf(value)), scale);
+        return new BigDecimal(BigInteger.valueOf(value), scale);
     }
 
     /**