From 832545b2303dbb159a52f49418d099e54067738f Mon Sep 17 00:00:00 2001 From: Andrey Turbanov Date: Mon, 11 Apr 2022 11:39:47 +0300 Subject: [PATCH] [PATCH] Remove superfluous use of boxing Cleanup usages of Long.valueOf/Double.valueOf/Integer.valueOf --- src/main/core-api/java/com/mysql/cj/conf/ConnectionUrl.java | 2 +- src/main/core-api/java/com/mysql/cj/util/TimeUtil.java | 2 +- .../java/com/mysql/cj/protocol/a/NativeServerSession.java | 2 +- .../user-impl/java/com/mysql/cj/jdbc/DatabaseMetaData.java | 6 +++--- .../user-impl/java/com/mysql/cj/xdevapi/ExprParser.java | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/core-api/java/com/mysql/cj/conf/ConnectionUrl.java b/src/main/core-api/java/com/mysql/cj/conf/ConnectionUrl.java index c4677ec53..58431e1bb 100644 --- a/src/main/core-api/java/com/mysql/cj/conf/ConnectionUrl.java +++ b/src/main/core-api/java/com/mysql/cj/conf/ConnectionUrl.java @@ -495,7 +495,7 @@ protected HostInfo fixHostInfo(HostInfo hi) { int port = hi.getPort(); if (port == HostInfo.NO_PORT && !isNullOrEmpty(portAsString)) { try { - port = Integer.valueOf(portAsString); + port = Integer.parseInt(portAsString); } catch (NumberFormatException e) { throw ExceptionFactory.createException(WrongArgumentException.class, Messages.getString("ConnectionString.7", new Object[] { hostProps.get(PropertyKey.PORT.getKeyName()) }), e); diff --git a/src/main/core-api/java/com/mysql/cj/util/TimeUtil.java b/src/main/core-api/java/com/mysql/cj/util/TimeUtil.java index bc41618e7..3c5af82cc 100644 --- a/src/main/core-api/java/com/mysql/cj/util/TimeUtil.java +++ b/src/main/core-api/java/com/mysql/cj/util/TimeUtil.java @@ -450,7 +450,7 @@ private static String getCanonicalDate(String s) { String[] sa = s.split("\\p{Punct}"); StringBuilder sb = new StringBuilder(); if (sa[0].length() == 2) { - sb.append(Integer.valueOf(sa[0]) > 69 ? "19" : "20"); + sb.append(Integer.parseInt(sa[0]) > 69 ? "19" : "20"); } sb.append(sa[0]); sb.append("-"); diff --git a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeServerSession.java b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeServerSession.java index be5efa266..e44eb8161 100644 --- a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeServerSession.java +++ b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeServerSession.java @@ -244,7 +244,7 @@ public String getServerVariable(String name) { @Override public int getServerVariable(String variableName, int fallbackValue) { try { - return Integer.valueOf(getServerVariable(variableName)); + return Integer.parseInt(getServerVariable(variableName)); } catch (NumberFormatException nfe) { //getLog().logWarn( // Messages.getString("Connection.BadValueInServerVariables", new Object[] { variableName, getServerVariable(variableName), fallbackValue })); diff --git a/src/main/user-impl/java/com/mysql/cj/jdbc/DatabaseMetaData.java b/src/main/user-impl/java/com/mysql/cj/jdbc/DatabaseMetaData.java index bade0ecfd..e25dbbd14 100644 --- a/src/main/user-impl/java/com/mysql/cj/jdbc/DatabaseMetaData.java +++ b/src/main/user-impl/java/com/mysql/cj/jdbc/DatabaseMetaData.java @@ -252,7 +252,7 @@ String next() throws SQLException { this.columnSize = Integer.valueOf(typeInfo.substring((typeInfo.indexOf("(") + 1), (typeInfo.indexOf(","))).trim()); this.decimalDigits = Integer.valueOf(typeInfo.substring((typeInfo.indexOf(",") + 1), (typeInfo.indexOf(")"))).trim()); } else if (typeInfo.indexOf("(") != -1) { - int size = Integer.valueOf(typeInfo.substring((typeInfo.indexOf("(") + 1), (typeInfo.indexOf(")"))).trim()); + int size = Integer.parseInt(typeInfo.substring((typeInfo.indexOf("(") + 1), (typeInfo.indexOf(")"))).trim()); if (size > 23) { this.mysqlType = this.mysqlType == MysqlType.FLOAT ? MysqlType.DOUBLE : MysqlType.DOUBLE_UNSIGNED; this.columnSize = Integer.valueOf(22); @@ -351,7 +351,7 @@ String next() throws SQLException { this.datetimePrecision = 0; this.columnSize = 8; if (typeInfo.indexOf("(") != -1 - && (fract = Integer.valueOf(typeInfo.substring((typeInfo.indexOf("(") + 1), (typeInfo.indexOf(")"))).trim())) > 0) { + && (fract = Integer.parseInt(typeInfo.substring((typeInfo.indexOf("(") + 1), (typeInfo.indexOf(")"))).trim())) > 0) { // with fractional seconds this.datetimePrecision = fract; this.columnSize += fract + 1; @@ -363,7 +363,7 @@ String next() throws SQLException { this.datetimePrecision = 0; this.columnSize = 19; if (typeInfo.indexOf("(") != -1 - && (fract = Integer.valueOf(typeInfo.substring((typeInfo.indexOf("(") + 1), (typeInfo.indexOf(")"))).trim())) > 0) { + && (fract = Integer.parseInt(typeInfo.substring((typeInfo.indexOf("(") + 1), (typeInfo.indexOf(")"))).trim())) > 0) { // with fractional seconds this.datetimePrecision = fract; this.columnSize += fract + 1; diff --git a/src/main/user-impl/java/com/mysql/cj/xdevapi/ExprParser.java b/src/main/user-impl/java/com/mysql/cj/xdevapi/ExprParser.java index 5d795ce3b..7681df7ea 100644 --- a/src/main/user-impl/java/com/mysql/cj/xdevapi/ExprParser.java +++ b/src/main/user-impl/java/com/mysql/cj/xdevapi/ExprParser.java @@ -855,9 +855,9 @@ Expr atomicExpr() { // constant, identifier, variable, function call, etc case NULL: return ExprUtil.buildLiteralNullScalar(); case LNUM_INT: - return ExprUtil.buildLiteralScalar(Long.valueOf(t.value)); + return ExprUtil.buildLiteralScalar(Long.parseLong(t.value)); case LNUM_DOUBLE: - return ExprUtil.buildLiteralScalar(Double.valueOf(t.value)); + return ExprUtil.buildLiteralScalar(Double.parseDouble(t.value)); case TRUE: case FALSE: return ExprUtil.buildLiteralScalar(t.type == TokenType.TRUE);