From fa7f5a176c4c9ba198060b7b00be3912cfcd7990 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Thu, 6 Jul 2017 13:47:56 +0000 Subject: [PATCH 1/3] Remove explicit boxing and unboxing --- AppVeyorJCE/README.md | 62 ++++----- .../com/microsoft/sqlserver/jdbc/Column.java | 2 +- .../com/microsoft/sqlserver/jdbc/DDC.java | 84 ++++++------ .../microsoft/sqlserver/jdbc/DataTypes.java | 2 +- .../sqlserver/jdbc/FailOverInfo.java | 2 +- .../microsoft/sqlserver/jdbc/IOBuffer.java | 36 +++--- .../microsoft/sqlserver/jdbc/Parameter.java | 8 +- .../sqlserver/jdbc/SQLServerBlob.java | 16 +-- .../sqlserver/jdbc/SQLServerBulkCopy.java | 28 ++-- .../jdbc/SQLServerCallableStatement.java | 84 ++++++------ .../jdbc/SQLServerCallableStatement42.java | 34 ++--- .../sqlserver/jdbc/SQLServerClob.java | 20 +-- .../sqlserver/jdbc/SQLServerConnection.java | 54 ++++---- .../sqlserver/jdbc/SQLServerDataSource.java | 10 +- .../jdbc/SQLServerDatabaseMetaData.java | 16 +-- .../sqlserver/jdbc/SQLServerDriver.java | 6 +- .../jdbc/SQLServerParameterMetaData.java | 6 +- .../jdbc/SQLServerPreparedStatement.java | 72 +++++------ .../SQLServerPreparedStatement42Helper.java | 8 +- .../sqlserver/jdbc/SQLServerResultSet.java | 122 +++++++++--------- .../sqlserver/jdbc/SQLServerResultSet42.java | 8 +- .../sqlserver/jdbc/SQLServerStatement.java | 96 +++++++------- .../com/microsoft/sqlserver/jdbc/Util.java | 2 +- .../com/microsoft/sqlserver/jdbc/dtv.java | 8 +- .../jdbc/unit/statement/StatementTest.java | 2 +- .../sqlserver/testframework/DBResultSet.java | 14 +- .../testframework/sqlType/SqlBigInt.java | 2 +- .../testframework/sqlType/SqlInt.java | 2 +- .../testframework/sqlType/SqlReal.java | 2 +- .../testframework/sqlType/SqlSmallInt.java | 2 +- .../testframework/sqlType/SqlTinyInt.java | 2 +- .../testframework/sqlType/SqlTypeValue.java | 12 +- 32 files changed, 412 insertions(+), 412 deletions(-) diff --git a/AppVeyorJCE/README.md b/AppVeyorJCE/README.md index db088d8636..994e013855 100644 --- a/AppVeyorJCE/README.md +++ b/AppVeyorJCE/README.md @@ -1,31 +1,31 @@ -# JCE chocolatey package - -### Disclaimers: -1. All contents within this directory originate from [this GitHub project](https://github.com/TobseF/jce-chocolatey-package). This project was added to allow us to test the Always Encrypted feature on AppVeyor builds. - -2. This is not an official project of Oracle. It\`s only easy of the manual installation: It downloads the JCE from oracle.com and unpacks it to the installed JDK. - - -[Chocolatey](https://chocolatey.org/) package for the [JCE (Unlimited Strength Java Cryptography Extension Policy Files)](http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html) - -This chocolatey package adds the JCE to latest installed Java SDK. The The `JAVA_HOME` environment variable has to point to the JDK. If `JAVA_HOME` is not set, nothing will be changed. The original files are backuped (renamed to `*_old`) and can be reverted at any time. This package is a perfect addion to the [JDK8 package](https://chocolatey.org/packages/jdk8). - -#### Install with [Chocolatey](https://chocolatey.org/) -```PowerShell -choco install jce -y -``` - -#### Build from source: -1. Install [Chocolatey](https://chocolatey.org/). -2. Open cmd with admin rights in jce package directory. -3. Pack NuGet Package (.nupkg). -```PowerShell -cpack -``` -4. Install JCE NuGet Package. -```PowerShell -choco install jce -fdv -s . -y -``` - - - +# JCE chocolatey package + +### Disclaimers: +1. All contents within this directory originate from [this GitHub project](https://github.com/TobseF/jce-chocolatey-package). This project was added to allow us to test the Always Encrypted feature on AppVeyor builds. + +2. This is not an official project of Oracle. It\`s only easy of the manual installation: It downloads the JCE from oracle.com and unpacks it to the installed JDK. + + +[Chocolatey](https://chocolatey.org/) package for the [JCE (Unlimited Strength Java Cryptography Extension Policy Files)](http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html) + +This chocolatey package adds the JCE to latest installed Java SDK. The The `JAVA_HOME` environment variable has to point to the JDK. If `JAVA_HOME` is not set, nothing will be changed. The original files are backuped (renamed to `*_old`) and can be reverted at any time. This package is a perfect addion to the [JDK8 package](https://chocolatey.org/packages/jdk8). + +#### Install with [Chocolatey](https://chocolatey.org/) +```PowerShell +choco install jce -y +``` + +#### Build from source: +1. Install [Chocolatey](https://chocolatey.org/). +2. Open cmd with admin rights in jce package directory. +3. Pack NuGet Package (.nupkg). +```PowerShell +cpack +``` +4. Install JCE NuGet Package. +```PowerShell +choco install jce -fdv -s . -y +``` + + + diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/Column.java b/src/main/java/com/microsoft/sqlserver/jdbc/Column.java index 6a4a5d6708..69823297aa 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/Column.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/Column.java @@ -191,7 +191,7 @@ Object getValue(JDBCType jdbcType, } int getInt(TDSReader tdsReader) throws SQLServerException { - return ((Integer) getValue(JDBCType.INTEGER, null, null, tdsReader)).intValue(); + return (Integer) getValue(JDBCType.INTEGER, null, null, tdsReader); } void updateValue(JDBCType jdbcType, diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/DDC.java b/src/main/java/com/microsoft/sqlserver/jdbc/DDC.java index 53c5b6f1c4..562b958c8d 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/DDC.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/DDC.java @@ -54,15 +54,15 @@ static final Object convertIntegerToObject(int intValue, StreamType streamType) { switch (jdbcType) { case INTEGER: - return new Integer(intValue); + return intValue; case SMALLINT: // 2.21 small and tinyint returned as short case TINYINT: - return new Short((short) intValue); + return (short) intValue; case BIT: case BOOLEAN: - return new Boolean(0 != intValue); + return 0 != intValue; case BIGINT: - return new Long(intValue); + return (long) intValue; case DECIMAL: case NUMERIC: case MONEY: @@ -70,9 +70,9 @@ static final Object convertIntegerToObject(int intValue, return new BigDecimal(Integer.toString(intValue)); case FLOAT: case DOUBLE: - return new Double(intValue); + return (double) intValue; case REAL: - return new Float(intValue); + return (float) intValue; case BINARY: return convertIntToBytes(intValue, valueLength); default: @@ -99,15 +99,15 @@ static final Object convertLongToObject(long longVal, StreamType streamType) { switch (jdbcType) { case BIGINT: - return new Long(longVal); + return longVal; case INTEGER: - return new Integer((int) longVal); + return (int) longVal; case SMALLINT: // small and tinyint returned as short case TINYINT: - return new Short((short) longVal); + return (short) longVal; case BIT: case BOOLEAN: - return new Boolean(0 != longVal); + return 0 != longVal; case DECIMAL: case NUMERIC: case MONEY: @@ -115,9 +115,9 @@ static final Object convertLongToObject(long longVal, return new BigDecimal(Long.toString(longVal)); case FLOAT: case DOUBLE: - return new Double(longVal); + return (double) longVal; case REAL: - return new Float(longVal); + return (float) longVal; case BINARY: byte[] convertedBytes = convertLongToBytes(longVal); int bytesToReturnLength; @@ -152,23 +152,23 @@ static final Object convertLongToObject(long longVal, case VARBINARY: switch (baseSSType) { case BIGINT: - return new Long(longVal); + return longVal; case INTEGER: - return new Integer((int) longVal); + return (int) longVal; case SMALLINT: // small and tinyint returned as short case TINYINT: - return new Short((short) longVal); + return (short) longVal; case BIT: - return new Boolean(0 != longVal); + return 0 != longVal; case DECIMAL: case NUMERIC: case MONEY: case SMALLMONEY: return new BigDecimal(Long.toString(longVal)); case FLOAT: - return new Double(longVal); + return (double) longVal; case REAL: - return new Float(longVal); + return (float) longVal; case BINARY: return convertLongToBytes(longVal); default: @@ -214,17 +214,17 @@ static final Object convertFloatToObject(float floatVal, StreamType streamType) { switch (jdbcType) { case REAL: - return new Float(floatVal); + return floatVal; case INTEGER: - return new Integer((int) floatVal); + return (int) floatVal; case SMALLINT: // small and tinyint returned as short case TINYINT: - return new Short((short) floatVal); + return (short) floatVal; case BIT: case BOOLEAN: - return new Boolean(0 != Float.compare(0.0f, floatVal)); + return 0 != Float.compare(0.0f, floatVal); case BIGINT: - return new Long((long) floatVal); + return (long) floatVal; case DECIMAL: case NUMERIC: case MONEY: @@ -232,7 +232,7 @@ static final Object convertFloatToObject(float floatVal, return new BigDecimal(Float.toString(floatVal)); case FLOAT: case DOUBLE: - return new Double((new Float(floatVal)).doubleValue()); + return (new Float(floatVal)).doubleValue(); case BINARY: return convertIntToBytes(Float.floatToRawIntBits(floatVal), 4); default: @@ -273,19 +273,19 @@ static final Object convertDoubleToObject(double doubleVal, switch (jdbcType) { case FLOAT: case DOUBLE: - return new Double(doubleVal); + return doubleVal; case REAL: - return new Float((new Double(doubleVal)).floatValue()); + return (new Double(doubleVal)).floatValue(); case INTEGER: - return new Integer((int) doubleVal); + return (int) doubleVal; case SMALLINT: // small and tinyint returned as short case TINYINT: - return new Short((short) doubleVal); + return (short) doubleVal; case BIT: case BOOLEAN: - return new Boolean(0 != Double.compare(0.0d, doubleVal)); + return 0 != Double.compare(0.0d, doubleVal); case BIGINT: - return new Long((long) doubleVal); + return (long) doubleVal; case DECIMAL: case NUMERIC: case MONEY: @@ -355,19 +355,19 @@ static final Object convertBigDecimalToObject(BigDecimal bigDecimalVal, return bigDecimalVal; case FLOAT: case DOUBLE: - return new Double(bigDecimalVal.doubleValue()); + return bigDecimalVal.doubleValue(); case REAL: - return new Float(bigDecimalVal.floatValue()); + return bigDecimalVal.floatValue(); case INTEGER: - return new Integer(bigDecimalVal.intValue()); + return bigDecimalVal.intValue(); case SMALLINT: // small and tinyint returned as short case TINYINT: - return new Short(bigDecimalVal.shortValue()); + return bigDecimalVal.shortValue(); case BIT: case BOOLEAN: - return new Boolean(0 != bigDecimalVal.compareTo(BigDecimal.valueOf(0))); + return 0 != bigDecimalVal.compareTo(BigDecimal.valueOf(0)); case BIGINT: - return new Long(bigDecimalVal.longValue()); + return bigDecimalVal.longValue(); case BINARY: return convertBigDecimalToBytes(bigDecimalVal, bigDecimalVal.scale()); default: @@ -400,19 +400,19 @@ static final Object convertMoneyToObject(BigDecimal bigDecimalVal, return bigDecimalVal; case FLOAT: case DOUBLE: - return new Double(bigDecimalVal.doubleValue()); + return bigDecimalVal.doubleValue(); case REAL: - return new Float(bigDecimalVal.floatValue()); + return bigDecimalVal.floatValue(); case INTEGER: - return new Integer(bigDecimalVal.intValue()); + return bigDecimalVal.intValue(); case SMALLINT: // small and tinyint returned as short case TINYINT: - return new Short(bigDecimalVal.shortValue()); + return bigDecimalVal.shortValue(); case BIT: case BOOLEAN: - return new Boolean(0 != bigDecimalVal.compareTo(BigDecimal.valueOf(0))); + return 0 != bigDecimalVal.compareTo(BigDecimal.valueOf(0)); case BIGINT: - return new Long(bigDecimalVal.longValue()); + return bigDecimalVal.longValue(); case BINARY: return convertToBytes(bigDecimalVal, bigDecimalVal.scale(), numberOfBytes); default: diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/DataTypes.java b/src/main/java/com/microsoft/sqlserver/jdbc/DataTypes.java index a7dc9b021c..842bb82644 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/DataTypes.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/DataTypes.java @@ -95,7 +95,7 @@ static TDSType valueOf(int intValue) throws IllegalArgumentException { if (!(0 <= intValue && intValue < valuesTypes.length) || null == (tdsType = valuesTypes[intValue])) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_unknownSSType")); - Object[] msgArgs = {new Integer(intValue)}; + Object[] msgArgs = {intValue}; throw new IllegalArgumentException(form.format(msgArgs)); } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/FailOverInfo.java b/src/main/java/com/microsoft/sqlserver/jdbc/FailOverInfo.java index 1f83263231..0e905bc7d4 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/FailOverInfo.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/FailOverInfo.java @@ -71,7 +71,7 @@ private void setupInfo(SQLServerConnection con) throws SQLServerException { instancePort = con.getInstancePort(failoverPartner, instanceValue); try { - portNumber = (new Integer(instancePort)).intValue(); + portNumber = new Integer(instancePort); } catch (NumberFormatException e) { // Should not get here as the server should give a proper port number anyway. diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java b/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java index 92638ffe06..f6e9970a2d 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java @@ -3293,7 +3293,7 @@ void writeInt(int value) throws SQLServerException { * the data value */ void writeReal(Float value) throws SQLServerException { - writeInt(Float.floatToRawIntBits(value.floatValue())); + writeInt(Float.floatToRawIntBits(value)); } /** @@ -3781,7 +3781,7 @@ void writeStream(InputStream inputStream, // the actual stream length did not match then cancel the request. if (DataTypes.UNKNOWN_STREAM_LENGTH != advertisedLength && actualLength != advertisedLength) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_mismatchedStreamLength")); - Object[] msgArgs = {Long.valueOf(advertisedLength), Long.valueOf(actualLength)}; + Object[] msgArgs = {advertisedLength, actualLength}; error(form.format(msgArgs), SQLState.DATA_EXCEPTION_LENGTH_MISMATCH, DriverError.NOT_SET); } } @@ -3866,7 +3866,7 @@ void writeNonUnicodeReader(Reader reader, // the actual stream length did not match then cancel the request. if (DataTypes.UNKNOWN_STREAM_LENGTH != advertisedLength && actualLength != advertisedLength) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_mismatchedStreamLength")); - Object[] msgArgs = {Long.valueOf(advertisedLength), Long.valueOf(actualLength)}; + Object[] msgArgs = {advertisedLength, actualLength}; error(form.format(msgArgs), SQLState.DATA_EXCEPTION_LENGTH_MISMATCH, DriverError.NOT_SET); } } @@ -3931,7 +3931,7 @@ void writeReader(Reader reader, // the actual stream length did not match then cancel the request. if (DataTypes.UNKNOWN_STREAM_LENGTH != advertisedLength && actualLength != advertisedLength) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_mismatchedStreamLength")); - Object[] msgArgs = {Long.valueOf(advertisedLength), Long.valueOf(actualLength)}; + Object[] msgArgs = {advertisedLength, actualLength}; error(form.format(msgArgs), SQLState.DATA_EXCEPTION_LENGTH_MISMATCH, DriverError.NOT_SET); } } @@ -4153,7 +4153,7 @@ void writeRPCBit(String sName, } else { writeByte((byte) 1); // length of datatype - writeByte((byte) (booleanValue.booleanValue() ? 1 : 0)); + writeByte((byte) (booleanValue ? 1 : 0)); } } @@ -4177,7 +4177,7 @@ void writeRPCByte(String sName, } else { writeByte((byte) 1); // length of datatype - writeByte(byteValue.byteValue()); + writeByte(byteValue); } } @@ -4201,7 +4201,7 @@ void writeRPCShort(String sName, } else { writeByte((byte) 2); // length of datatype - writeShort(shortValue.shortValue()); + writeShort(shortValue); } } @@ -4225,7 +4225,7 @@ void writeRPCInt(String sName, } else { writeByte((byte) 4); // length of datatype - writeInt(intValue.intValue()); + writeInt(intValue); } } @@ -4249,7 +4249,7 @@ void writeRPCLong(String sName, } else { writeByte((byte) 8); // length of datatype - writeLong(longValue.longValue()); + writeLong(longValue); } } @@ -4276,7 +4276,7 @@ void writeRPCReal(String sName, else { writeByte((byte) 4); // max length writeByte((byte) 4); // actual length - writeInt(Float.floatToRawIntBits(floatValue.floatValue())); + writeInt(Float.floatToRawIntBits(floatValue)); } } @@ -4304,7 +4304,7 @@ void writeRPCDouble(String sName, } else { writeByte((byte) l); // len of data bytes - long bits = Double.doubleToLongBits(doubleValue.doubleValue()); + long bits = Double.doubleToLongBits(doubleValue); long mask = 0xFF; int nShift = 0; for (int i = 0; i < 8; i++) { @@ -4616,7 +4616,7 @@ void writeTVPRows(TVP value) throws SQLServerException { writeByte((byte) 0); else { writeByte((byte) 8); - writeLong(Long.valueOf(currentColumnStringValue).longValue()); + writeLong(Long.valueOf(currentColumnStringValue)); } break; @@ -4625,7 +4625,7 @@ void writeTVPRows(TVP value) throws SQLServerException { writeByte((byte) 0); else { writeByte((byte) 1); - writeByte((byte) (Boolean.valueOf(currentColumnStringValue).booleanValue() ? 1 : 0)); + writeByte((byte) (Boolean.valueOf(currentColumnStringValue) ? 1 : 0)); } break; @@ -4634,7 +4634,7 @@ void writeTVPRows(TVP value) throws SQLServerException { writeByte((byte) 0); else { writeByte((byte) 4); - writeInt(Integer.valueOf(currentColumnStringValue).intValue()); + writeInt(Integer.valueOf(currentColumnStringValue)); } break; @@ -4644,7 +4644,7 @@ void writeTVPRows(TVP value) throws SQLServerException { writeByte((byte) 0); else { writeByte((byte) 2); // length of datatype - writeShort(Short.valueOf(currentColumnStringValue).shortValue()); + writeShort(Short.valueOf(currentColumnStringValue)); } break; @@ -4679,7 +4679,7 @@ void writeTVPRows(TVP value) throws SQLServerException { writeByte((byte) 0); // len of data bytes else { writeByte((byte) 8); // len of data bytes - long bits = Double.doubleToLongBits(Double.valueOf(currentColumnStringValue).doubleValue()); + long bits = Double.doubleToLongBits(Double.valueOf(currentColumnStringValue)); long mask = 0xFF; int nShift = 0; for (int i = 0; i < 8; i++) { @@ -4696,7 +4696,7 @@ void writeTVPRows(TVP value) throws SQLServerException { writeByte((byte) 0); // actual length (0 == null) else { writeByte((byte) 4); // actual length - writeInt(Float.floatToRawIntBits(Float.valueOf(currentColumnStringValue).floatValue())); + writeInt(Float.floatToRawIntBits(Float.valueOf(currentColumnStringValue))); } break; @@ -5962,7 +5962,7 @@ void writeRPCInputStream(String sName, if (streamLength >= maxStreamLength) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidLength")); - Object[] msgArgs = {Long.valueOf(streamLength)}; + Object[] msgArgs = {streamLength}; SQLServerException.makeFromDriverError(null, null, form.format(msgArgs), "", true); } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/Parameter.java b/src/main/java/com/microsoft/sqlserver/jdbc/Parameter.java index 87ddcf88c2..103ccf0453 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/Parameter.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/Parameter.java @@ -253,7 +253,7 @@ void setFromReturnStatus(int returnStatus, if (null == getterDTV) getterDTV = new DTV(); - getterDTV.setValue(null, JDBCType.INTEGER, new Integer(returnStatus), JavaType.INTEGER, null, null, null, con, getForceEncryption()); + getterDTV.setValue(null, JDBCType.INTEGER, returnStatus, JavaType.INTEGER, null, null, null, con, getForceEncryption()); } void setValue(JDBCType jdbcType, @@ -415,7 +415,7 @@ Object getValue(JDBCType jdbcType, int getInt(TDSReader tdsReader) throws SQLServerException { Integer value = (Integer) getValue(JDBCType.INTEGER, null, null, tdsReader); - return null != value ? value.intValue() : 0; + return null != value ? value : 0; } /** @@ -494,8 +494,8 @@ private void setTypeDefinition(DTV dtv) { // - the specified input scale (if any) // - the registered output scale Integer inScale = dtv.getScale(); - if (null != inScale && scale < inScale.intValue()) - scale = inScale.intValue(); + if (null != inScale && scale < inScale) + scale = inScale; if (param.isOutput() && scale < param.getOutScale()) scale = param.getOutScale(); diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBlob.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBlob.java index 452455111f..ef74f5c488 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBlob.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBlob.java @@ -197,13 +197,13 @@ public byte[] getBytes(long pos, getBytesFromStream(); if (pos < 1) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidPositionIndex")); - Object[] msgArgs = {new Long(pos)}; + Object[] msgArgs = {pos}; SQLServerException.makeFromDriverError(con, null, form.format(msgArgs), null, true); } if (length < 0) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidLength")); - Object[] msgArgs = {new Integer(length)}; + Object[] msgArgs = {length}; SQLServerException.makeFromDriverError(con, null, form.format(msgArgs), null, true); } @@ -271,7 +271,7 @@ public long position(Blob pattern, getBytesFromStream(); if (start < 1) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidPositionIndex")); - Object[] msgArgs = {new Long(start)}; + Object[] msgArgs = {start}; SQLServerException.makeFromDriverError(con, null, form.format(msgArgs), null, true); } @@ -299,7 +299,7 @@ public long position(byte[] bPattern, getBytesFromStream(); if (start < 1) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidPositionIndex")); - Object[] msgArgs = {new Long(start)}; + Object[] msgArgs = {start}; SQLServerException.makeFromDriverError(con, null, form.format(msgArgs), null, true); } @@ -345,7 +345,7 @@ public void truncate(long len) throws SQLException { if (len < 0) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidLength")); - Object[] msgArgs = {new Long(len)}; + Object[] msgArgs = {len}; SQLServerException.makeFromDriverError(con, null, form.format(msgArgs), null, true); } @@ -431,14 +431,14 @@ public int setBytes(long pos, // Offset must be within incoming bytes boundary. if (offset < 0 || offset > bytes.length) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidOffset")); - Object[] msgArgs = {new Integer(offset)}; + Object[] msgArgs = {offset}; SQLServerException.makeFromDriverError(con, null, form.format(msgArgs), null, true); } // len must be within incoming bytes boundary. if (len < 0 || len > bytes.length - offset) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidLength")); - Object[] msgArgs = {new Integer(len)}; + Object[] msgArgs = {len}; SQLServerException.makeFromDriverError(con, null, form.format(msgArgs), null, true); } @@ -447,7 +447,7 @@ public int setBytes(long pos, // past the end of data to request "append" mode. if (pos <= 0 || pos > value.length + 1) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidPositionIndex")); - Object[] msgArgs = {new Long(pos)}; + Object[] msgArgs = {pos}; SQLServerException.makeFromDriverError(con, null, form.format(msgArgs), null, true); } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java index 2fa3a3ef07..c291f9dd20 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java @@ -2141,7 +2141,7 @@ else if (null != sourceBulkRecord) { if (bulkNullable) { tdsWriter.writeByte((byte) 0x01); } - tdsWriter.writeByte((byte) (((Boolean) colValue).booleanValue() ? 1 : 0)); + tdsWriter.writeByte((byte) ((Boolean) colValue ? 1 : 0)); } break; @@ -3030,57 +3030,57 @@ private byte[] normalizedValue(JDBCType destJdbcType, try { switch (destJdbcType) { case BIT: - longValue = Long.valueOf((Boolean) value ? 1 : 0); - return ByteBuffer.allocate(Long.SIZE / Byte.SIZE).order(ByteOrder.LITTLE_ENDIAN).putLong(longValue.longValue()).array(); + longValue = (long) ((Boolean) value ? 1 : 0); + return ByteBuffer.allocate(Long.SIZE / Byte.SIZE).order(ByteOrder.LITTLE_ENDIAN).putLong(longValue).array(); case TINYINT: case SMALLINT: switch (srcJdbcType) { case BIT: - longValue = new Long((Boolean) value ? 1 : 0); + longValue = (long) ((Boolean) value ? 1 : 0); break; default: if (value instanceof Integer) { int intValue = (int) value; short shortValue = (short) intValue; - longValue = new Long(shortValue); + longValue = (long) shortValue; } else - longValue = new Long((short) value); + longValue = (long) (short) value; } - return ByteBuffer.allocate(Long.SIZE / Byte.SIZE).order(ByteOrder.LITTLE_ENDIAN).putLong(longValue.longValue()).array(); + return ByteBuffer.allocate(Long.SIZE / Byte.SIZE).order(ByteOrder.LITTLE_ENDIAN).putLong(longValue).array(); case INTEGER: switch (srcJdbcType) { case BIT: - longValue = new Long((Boolean) value ? 1 : 0); + longValue = (long) ((Boolean) value ? 1 : 0); break; case TINYINT: case SMALLINT: - longValue = new Long((short) value); + longValue = (long) (short) value; break; default: longValue = new Long((Integer) value); } - return ByteBuffer.allocate(Long.SIZE / Byte.SIZE).order(ByteOrder.LITTLE_ENDIAN).putLong(longValue.longValue()).array(); + return ByteBuffer.allocate(Long.SIZE / Byte.SIZE).order(ByteOrder.LITTLE_ENDIAN).putLong(longValue).array(); case BIGINT: switch (srcJdbcType) { case BIT: - longValue = new Long((Boolean) value ? 1 : 0); + longValue = (long) ((Boolean) value ? 1 : 0); break; case TINYINT: case SMALLINT: - longValue = new Long((short) value); + longValue = (long) (short) value; break; case INTEGER: longValue = new Long((Integer) value); break; default: - longValue = new Long((long) value); + longValue = (long) value; } - return ByteBuffer.allocate(Long.SIZE / Byte.SIZE).order(ByteOrder.LITTLE_ENDIAN).putLong(longValue.longValue()).array(); + return ByteBuffer.allocate(Long.SIZE / Byte.SIZE).order(ByteOrder.LITTLE_ENDIAN).putLong(longValue).array(); case BINARY: case VARBINARY: diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement.java index 2dd460cc38..41b6f5a670 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement.java @@ -89,11 +89,11 @@ String getClassNameInternal() { public void registerOutParameter(int index, int sqlType) throws SQLServerException { if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) - loggerExternal.entering(getClassNameLogging(), "registerOutParameter", new Object[] {new Integer(index), new Integer(sqlType)}); + loggerExternal.entering(getClassNameLogging(), "registerOutParameter", new Object[] {index, sqlType}); checkClosed(); if (index < 1 || index > inOutParam.length) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_indexOutOfRange")); - Object[] msgArgs = {new Integer(index)}; + Object[] msgArgs = {index}; SQLServerException.makeFromDriverError(connection, this, form.format(msgArgs), "7009", false); } @@ -318,7 +318,7 @@ boolean onRetValue(TDSReader tdsReader) throws SQLServerException { // If we were asked to retain the OUT parameters as we skip past them, // then report an error if we did not find any. MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_valueNotSetForParameter")); - Object[] msgArgs = {new Integer(outParamIndex + 1)}; + Object[] msgArgs = {outParamIndex + 1}; SQLServerException.makeFromDriverError(connection, this, form.format(msgArgs), null, false); } @@ -346,7 +346,7 @@ boolean onRetValue(TDSReader tdsReader) throws SQLServerException { int sqlType, String typeName) throws SQLServerException { if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) - loggerExternal.entering(getClassNameLogging(), "registerOutParameter", new Object[] {new Integer(index), new Integer(sqlType), typeName}); + loggerExternal.entering(getClassNameLogging(), "registerOutParameter", new Object[] {index, sqlType, typeName}); checkClosed(); @@ -360,7 +360,7 @@ boolean onRetValue(TDSReader tdsReader) throws SQLServerException { int scale) throws SQLServerException { if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "registerOutParameter", - new Object[] {new Integer(index), new Integer(sqlType), new Integer(scale)}); + new Object[] {index, sqlType, scale}); checkClosed(); @@ -376,7 +376,7 @@ public void registerOutParameter(int index, int scale) throws SQLServerException { if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "registerOutParameter", - new Object[] {new Integer(index), new Integer(sqlType), new Integer(scale), new Integer(precision)}); + new Object[] {index, sqlType, scale, precision}); checkClosed(); @@ -395,14 +395,14 @@ private Parameter getterGetParam(int index) throws SQLServerException { // Check for valid index if (index < 1 || index > inOutParam.length) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidOutputParameter")); - Object[] msgArgs = {new Integer(index)}; + Object[] msgArgs = {index}; SQLServerException.makeFromDriverError(connection, this, form.format(msgArgs), "07009", false); } // Check index refers to a registered OUT parameter if (!inOutParam[index - 1].isOutput()) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_outputParameterNotRegisteredForOutput")); - Object[] msgArgs = {new Integer(index)}; + Object[] msgArgs = {index}; SQLServerException.makeFromDriverError(connection, this, form.format(msgArgs), "07009", true); } @@ -457,7 +457,7 @@ public int getInt(int index) throws SQLServerException { checkClosed(); Integer value = (Integer) getValue(index, JDBCType.INTEGER); loggerExternal.exiting(getClassNameLogging(), "getInt", value); - return null != value ? value.intValue() : 0; + return null != value ? value : 0; } public int getInt(String sCol) throws SQLServerException { @@ -465,7 +465,7 @@ public int getInt(String sCol) throws SQLServerException { checkClosed(); Integer value = (Integer) getValue(findColumn(sCol), JDBCType.INTEGER); loggerExternal.exiting(getClassNameLogging(), "getInt", value); - return null != value ? value.intValue() : 0; + return null != value ? value : 0; } public String getString(int index) throws SQLServerException { @@ -504,7 +504,7 @@ public final String getNString(String parameterName) throws SQLException { public BigDecimal getBigDecimal(int parameterIndex, int scale) throws SQLException { if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) - loggerExternal.entering(getClassNameLogging(), "getBigDecimal", new Object[] {Integer.valueOf(parameterIndex), Integer.valueOf(scale)}); + loggerExternal.entering(getClassNameLogging(), "getBigDecimal", new Object[] {parameterIndex, scale}); checkClosed(); BigDecimal value = (BigDecimal) getValue(parameterIndex, JDBCType.DECIMAL); if (null != value) @@ -517,7 +517,7 @@ public BigDecimal getBigDecimal(int parameterIndex, public BigDecimal getBigDecimal(String parameterName, int scale) throws SQLException { if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) - loggerExternal.entering(getClassNameLogging(), "getBigDecimal", new Object[] {parameterName, Integer.valueOf(scale)}); + loggerExternal.entering(getClassNameLogging(), "getBigDecimal", new Object[] {parameterName, scale}); checkClosed(); BigDecimal value = (BigDecimal) getValue(findColumn(parameterName), JDBCType.DECIMAL); if (null != value) @@ -531,7 +531,7 @@ public boolean getBoolean(int index) throws SQLServerException { checkClosed(); Boolean value = (Boolean) getValue(index, JDBCType.BIT); loggerExternal.exiting(getClassNameLogging(), "getBoolean", value); - return null != value ? value.booleanValue() : false; + return null != value ? value : false; } public boolean getBoolean(String sCol) throws SQLServerException { @@ -539,7 +539,7 @@ public boolean getBoolean(String sCol) throws SQLServerException { checkClosed(); Boolean value = (Boolean) getValue(findColumn(sCol), JDBCType.BIT); loggerExternal.exiting(getClassNameLogging(), "getBoolean", value); - return null != value ? value.booleanValue() : false; + return null != value ? value : false; } public byte getByte(int index) throws SQLServerException { @@ -617,7 +617,7 @@ public double getDouble(int index) throws SQLServerException { checkClosed(); Double value = (Double) getValue(index, JDBCType.DOUBLE); loggerExternal.exiting(getClassNameLogging(), "getDouble", value); - return null != value ? value.doubleValue() : 0; + return null != value ? value : 0; } public double getDouble(String sCol) throws SQLServerException { @@ -625,7 +625,7 @@ public double getDouble(String sCol) throws SQLServerException { checkClosed(); Double value = (Double) getValue(findColumn(sCol), JDBCType.DOUBLE); loggerExternal.exiting(getClassNameLogging(), "getDouble", value); - return null != value ? value.doubleValue() : 0; + return null != value ? value : 0; } public float getFloat(int index) throws SQLServerException { @@ -633,7 +633,7 @@ public float getFloat(int index) throws SQLServerException { checkClosed(); Float value = (Float) getValue(index, JDBCType.REAL); loggerExternal.exiting(getClassNameLogging(), "getFloat", value); - return null != value ? value.floatValue() : 0; + return null != value ? value : 0; } public float getFloat(String sCol) throws SQLServerException { @@ -642,7 +642,7 @@ public float getFloat(String sCol) throws SQLServerException { checkClosed(); Float value = (Float) getValue(findColumn(sCol), JDBCType.REAL); loggerExternal.exiting(getClassNameLogging(), "getFloat", value); - return null != value ? value.floatValue() : 0; + return null != value ? value : 0; } public long getLong(int index) throws SQLServerException { @@ -651,7 +651,7 @@ public long getLong(int index) throws SQLServerException { checkClosed(); Long value = (Long) getValue(index, JDBCType.BIGINT); loggerExternal.exiting(getClassNameLogging(), "getLong", value); - return null != value ? value.longValue() : 0; + return null != value ? value : 0; } public long getLong(String sCol) throws SQLServerException { @@ -659,7 +659,7 @@ public long getLong(String sCol) throws SQLServerException { checkClosed(); Long value = (Long) getValue(findColumn(sCol), JDBCType.BIGINT); loggerExternal.exiting(getClassNameLogging(), "getLong", value); - return null != value ? value.longValue() : 0; + return null != value ? value : 0; } public Object getObject(int index) throws SQLServerException { @@ -700,7 +700,7 @@ public short getShort(int index) throws SQLServerException { checkClosed(); Short value = (Short) getValue(index, JDBCType.SMALLINT); loggerExternal.exiting(getClassNameLogging(), "getShort", value); - return null != value ? value.shortValue() : 0; + return null != value ? value : 0; } public short getShort(String sCol) throws SQLServerException { @@ -708,7 +708,7 @@ public short getShort(String sCol) throws SQLServerException { checkClosed(); Short value = (Short) getValue(findColumn(sCol), JDBCType.SMALLINT); loggerExternal.exiting(getClassNameLogging(), "getShort", value); - return null != value ? value.shortValue() : 0; + return null != value ? value : 0; } public Time getTime(int index) throws SQLServerException { @@ -1752,7 +1752,7 @@ public void setObject(String sCol, // For all other types, this value will be ignored. setObject(setterGetParam(findColumn(sCol)), o, JavaType.of(o), JDBCType.of(n), - (java.sql.Types.NUMERIC == n || java.sql.Types.DECIMAL == n) ? Integer.valueOf(m) : null, null, forceEncrypt, findColumn(sCol), null); + (java.sql.Types.NUMERIC == n || java.sql.Types.DECIMAL == n) ? m : null, null, forceEncrypt, findColumn(sCol), null); loggerExternal.exiting(getClassNameLogging(), "setObject"); } @@ -1802,7 +1802,7 @@ public final void setObject(String sCol, setObject(setterGetParam(findColumn(sCol)), x, JavaType.of(x), JDBCType.of(targetSqlType), (java.sql.Types.NUMERIC == targetSqlType || java.sql.Types.DECIMAL == targetSqlType - || InputStream.class.isInstance(x) || Reader.class.isInstance(x)) ? Integer.valueOf(scale) : null, + || InputStream.class.isInstance(x) || Reader.class.isInstance(x)) ? scale : null, precision, false, findColumn(sCol), null); loggerExternal.exiting(getClassNameLogging(), "setObject"); @@ -2273,7 +2273,7 @@ public void setByte(String sCol, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setByte", new Object[] {sCol, b}); checkClosed(); - setValue(findColumn(sCol), JDBCType.TINYINT, Byte.valueOf(b), JavaType.BYTE, false); + setValue(findColumn(sCol), JDBCType.TINYINT, b, JavaType.BYTE, false); loggerExternal.exiting(getClassNameLogging(), "setByte"); } @@ -2299,7 +2299,7 @@ public void setByte(String sCol, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setByte", new Object[] {sCol, b, forceEncrypt}); checkClosed(); - setValue(findColumn(sCol), JDBCType.TINYINT, Byte.valueOf(b), JavaType.BYTE, forceEncrypt); + setValue(findColumn(sCol), JDBCType.TINYINT, b, JavaType.BYTE, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "setByte"); } @@ -2506,7 +2506,7 @@ public void setDouble(String sCol, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setDouble", new Object[] {sCol, d}); checkClosed(); - setValue(findColumn(sCol), JDBCType.DOUBLE, Double.valueOf(d), JavaType.DOUBLE, false); + setValue(findColumn(sCol), JDBCType.DOUBLE, d, JavaType.DOUBLE, false); loggerExternal.exiting(getClassNameLogging(), "setDouble"); } @@ -2532,7 +2532,7 @@ public void setDouble(String sCol, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setDouble", new Object[] {sCol, d, forceEncrypt}); checkClosed(); - setValue(findColumn(sCol), JDBCType.DOUBLE, Double.valueOf(d), JavaType.DOUBLE, forceEncrypt); + setValue(findColumn(sCol), JDBCType.DOUBLE, d, JavaType.DOUBLE, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "setDouble"); } @@ -2541,7 +2541,7 @@ public void setFloat(String sCol, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setFloat", new Object[] {sCol, f}); checkClosed(); - setValue(findColumn(sCol), JDBCType.REAL, Float.valueOf(f), JavaType.FLOAT, false); + setValue(findColumn(sCol), JDBCType.REAL, f, JavaType.FLOAT, false); loggerExternal.exiting(getClassNameLogging(), "setFloat"); } @@ -2567,7 +2567,7 @@ public void setFloat(String sCol, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setFloat", new Object[] {sCol, f, forceEncrypt}); checkClosed(); - setValue(findColumn(sCol), JDBCType.REAL, Float.valueOf(f), JavaType.FLOAT, forceEncrypt); + setValue(findColumn(sCol), JDBCType.REAL, f, JavaType.FLOAT, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "setFloat"); } @@ -2576,7 +2576,7 @@ public void setInt(String sCol, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setInt", new Object[] {sCol, i}); checkClosed(); - setValue(findColumn(sCol), JDBCType.INTEGER, Integer.valueOf(i), JavaType.INTEGER, false); + setValue(findColumn(sCol), JDBCType.INTEGER, i, JavaType.INTEGER, false); loggerExternal.exiting(getClassNameLogging(), "setInt"); } @@ -2602,7 +2602,7 @@ public void setInt(String sCol, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setInt", new Object[] {sCol, i, forceEncrypt}); checkClosed(); - setValue(findColumn(sCol), JDBCType.INTEGER, Integer.valueOf(i), JavaType.INTEGER, forceEncrypt); + setValue(findColumn(sCol), JDBCType.INTEGER, i, JavaType.INTEGER, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "setInt"); } @@ -2611,7 +2611,7 @@ public void setLong(String sCol, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setLong", new Object[] {sCol, l}); checkClosed(); - setValue(findColumn(sCol), JDBCType.BIGINT, Long.valueOf(l), JavaType.LONG, false); + setValue(findColumn(sCol), JDBCType.BIGINT, l, JavaType.LONG, false); loggerExternal.exiting(getClassNameLogging(), "setLong"); } @@ -2637,7 +2637,7 @@ public void setLong(String sCol, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setLong", new Object[] {sCol, l, forceEncrypt}); checkClosed(); - setValue(findColumn(sCol), JDBCType.BIGINT, Long.valueOf(l), JavaType.LONG, forceEncrypt); + setValue(findColumn(sCol), JDBCType.BIGINT, l, JavaType.LONG, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "setLong"); } @@ -2646,7 +2646,7 @@ public void setShort(String sCol, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setShort", new Object[] {sCol, s}); checkClosed(); - setValue(findColumn(sCol), JDBCType.SMALLINT, Short.valueOf(s), JavaType.SHORT, false); + setValue(findColumn(sCol), JDBCType.SMALLINT, s, JavaType.SHORT, false); loggerExternal.exiting(getClassNameLogging(), "setShort"); } @@ -2672,7 +2672,7 @@ public void setShort(String sCol, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setShort", new Object[] {sCol, s, forceEncrypt}); checkClosed(); - setValue(findColumn(sCol), JDBCType.SMALLINT, Short.valueOf(s), JavaType.SHORT, forceEncrypt); + setValue(findColumn(sCol), JDBCType.SMALLINT, s, JavaType.SHORT, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "setShort"); } @@ -2681,7 +2681,7 @@ public void setBoolean(String sCol, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setBoolean", new Object[] {sCol, b}); checkClosed(); - setValue(findColumn(sCol), JDBCType.BIT, Boolean.valueOf(b), JavaType.BOOLEAN, false); + setValue(findColumn(sCol), JDBCType.BIT, b, JavaType.BOOLEAN, false); loggerExternal.exiting(getClassNameLogging(), "setBoolean"); } @@ -2707,7 +2707,7 @@ public void setBoolean(String sCol, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setBoolean", new Object[] {sCol, b, forceEncrypt}); checkClosed(); - setValue(findColumn(sCol), JDBCType.BIT, Boolean.valueOf(b), JavaType.BOOLEAN, forceEncrypt); + setValue(findColumn(sCol), JDBCType.BIT, b, JavaType.BOOLEAN, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "setBoolean"); } @@ -2866,7 +2866,7 @@ public void registerOutParameter(String s, int n, String s1) throws SQLServerException { if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) - loggerExternal.entering(getClassNameLogging(), "registerOutParameter", new Object[] {s, new Integer(n), s1}); + loggerExternal.entering(getClassNameLogging(), "registerOutParameter", new Object[] {s, n, s1}); checkClosed(); registerOutParameter(findColumn(s), n, s1); loggerExternal.exiting(getClassNameLogging(), "registerOutParameter"); @@ -2877,7 +2877,7 @@ public void registerOutParameter(String parameterName, int scale) throws SQLServerException { if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "registerOutParameter", - new Object[] {parameterName, new Integer(sqlType), new Integer(scale)}); + new Object[] {parameterName, sqlType, scale}); checkClosed(); registerOutParameter(findColumn(parameterName), sqlType, scale); loggerExternal.exiting(getClassNameLogging(), "registerOutParameter"); @@ -2889,7 +2889,7 @@ public void registerOutParameter(String parameterName, int scale) throws SQLServerException { if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "registerOutParameter", - new Object[] {parameterName, new Integer(sqlType), new Integer(scale)}); + new Object[] {parameterName, sqlType, scale}); checkClosed(); registerOutParameter(findColumn(parameterName), sqlType, precision, scale); loggerExternal.exiting(getClassNameLogging(), "registerOutParameter"); @@ -2898,7 +2898,7 @@ public void registerOutParameter(String parameterName, public void registerOutParameter(String s, int n) throws SQLServerException { if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) - loggerExternal.entering(getClassNameLogging(), "registerOutParameter", new Object[] {s, new Integer(n)}); + loggerExternal.entering(getClassNameLogging(), "registerOutParameter", new Object[] {s, n}); checkClosed(); registerOutParameter(findColumn(s), n); loggerExternal.exiting(getClassNameLogging(), "registerOutParameter"); diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement42.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement42.java index ee73cc1768..cf5e1f2460 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement42.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement42.java @@ -34,10 +34,10 @@ public void registerOutParameter(int index, DriverJDBCVersion.checkSupportsJDBC42(); if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) - loggerExternal.entering(getClassNameLogging(), "registerOutParameter", new Object[] {new Integer(index), sqlType}); + loggerExternal.entering(getClassNameLogging(), "registerOutParameter", new Object[] {index, sqlType}); // getVendorTypeNumber() returns the same constant integer values as in java.sql.Types - registerOutParameter(index, sqlType.getVendorTypeNumber().intValue()); + registerOutParameter(index, sqlType.getVendorTypeNumber()); loggerExternal.exiting(getClassNameLogging(), "registerOutParameter"); } @@ -47,10 +47,10 @@ public void registerOutParameter(int index, DriverJDBCVersion.checkSupportsJDBC42(); if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) - loggerExternal.entering(getClassNameLogging(), "registerOutParameter", new Object[] {new Integer(index), sqlType, typeName}); + loggerExternal.entering(getClassNameLogging(), "registerOutParameter", new Object[] {index, sqlType, typeName}); // getVendorTypeNumber() returns the same constant integer values as in java.sql.Types - registerOutParameter(index, sqlType.getVendorTypeNumber().intValue(), typeName); + registerOutParameter(index, sqlType.getVendorTypeNumber(), typeName); loggerExternal.exiting(getClassNameLogging(), "registerOutParameter"); } @@ -61,10 +61,10 @@ public void registerOutParameter(int index, DriverJDBCVersion.checkSupportsJDBC42(); if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) - loggerExternal.entering(getClassNameLogging(), "registerOutParameter", new Object[] {new Integer(index), sqlType, new Integer(scale)}); + loggerExternal.entering(getClassNameLogging(), "registerOutParameter", new Object[] {index, sqlType, scale}); // getVendorTypeNumber() returns the same constant integer values as in java.sql.Types - registerOutParameter(index, sqlType.getVendorTypeNumber().intValue(), scale); + registerOutParameter(index, sqlType.getVendorTypeNumber(), scale); loggerExternal.exiting(getClassNameLogging(), "registerOutParameter"); } @@ -76,10 +76,10 @@ public void registerOutParameter(int index, DriverJDBCVersion.checkSupportsJDBC42(); if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) - loggerExternal.entering(getClassNameLogging(), "registerOutParameter", new Object[] {new Integer(index), sqlType, new Integer(scale)}); + loggerExternal.entering(getClassNameLogging(), "registerOutParameter", new Object[] {index, sqlType, scale}); // getVendorTypeNumber() returns the same constant integer values as in java.sql.Types - registerOutParameter(index, sqlType.getVendorTypeNumber().intValue(), precision, scale); + registerOutParameter(index, sqlType.getVendorTypeNumber(), precision, scale); loggerExternal.exiting(getClassNameLogging(), "registerOutParameter"); } @@ -93,7 +93,7 @@ public void setObject(String sCol, loggerExternal.entering(getClassNameLogging(), "setObject", new Object[] {sCol, obj, jdbcType}); // getVendorTypeNumber() returns the same constant integer values as in java.sql.Types - setObject(sCol, obj, jdbcType.getVendorTypeNumber().intValue()); + setObject(sCol, obj, jdbcType.getVendorTypeNumber()); loggerExternal.exiting(getClassNameLogging(), "setObject"); } @@ -108,7 +108,7 @@ public void setObject(String sCol, loggerExternal.entering(getClassNameLogging(), "setObject", new Object[] {sCol, obj, jdbcType, scale}); // getVendorTypeNumber() returns the same constant integer values as in java.sql.Types - setObject(sCol, obj, jdbcType.getVendorTypeNumber().intValue(), scale); + setObject(sCol, obj, jdbcType.getVendorTypeNumber(), scale); loggerExternal.exiting(getClassNameLogging(), "setObject"); } @@ -124,7 +124,7 @@ public void setObject(String sCol, loggerExternal.entering(getClassNameLogging(), "setObject", new Object[] {sCol, obj, jdbcType, scale, forceEncrypt}); // getVendorTypeNumber() returns the same constant integer values as in java.sql.Types - setObject(sCol, obj, jdbcType.getVendorTypeNumber().intValue(), scale, forceEncrypt); + setObject(sCol, obj, jdbcType.getVendorTypeNumber(), scale, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "setObject"); } @@ -138,7 +138,7 @@ public void registerOutParameter(String parameterName, loggerExternal.entering(getClassNameLogging(), "registerOutParameter", new Object[] {parameterName, sqlType, typeName}); // getVendorTypeNumber() returns the same constant integer values as in java.sql.Types - registerOutParameter(parameterName, sqlType.getVendorTypeNumber().intValue(), typeName); + registerOutParameter(parameterName, sqlType.getVendorTypeNumber(), typeName); loggerExternal.exiting(getClassNameLogging(), "registerOutParameter"); } @@ -149,10 +149,10 @@ public void registerOutParameter(String parameterName, DriverJDBCVersion.checkSupportsJDBC42(); if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) - loggerExternal.entering(getClassNameLogging(), "registerOutParameter", new Object[] {parameterName, sqlType, new Integer(scale)}); + loggerExternal.entering(getClassNameLogging(), "registerOutParameter", new Object[] {parameterName, sqlType, scale}); // getVendorTypeNumber() returns the same constant integer values as in java.sql.Types - registerOutParameter(parameterName, sqlType.getVendorTypeNumber().intValue(), scale); + registerOutParameter(parameterName, sqlType.getVendorTypeNumber(), scale); loggerExternal.exiting(getClassNameLogging(), "registerOutParameter"); } @@ -164,10 +164,10 @@ public void registerOutParameter(String parameterName, DriverJDBCVersion.checkSupportsJDBC42(); if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) - loggerExternal.entering(getClassNameLogging(), "registerOutParameter", new Object[] {parameterName, sqlType, new Integer(scale)}); + loggerExternal.entering(getClassNameLogging(), "registerOutParameter", new Object[] {parameterName, sqlType, scale}); // getVendorTypeNumber() returns the same constant integer values as in java.sql.Types - registerOutParameter(parameterName, sqlType.getVendorTypeNumber().intValue(), precision, scale); + registerOutParameter(parameterName, sqlType.getVendorTypeNumber(), precision, scale); loggerExternal.exiting(getClassNameLogging(), "registerOutParameter"); } @@ -180,7 +180,7 @@ public void registerOutParameter(String parameterName, loggerExternal.entering(getClassNameLogging(), "registerOutParameter", new Object[] {parameterName, sqlType}); // getVendorTypeNumber() returns the same constant integer values as in java.sql.Types - registerOutParameter(parameterName, sqlType.getVendorTypeNumber().intValue()); + registerOutParameter(parameterName, sqlType.getVendorTypeNumber()); loggerExternal.exiting(getClassNameLogging(), "registerOutParameter"); } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerClob.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerClob.java index 3accc9e204..f933727cfe 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerClob.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerClob.java @@ -275,13 +275,13 @@ public String getSubString(long pos, getStringFromStream(); if (pos < 1) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidPositionIndex")); - Object[] msgArgs = {new Long(pos)}; + Object[] msgArgs = {pos}; SQLServerException.makeFromDriverError(con, null, form.format(msgArgs), null, true); } if (length < 0) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidLength")); - Object[] msgArgs = {new Integer(length)}; + Object[] msgArgs = {length}; SQLServerException.makeFromDriverError(con, null, form.format(msgArgs), null, true); } @@ -350,7 +350,7 @@ public long position(Clob searchstr, getStringFromStream(); if (start < 1) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidPositionIndex")); - Object[] msgArgs = {new Long(start)}; + Object[] msgArgs = {start}; SQLServerException.makeFromDriverError(con, null, form.format(msgArgs), null, true); } @@ -379,7 +379,7 @@ public long position(String searchstr, getStringFromStream(); if (start < 1) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidPositionIndex")); - Object[] msgArgs = {new Long(start)}; + Object[] msgArgs = {start}; SQLServerException.makeFromDriverError(con, null, form.format(msgArgs), null, true); } @@ -411,7 +411,7 @@ public void truncate(long len) throws SQLException { getStringFromStream(); if (len < 0) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidLength")); - Object[] msgArgs = {new Long(len)}; + Object[] msgArgs = {len}; SQLServerException.makeFromDriverError(con, null, form.format(msgArgs), null, true); } @@ -433,7 +433,7 @@ public java.io.OutputStream setAsciiStream(long pos) throws SQLException { if (pos < 1) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidPositionIndex")); - Object[] msgArgs = {new Long(pos)}; + Object[] msgArgs = {pos}; SQLServerException.makeFromDriverError(con, null, form.format(msgArgs), null, true); } @@ -454,7 +454,7 @@ public java.io.Writer setCharacterStream(long pos) throws SQLException { if (pos < 1) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidPositionIndex")); - Object[] msgArgs = {new Long(pos)}; + Object[] msgArgs = {pos}; SQLServerException.makeFromDriverError(con, null, form.format(msgArgs), null, true); } @@ -514,14 +514,14 @@ public int setString(long pos, // Offset must be within incoming string str boundary. if (offset < 0 || offset > str.length()) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidOffset")); - Object[] msgArgs = {new Integer(offset)}; + Object[] msgArgs = {offset}; SQLServerException.makeFromDriverError(con, null, form.format(msgArgs), null, true); } // len must be within incoming string str boundary. if (len < 0 || len > str.length() - offset) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidLength")); - Object[] msgArgs = {new Integer(len)}; + Object[] msgArgs = {len}; SQLServerException.makeFromDriverError(con, null, form.format(msgArgs), null, true); } @@ -530,7 +530,7 @@ public int setString(long pos, // past the end of data to request "append" mode. if (pos < 1 || pos > value.length() + 1) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidPositionIndex")); - Object[] msgArgs = {new Long(pos)}; + Object[] msgArgs = {pos}; SQLServerException.makeFromDriverError(con, null, form.format(msgArgs), null, true); } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java index a243203754..61fc7bc398 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java @@ -1398,7 +1398,7 @@ Connection connectInternal(Properties propsIn, sPropKey = SQLServerDriverIntProperty.STATEMENT_POOLING_CACHE_SIZE.toString(); if (activeConnectionProperties.getProperty(sPropKey) != null && activeConnectionProperties.getProperty(sPropKey).length() > 0) { try { - int n = (new Integer(activeConnectionProperties.getProperty(sPropKey))).intValue(); + int n = new Integer(activeConnectionProperties.getProperty(sPropKey)); this.setStatementPoolingCacheSize(n); } catch (NumberFormatException e) { @@ -1535,7 +1535,7 @@ Connection connectInternal(Properties propsIn, try { String strPort = activeConnectionProperties.getProperty(sPropKey); if (null != strPort) { - nPort = (new Integer(strPort)).intValue(); + nPort = new Integer(strPort); if ((nPort < 0) || (nPort > 65535)) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidPortNumber")); @@ -1615,7 +1615,7 @@ else if (0 == requestedPacketSize) nLockTimeout = defaultLockTimeOut; // Wait forever if (activeConnectionProperties.getProperty(sPropKey) != null && activeConnectionProperties.getProperty(sPropKey).length() > 0) { try { - int n = (new Integer(activeConnectionProperties.getProperty(sPropKey))).intValue(); + int n = new Integer(activeConnectionProperties.getProperty(sPropKey)); if (n >= defaultLockTimeOut) nLockTimeout = n; else { @@ -1636,7 +1636,7 @@ else if (0 == requestedPacketSize) queryTimeoutSeconds = defaultQueryTimeout; // Wait forever if (activeConnectionProperties.getProperty(sPropKey) != null && activeConnectionProperties.getProperty(sPropKey).length() > 0) { try { - int n = (new Integer(activeConnectionProperties.getProperty(sPropKey))).intValue(); + int n = new Integer(activeConnectionProperties.getProperty(sPropKey)); if (n >= defaultQueryTimeout) { queryTimeoutSeconds = n; } @@ -1658,7 +1658,7 @@ else if (0 == requestedPacketSize) socketTimeoutMilliseconds = defaultSocketTimeout; // Wait forever if (activeConnectionProperties.getProperty(sPropKey) != null && activeConnectionProperties.getProperty(sPropKey).length() > 0) { try { - int n = (new Integer(activeConnectionProperties.getProperty(sPropKey))).intValue(); + int n = new Integer(activeConnectionProperties.getProperty(sPropKey)); if (n >= defaultSocketTimeout) { socketTimeoutMilliseconds = n; } @@ -1678,7 +1678,7 @@ else if (0 == requestedPacketSize) sPropKey = SQLServerDriverIntProperty.SERVER_PREPARED_STATEMENT_DISCARD_THRESHOLD.toString(); if (activeConnectionProperties.getProperty(sPropKey) != null && activeConnectionProperties.getProperty(sPropKey).length() > 0) { try { - int n = (new Integer(activeConnectionProperties.getProperty(sPropKey))).intValue(); + int n = new Integer(activeConnectionProperties.getProperty(sPropKey)); setServerPreparedStatementDiscardThreshold(n); } catch (NumberFormatException e) { @@ -2128,7 +2128,7 @@ ServerPortPlaceHolder primaryPermissionCheck(String primary, connectionlogger.fine(toString() + " SQL Server port returned by SQL Browser: " + instancePort); try { if (null != instancePort) { - primaryPortNumber = (new Integer(instancePort)).intValue(); + primaryPortNumber = new Integer(instancePort); if ((primaryPortNumber < 0) || (primaryPortNumber > 65535)) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidPortNumber")); @@ -2838,7 +2838,7 @@ static String sqlStatementToSetCommit(boolean autoCommit) { public void setAutoCommit(boolean newAutoCommitMode) throws SQLServerException { if (loggerExternal.isLoggable(Level.FINER)) { - loggerExternal.entering(getClassNameLogging(), "setAutoCommit", Boolean.valueOf(newAutoCommitMode)); + loggerExternal.entering(getClassNameLogging(), "setAutoCommit", newAutoCommitMode); if (Util.IsActivityTraceOn()) loggerExternal.finer(toString() + " ActivityId: " + ActivityCorrelator.getNext().toString()); } @@ -2868,7 +2868,7 @@ public void setAutoCommit(boolean newAutoCommitMode) throws SQLServerException { checkClosed(); boolean res = !inXATransaction && databaseAutoCommitMode; if (loggerExternal.isLoggable(Level.FINER)) - loggerExternal.exiting(getClassNameLogging(), "getAutoCommit", Boolean.valueOf(res)); + loggerExternal.exiting(getClassNameLogging(), "getAutoCommit", res); return res; } @@ -3008,7 +3008,7 @@ final void poolCloseEventNotify() throws SQLServerException { /* L0 */ public boolean isClosed() throws SQLServerException { loggerExternal.entering(getClassNameLogging(), "isClosed"); - loggerExternal.exiting(getClassNameLogging(), "isClosed", Boolean.valueOf(isSessionUnAvailable())); + loggerExternal.exiting(getClassNameLogging(), "isClosed", isSessionUnAvailable()); return isSessionUnAvailable(); } @@ -3024,7 +3024,7 @@ final void poolCloseEventNotify() throws SQLServerException { /* L0 */ public void setReadOnly(boolean readOnly) throws SQLServerException { if (loggerExternal.isLoggable(Level.FINER)) - loggerExternal.entering(getClassNameLogging(), "setReadOnly", Boolean.valueOf(readOnly)); + loggerExternal.entering(getClassNameLogging(), "setReadOnly", readOnly); checkClosed(); // do nothing per spec loggerExternal.exiting(getClassNameLogging(), "setReadOnly"); @@ -3034,7 +3034,7 @@ final void poolCloseEventNotify() throws SQLServerException { loggerExternal.entering(getClassNameLogging(), "isReadOnly"); checkClosed(); if (loggerExternal.isLoggable(Level.FINER)) - loggerExternal.exiting(getClassNameLogging(), "isReadOnly", Boolean.valueOf(false)); + loggerExternal.exiting(getClassNameLogging(), "isReadOnly", Boolean.FALSE); return false; } @@ -3060,7 +3060,7 @@ final void poolCloseEventNotify() throws SQLServerException { /* L0 */ public void setTransactionIsolation(int level) throws SQLServerException { if (loggerExternal.isLoggable(Level.FINER)) { - loggerExternal.entering(getClassNameLogging(), "setTransactionIsolation", new Integer(level)); + loggerExternal.entering(getClassNameLogging(), "setTransactionIsolation", level); if (Util.IsActivityTraceOn()) { loggerExternal.finer(toString() + " ActivityId: " + ActivityCorrelator.getNext().toString()); } @@ -3080,7 +3080,7 @@ final void poolCloseEventNotify() throws SQLServerException { loggerExternal.entering(getClassNameLogging(), "getTransactionIsolation"); checkClosed(); if (loggerExternal.isLoggable(Level.FINER)) - loggerExternal.exiting(getClassNameLogging(), "getTransactionIsolation", new Integer(transactionIsolationLevel)); + loggerExternal.exiting(getClassNameLogging(), "getTransactionIsolation", transactionIsolationLevel); return transactionIsolationLevel; } @@ -3124,7 +3124,7 @@ public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLServerException { if (loggerExternal.isLoggable(Level.FINER)) loggerExternal.entering(getClassNameLogging(), "createStatement", - new Object[] {new Integer(resultSetType), new Integer(resultSetConcurrency)}); + new Object[] {resultSetType, resultSetConcurrency}); checkClosed(); Statement st = new SQLServerStatement(this, resultSetType, resultSetConcurrency, SQLServerStatementColumnEncryptionSetting.UseConnectionSetting); @@ -3137,7 +3137,7 @@ public PreparedStatement prepareStatement(String sql, int resultSetConcurrency) throws SQLServerException { if (loggerExternal.isLoggable(Level.FINER)) loggerExternal.entering(getClassNameLogging(), "prepareStatement", - new Object[] {sql, new Integer(resultSetType), new Integer(resultSetConcurrency)}); + new Object[] {sql, resultSetType, resultSetConcurrency}); checkClosed(); PreparedStatement st; @@ -3161,7 +3161,7 @@ private PreparedStatement prepareStatement(String sql, SQLServerStatementColumnEncryptionSetting stmtColEncSetting) throws SQLServerException { if (loggerExternal.isLoggable(Level.FINER)) loggerExternal.entering(getClassNameLogging(), "prepareStatement", - new Object[] {sql, new Integer(resultSetType), new Integer(resultSetConcurrency), stmtColEncSetting}); + new Object[] {sql, resultSetType, resultSetConcurrency, stmtColEncSetting}); checkClosed(); PreparedStatement st; @@ -3182,7 +3182,7 @@ public CallableStatement prepareCall(String sql, int resultSetConcurrency) throws SQLServerException { if (loggerExternal.isLoggable(Level.FINER)) loggerExternal.entering(getClassNameLogging(), "prepareCall", - new Object[] {sql, new Integer(resultSetType), new Integer(resultSetConcurrency)}); + new Object[] {sql, resultSetType, resultSetConcurrency}); checkClosed(); CallableStatement st; @@ -4539,7 +4539,7 @@ public Statement createStatement(int nType, int nConcur, int resultSetHoldability) throws SQLServerException { loggerExternal.entering(getClassNameLogging(), "createStatement", - new Object[] {new Integer(nType), new Integer(nConcur), resultSetHoldability}); + new Object[] {nType, nConcur, resultSetHoldability}); Statement st = createStatement(nType, nConcur, resultSetHoldability, SQLServerStatementColumnEncryptionSetting.UseConnectionSetting); loggerExternal.exiting(getClassNameLogging(), "createStatement", st); return st; @@ -4550,7 +4550,7 @@ public Statement createStatement(int nType, int resultSetHoldability, SQLServerStatementColumnEncryptionSetting stmtColEncSetting) throws SQLServerException { loggerExternal.entering(getClassNameLogging(), "createStatement", - new Object[] {new Integer(nType), new Integer(nConcur), resultSetHoldability, stmtColEncSetting}); + new Object[] {nType, nConcur, resultSetHoldability, stmtColEncSetting}); checkClosed(); checkValidHoldability(resultSetHoldability); checkMatchesCurrentHoldability(resultSetHoldability); @@ -4564,7 +4564,7 @@ public Statement createStatement(int nType, int nConcur, int resultSetHoldability) throws SQLServerException { loggerExternal.entering(getClassNameLogging(), "prepareStatement", - new Object[] {new Integer(nType), new Integer(nConcur), resultSetHoldability}); + new Object[] {nType, nConcur, resultSetHoldability}); PreparedStatement st = prepareStatement(sql, nType, nConcur, resultSetHoldability, SQLServerStatementColumnEncryptionSetting.UseConnectionSetting); loggerExternal.exiting(getClassNameLogging(), "prepareStatement", st); @@ -4603,7 +4603,7 @@ public PreparedStatement prepareStatement(java.lang.String sql, int resultSetHoldability, SQLServerStatementColumnEncryptionSetting stmtColEncSetting) throws SQLServerException { loggerExternal.entering(getClassNameLogging(), "prepareStatement", - new Object[] {new Integer(nType), new Integer(nConcur), resultSetHoldability, stmtColEncSetting}); + new Object[] {nType, nConcur, resultSetHoldability, stmtColEncSetting}); checkClosed(); checkValidHoldability(resultSetHoldability); checkMatchesCurrentHoldability(resultSetHoldability); @@ -4626,7 +4626,7 @@ public PreparedStatement prepareStatement(java.lang.String sql, int nConcur, int resultSetHoldability) throws SQLServerException { loggerExternal.entering(getClassNameLogging(), "prepareStatement", - new Object[] {new Integer(nType), new Integer(nConcur), resultSetHoldability}); + new Object[] {nType, nConcur, resultSetHoldability}); CallableStatement st = prepareCall(sql, nType, nConcur, resultSetHoldability, SQLServerStatementColumnEncryptionSetting.UseConnectionSetting); loggerExternal.exiting(getClassNameLogging(), "prepareCall", st); return st; @@ -4638,7 +4638,7 @@ public CallableStatement prepareCall(String sql, int resultSetHoldability, SQLServerStatementColumnEncryptionSetting stmtColEncSetiing) throws SQLServerException { loggerExternal.entering(getClassNameLogging(), "prepareStatement", - new Object[] {new Integer(nType), new Integer(nConcur), resultSetHoldability, stmtColEncSetiing}); + new Object[] {nType, nConcur, resultSetHoldability, stmtColEncSetiing}); checkClosed(); checkValidHoldability(resultSetHoldability); checkMatchesCurrentHoldability(resultSetHoldability); @@ -4660,7 +4660,7 @@ public CallableStatement prepareCall(String sql, /* L3 */ public PreparedStatement prepareStatement(String sql, int flag) throws SQLServerException { - loggerExternal.entering(getClassNameLogging(), "prepareStatement", new Object[] {sql, new Integer(flag)}); + loggerExternal.entering(getClassNameLogging(), "prepareStatement", new Object[] {sql, flag}); SQLServerPreparedStatement ps = (SQLServerPreparedStatement) prepareStatement(sql, flag, SQLServerStatementColumnEncryptionSetting.UseConnectionSetting); @@ -4699,7 +4699,7 @@ public CallableStatement prepareCall(String sql, public PreparedStatement prepareStatement(String sql, int flag, SQLServerStatementColumnEncryptionSetting stmtColEncSetting) throws SQLServerException { - loggerExternal.entering(getClassNameLogging(), "prepareStatement", new Object[] {sql, new Integer(flag), stmtColEncSetting}); + loggerExternal.entering(getClassNameLogging(), "prepareStatement", new Object[] {sql, flag, stmtColEncSetting}); checkClosed(); SQLServerPreparedStatement ps = (SQLServerPreparedStatement) prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, stmtColEncSetting); @@ -5184,7 +5184,7 @@ public boolean isValid(int timeout) throws SQLException { public boolean isWrapperFor(Class iface) throws SQLException { loggerExternal.entering(getClassNameLogging(), "isWrapperFor", iface); boolean f = iface.isInstance(this); - loggerExternal.exiting(getClassNameLogging(), "isWrapperFor", Boolean.valueOf(f)); + loggerExternal.exiting(getClassNameLogging(), "isWrapperFor", f); return f; } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataSource.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataSource.java index b94bb4d6f8..95d5a209d3 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataSource.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataSource.java @@ -844,7 +844,7 @@ private void setIntProperty(Properties props, String propKey, int propValue) { if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) - loggerExternal.entering(getClassNameLogging(), "set" + propKey, new Integer(propValue)); + loggerExternal.entering(getClassNameLogging(), "set" + propKey, propValue); props.setProperty(propKey, new Integer(propValue).toString()); loggerExternal.exiting(getClassNameLogging(), "set" + propKey); } @@ -870,7 +870,7 @@ private int getIntProperty(Properties props, } } if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) - loggerExternal.exiting(getClassNameLogging(), "get" + propKey, new Integer(value)); + loggerExternal.exiting(getClassNameLogging(), "get" + propKey, value); return value; } @@ -880,7 +880,7 @@ private void setBooleanProperty(Properties props, String propKey, boolean propValue) { if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) - loggerExternal.entering(getClassNameLogging(), "set" + propKey, Boolean.valueOf(propValue)); + loggerExternal.entering(getClassNameLogging(), "set" + propKey, propValue); props.setProperty(propKey, (propValue) ? "true" : "false"); loggerExternal.exiting(getClassNameLogging(), "set" + propKey); } @@ -904,7 +904,7 @@ private boolean getBooleanProperty(Properties props, value = Boolean.valueOf(propValue); } loggerExternal.exiting(getClassNameLogging(), "get" + propKey, value); - return value.booleanValue(); + return value; } private void setObjectProperty(Properties props, @@ -1069,7 +1069,7 @@ else if (!"class".equals(propertyName)) { public boolean isWrapperFor(Class iface) throws SQLException { loggerExternal.entering(getClassNameLogging(), "isWrapperFor", iface); boolean f = iface.isInstance(this); - loggerExternal.exiting(getClassNameLogging(), "isWrapperFor", Boolean.valueOf(f)); + loggerExternal.exiting(getClassNameLogging(), "isWrapperFor", f); return f; } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDatabaseMetaData.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDatabaseMetaData.java index fd732343c3..25e7a7c146 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDatabaseMetaData.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDatabaseMetaData.java @@ -1917,7 +1917,7 @@ else if (name.equals(SQLServerDriverIntProperty.PORT_NUMBER.toString())) { } // if the value is outside of the valid values throw error. MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidArgument")); - Object[] msgArgs = {new Integer(type)}; + Object[] msgArgs = {type}; throw new SQLServerException(null, form.format(msgArgs), null, 0, true); } @@ -1933,7 +1933,7 @@ else if (name.equals(SQLServerDriverIntProperty.PORT_NUMBER.toString())) { } // if the value is outside of the valid values throw error. MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidArgument")); - Object[] msgArgs = {new Integer(type)}; + Object[] msgArgs = {type}; throw new SQLServerException(null, form.format(msgArgs), null, 0, true); } @@ -1988,7 +1988,7 @@ else if (name.equals(SQLServerDriverIntProperty.PORT_NUMBER.toString())) { if (p > 0) s = s.substring(0, p); try { - return new Integer(s).intValue(); + return new Integer(s); } catch (NumberFormatException e) { return 0; @@ -2003,7 +2003,7 @@ else if (name.equals(SQLServerDriverIntProperty.PORT_NUMBER.toString())) { if (p > 0 && q > 0) s = s.substring(p + 1, q); try { - return new Integer(s).intValue(); + return new Integer(s); } catch (NumberFormatException e) { return 0; @@ -2038,7 +2038,7 @@ public RowIdLifetime getRowIdLifetime() throws SQLException { // if the value is outside of the valid values throw error. MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidArgument")); - Object[] msgArgs = {new Integer(holdability)}; + Object[] msgArgs = {holdability}; throw new SQLServerException(null, form.format(msgArgs), null, 0, true); } @@ -2202,12 +2202,12 @@ final Object apply(Object value, switch (asJDBCType) { case INTEGER: - return new Integer(oneValueToAnother(((Integer) value).intValue())); + return oneValueToAnother((Integer) value); case SMALLINT: // small and tinyint returned as short case TINYINT: - return new Short((short) oneValueToAnother(((Short) value).intValue())); + return (short) oneValueToAnother(((Short) value).intValue()); case BIGINT: - return new Long(oneValueToAnother(((Long) value).intValue())); + return (long) oneValueToAnother(((Long) value).intValue()); case CHAR: case VARCHAR: case LONGVARCHAR: diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDriver.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDriver.java index d3fe42c615..546a3a29c7 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDriver.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDriver.java @@ -639,13 +639,13 @@ static final DriverPropertyInfo[] getPropertyInfoFromProperties(Properties props public int getMajorVersion() { loggerExternal.entering(getClassNameLogging(), "getMajorVersion"); - loggerExternal.exiting(getClassNameLogging(), "getMajorVersion", new Integer(SQLJdbcVersion.major)); + loggerExternal.exiting(getClassNameLogging(), "getMajorVersion", SQLJdbcVersion.major); return SQLJdbcVersion.major; } public int getMinorVersion() { loggerExternal.entering(getClassNameLogging(), "getMinorVersion"); - loggerExternal.exiting(getClassNameLogging(), "getMinorVersion", new Integer(SQLJdbcVersion.minor)); + loggerExternal.exiting(getClassNameLogging(), "getMinorVersion", SQLJdbcVersion.minor); return SQLJdbcVersion.minor; } @@ -655,7 +655,7 @@ public Logger getParentLogger() throws SQLFeatureNotSupportedException { /* L0 */ public boolean jdbcCompliant() { loggerExternal.entering(getClassNameLogging(), "jdbcCompliant"); - loggerExternal.exiting(getClassNameLogging(), "jdbcCompliant", Boolean.valueOf(true)); + loggerExternal.exiting(getClassNameLogging(), "jdbcCompliant", Boolean.TRUE); return true; } } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerParameterMetaData.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerParameterMetaData.java index 5d8fc51104..2decf355d6 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerParameterMetaData.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerParameterMetaData.java @@ -233,7 +233,7 @@ else if (SSType.Category.CHARACTER == ssType.category || SSType.Category.BINARY } catch (NumberFormatException e) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_metaDataErrorForParameter")); - Object[] msgArgs = {new Integer(paramOrdinal)}; + Object[] msgArgs = {paramOrdinal}; SQLServerException.makeFromDriverError(con, stmtParent, form.format(msgArgs) + " " + e.toString(), null, false); } } @@ -637,12 +637,12 @@ public T unwrap(Class iface) throws SQLException { } catch (SQLException e) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_metaDataErrorForParameter")); - Object[] msgArgs = {new Integer(param)}; + Object[] msgArgs = {param}; SQLServerException.makeFromDriverError(con, stmtParent, form.format(msgArgs) + " " + e.toString(), null, false); } if (!bFound) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidParameterNumber")); - Object[] msgArgs = {new Integer(param)}; + Object[] msgArgs = {param}; SQLServerException.makeFromDriverError(con, stmtParent, form.format(msgArgs), null, false); } } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java index 4bfcb58e2f..f3048aaede 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java @@ -235,7 +235,7 @@ final boolean doExecute() throws SQLServerException { tdsWriter.writeShort(executedSqlDirectly ? TDS.PROCID_SP_UNPREPARE : TDS.PROCID_SP_CURSORUNPREPARE); tdsWriter.writeByte((byte) 0); // RPC procedure option 1 tdsWriter.writeByte((byte) 0); // RPC procedure option 2 - tdsWriter.writeRPCInt(null, new Integer(handleToClose), false); + tdsWriter.writeRPCInt(null, handleToClose, false); TDSParser.parse(startResponse(), getLogContext()); return true; } @@ -355,7 +355,7 @@ private String buildParamTypeDefinitions(Parameter[] params, String typeDefinition = params[i].getTypeDefinition(connection, resultsReader()); if (null == typeDefinition) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_valueNotSetForParameter")); - Object[] msgArgs = {new Integer(i + 1)}; + Object[] msgArgs = {i + 1}; SQLServerException.makeFromDriverError(connection, this, form.format(msgArgs), null, false); } @@ -411,7 +411,7 @@ public int executeUpdate() throws SQLServerException { if (updateCount < Integer.MIN_VALUE || updateCount > Integer.MAX_VALUE) SQLServerException.makeFromDriverError(connection, this, SQLServerException.getErrString("R_updateCountOutofRange"), null, true); - loggerExternal.exiting(getClassNameLogging(), "executeUpdate", new Long(updateCount)); + loggerExternal.exiting(getClassNameLogging(), "executeUpdate", updateCount); return (int) updateCount; } @@ -425,7 +425,7 @@ public long executeLargeUpdate() throws SQLServerException { } checkClosed(); executeStatement(new PrepStmtExecCmd(this, EXECUTE_UPDATE)); - loggerExternal.exiting(getClassNameLogging(), "executeLargeUpdate", new Long(updateCount)); + loggerExternal.exiting(getClassNameLogging(), "executeLargeUpdate", updateCount); return updateCount; } @@ -443,7 +443,7 @@ public boolean execute() throws SQLServerException { } checkClosed(); executeStatement(new PrepStmtExecCmd(this, EXECUTE)); - loggerExternal.exiting(getClassNameLogging(), "execute", Boolean.valueOf(null != resultSet)); + loggerExternal.exiting(getClassNameLogging(), "execute", null != resultSet); return null != resultSet; } @@ -631,11 +631,11 @@ private void buildServerCursorPrepExecParams(TDSWriter tdsWriter) throws SQLServ // // IN (reprepare): Old handle to unprepare before repreparing // OUT: The newly prepared handle - tdsWriter.writeRPCInt(null, new Integer(getPreparedStatementHandle()), true); + tdsWriter.writeRPCInt(null, getPreparedStatementHandle(), true); resetPrepStmtHandle(); // OUT - tdsWriter.writeRPCInt(null, new Integer(0), true); // cursor ID (OUTPUT) + tdsWriter.writeRPCInt(null, 0, true); // cursor ID (OUTPUT) // IN tdsWriter.writeRPCStringUnicode((preparedTypeDefinitions.length() > 0) ? preparedTypeDefinitions : null); @@ -647,13 +647,13 @@ private void buildServerCursorPrepExecParams(TDSWriter tdsWriter) throws SQLServ // Note: we must strip out SCROLLOPT_PARAMETERIZED_STMT if we don't // actually have any parameters. tdsWriter.writeRPCInt(null, - new Integer(getResultSetScrollOpt() & ~((0 == preparedTypeDefinitions.length()) ? TDS.SCROLLOPT_PARAMETERIZED_STMT : 0)), false); + getResultSetScrollOpt() & ~((0 == preparedTypeDefinitions.length()) ? TDS.SCROLLOPT_PARAMETERIZED_STMT : 0), false); // IN - tdsWriter.writeRPCInt(null, new Integer(getResultSetCCOpt()), false); + tdsWriter.writeRPCInt(null, getResultSetCCOpt(), false); // OUT - tdsWriter.writeRPCInt(null, new Integer(0), true); + tdsWriter.writeRPCInt(null, 0, true); } private void buildPrepExecParams(TDSWriter tdsWriter) throws SQLServerException { @@ -673,7 +673,7 @@ private void buildPrepExecParams(TDSWriter tdsWriter) throws SQLServerException // // IN (reprepare): Old handle to unprepare before repreparing // OUT: The newly prepared handle - tdsWriter.writeRPCInt(null, new Integer(getPreparedStatementHandle()), true); + tdsWriter.writeRPCInt(null, getPreparedStatementHandle(), true); resetPrepStmtHandle(); // IN @@ -723,19 +723,19 @@ private void buildServerCursorExecParams(TDSWriter tdsWriter) throws SQLServerEx // IN assert hasPreparedStatementHandle(); - tdsWriter.writeRPCInt(null, new Integer(getPreparedStatementHandle()), false); + tdsWriter.writeRPCInt(null, getPreparedStatementHandle(), false); // OUT - tdsWriter.writeRPCInt(null, new Integer(0), true); + tdsWriter.writeRPCInt(null, 0, true); // IN - tdsWriter.writeRPCInt(null, new Integer(getResultSetScrollOpt() & ~TDS.SCROLLOPT_PARAMETERIZED_STMT), false); + tdsWriter.writeRPCInt(null, getResultSetScrollOpt() & ~TDS.SCROLLOPT_PARAMETERIZED_STMT, false); // IN - tdsWriter.writeRPCInt(null, new Integer(getResultSetCCOpt()), false); + tdsWriter.writeRPCInt(null, getResultSetCCOpt(), false); // OUT - tdsWriter.writeRPCInt(null, new Integer(0), true); + tdsWriter.writeRPCInt(null, 0, true); } private void buildExecParams(TDSWriter tdsWriter) throws SQLServerException { @@ -754,7 +754,7 @@ private void buildExecParams(TDSWriter tdsWriter) throws SQLServerException { // IN assert hasPreparedStatementHandle(); - tdsWriter.writeRPCInt(null, new Integer(getPreparedStatementHandle()), false); + tdsWriter.writeRPCInt(null, getPreparedStatementHandle(), false); } private void getParameterEncryptionMetadata(Parameter[] params) throws SQLServerException { @@ -1049,7 +1049,7 @@ else if (resultSet != null) { /* L0 */ final Parameter setterGetParam(int index) throws SQLServerException { if (index < 1 || index > inOutParam.length) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_indexOutOfRange")); - Object[] msgArgs = {new Integer(index)}; + Object[] msgArgs = {index}; SQLServerException.makeFromDriverError(connection, this, form.format(msgArgs), "07009", false); } @@ -1144,7 +1144,7 @@ private Parameter getParam(int index) throws SQLServerException { index--; if (index < 0 || index >= inOutParam.length) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_indexOutOfRange")); - Object[] msgArgs = {new Integer(index + 1)}; + Object[] msgArgs = {index + 1}; SQLServerException.makeFromDriverError(connection, this, form.format(msgArgs), "07009", false); } return inOutParam[index]; @@ -1340,7 +1340,7 @@ public final void setBoolean(int n, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setBoolean", new Object[] {n, x}); checkClosed(); - setValue(n, JDBCType.BIT, Boolean.valueOf(x), JavaType.BOOLEAN, false); + setValue(n, JDBCType.BIT, x, JavaType.BOOLEAN, false); loggerExternal.exiting(getClassNameLogging(), "setBoolean"); } @@ -1365,7 +1365,7 @@ public final void setBoolean(int n, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setBoolean", new Object[] {n, x, forceEncrypt}); checkClosed(); - setValue(n, JDBCType.BIT, Boolean.valueOf(x), JavaType.BOOLEAN, forceEncrypt); + setValue(n, JDBCType.BIT, x, JavaType.BOOLEAN, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "setBoolean"); } @@ -1374,7 +1374,7 @@ public final void setByte(int n, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setByte", new Object[] {n, x}); checkClosed(); - setValue(n, JDBCType.TINYINT, Byte.valueOf(x), JavaType.BYTE, false); + setValue(n, JDBCType.TINYINT, x, JavaType.BYTE, false); loggerExternal.exiting(getClassNameLogging(), "setByte"); } @@ -1399,7 +1399,7 @@ public final void setByte(int n, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setByte", new Object[] {n, x, forceEncrypt}); checkClosed(); - setValue(n, JDBCType.TINYINT, Byte.valueOf(x), JavaType.BYTE, forceEncrypt); + setValue(n, JDBCType.TINYINT, x, JavaType.BYTE, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "setByte"); } @@ -1486,7 +1486,7 @@ public final void setDouble(int n, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setDouble", new Object[] {n, x}); checkClosed(); - setValue(n, JDBCType.DOUBLE, Double.valueOf(x), JavaType.DOUBLE, false); + setValue(n, JDBCType.DOUBLE, x, JavaType.DOUBLE, false); loggerExternal.exiting(getClassNameLogging(), "setDouble"); } @@ -1511,7 +1511,7 @@ public final void setDouble(int n, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setDouble", new Object[] {n, x, forceEncrypt}); checkClosed(); - setValue(n, JDBCType.DOUBLE, Double.valueOf(x), JavaType.DOUBLE, forceEncrypt); + setValue(n, JDBCType.DOUBLE, x, JavaType.DOUBLE, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "setDouble"); } @@ -1520,7 +1520,7 @@ public final void setFloat(int n, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setFloat", new Object[] {n, x}); checkClosed(); - setValue(n, JDBCType.REAL, Float.valueOf(x), JavaType.FLOAT, false); + setValue(n, JDBCType.REAL, x, JavaType.FLOAT, false); loggerExternal.exiting(getClassNameLogging(), "setFloat"); } @@ -1545,7 +1545,7 @@ public final void setFloat(int n, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setFloat", new Object[] {n, x, forceEncrypt}); checkClosed(); - setValue(n, JDBCType.REAL, Float.valueOf(x), JavaType.FLOAT, forceEncrypt); + setValue(n, JDBCType.REAL, x, JavaType.FLOAT, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "setFloat"); } @@ -1554,7 +1554,7 @@ public final void setInt(int n, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setInt", new Object[] {n, value}); checkClosed(); - setValue(n, JDBCType.INTEGER, Integer.valueOf(value), JavaType.INTEGER, false); + setValue(n, JDBCType.INTEGER, value, JavaType.INTEGER, false); loggerExternal.exiting(getClassNameLogging(), "setInt"); } @@ -1579,7 +1579,7 @@ public final void setInt(int n, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setInt", new Object[] {n, value, forceEncrypt}); checkClosed(); - setValue(n, JDBCType.INTEGER, Integer.valueOf(value), JavaType.INTEGER, forceEncrypt); + setValue(n, JDBCType.INTEGER, value, JavaType.INTEGER, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "setInt"); } @@ -1588,7 +1588,7 @@ public final void setLong(int n, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setLong", new Object[] {n, x}); checkClosed(); - setValue(n, JDBCType.BIGINT, Long.valueOf(x), JavaType.LONG, false); + setValue(n, JDBCType.BIGINT, x, JavaType.LONG, false); loggerExternal.exiting(getClassNameLogging(), "setLong"); } @@ -1613,7 +1613,7 @@ public final void setLong(int n, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setLong", new Object[] {n, x, forceEncrypt}); checkClosed(); - setValue(n, JDBCType.BIGINT, Long.valueOf(x), JavaType.LONG, forceEncrypt); + setValue(n, JDBCType.BIGINT, x, JavaType.LONG, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "setLong"); } @@ -1703,7 +1703,7 @@ public final void setObject(int parameterIndex, setObject(setterGetParam(parameterIndex), x, JavaType.of(x), JDBCType.of(targetSqlType), (java.sql.Types.NUMERIC == targetSqlType || java.sql.Types.DECIMAL == targetSqlType || java.sql.Types.TIMESTAMP == targetSqlType || java.sql.Types.TIME == targetSqlType || microsoft.sql.Types.DATETIMEOFFSET == targetSqlType - || InputStream.class.isInstance(x) || Reader.class.isInstance(x)) ? Integer.valueOf(scaleOrLength) : null, + || InputStream.class.isInstance(x) || Reader.class.isInstance(x)) ? scaleOrLength : null, null, false, parameterIndex, null); loggerExternal.exiting(getClassNameLogging(), "setObject"); @@ -1753,7 +1753,7 @@ public final void setObject(int parameterIndex, setObject(setterGetParam(parameterIndex), x, JavaType.of(x), JDBCType.of(targetSqlType), (java.sql.Types.NUMERIC == targetSqlType || java.sql.Types.DECIMAL == targetSqlType - || InputStream.class.isInstance(x) || Reader.class.isInstance(x)) ? Integer.valueOf(scale) : null, + || InputStream.class.isInstance(x) || Reader.class.isInstance(x)) ? scale : null, precision, false, parameterIndex, null); loggerExternal.exiting(getClassNameLogging(), "setObject"); @@ -1809,7 +1809,7 @@ public final void setObject(int parameterIndex, setObject(setterGetParam(parameterIndex), x, JavaType.of(x), JDBCType.of(targetSqlType), (java.sql.Types.NUMERIC == targetSqlType || java.sql.Types.DECIMAL == targetSqlType - || InputStream.class.isInstance(x) || Reader.class.isInstance(x)) ? Integer.valueOf(scale) : null, + || InputStream.class.isInstance(x) || Reader.class.isInstance(x)) ? scale : null, precision, forceEncrypt, parameterIndex, null); loggerExternal.exiting(getClassNameLogging(), "setObject"); @@ -1880,7 +1880,7 @@ public final void setShort(int index, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setShort", new Object[] {index, x}); checkClosed(); - setValue(index, JDBCType.SMALLINT, Short.valueOf(x), JavaType.SHORT, false); + setValue(index, JDBCType.SMALLINT, x, JavaType.SHORT, false); loggerExternal.exiting(getClassNameLogging(), "setShort"); } @@ -1905,7 +1905,7 @@ public final void setShort(int index, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "setShort", new Object[] {index, x, forceEncrypt}); checkClosed(); - setValue(index, JDBCType.SMALLINT, Short.valueOf(x), JavaType.SHORT, forceEncrypt); + setValue(index, JDBCType.SMALLINT, x, JavaType.SHORT, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "setShort"); } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement42Helper.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement42Helper.java index 702f3e2051..efd9c1774c 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement42Helper.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement42Helper.java @@ -28,7 +28,7 @@ static final void setObject(SQLServerPreparedStatement ps, SQLServerStatement.loggerExternal.entering(ps.getClassNameLogging(), "setObject", new Object[] {index, obj, jdbcType}); // getVendorTypeNumber() returns the same constant integer values as in java.sql.Types - ps.setObject(index, obj, jdbcType.getVendorTypeNumber().intValue()); + ps.setObject(index, obj, jdbcType.getVendorTypeNumber()); SQLServerStatement.loggerExternal.exiting(ps.getClassNameLogging(), "setObject"); } @@ -45,7 +45,7 @@ static final void setObject(SQLServerPreparedStatement ps, new Object[] {parameterIndex, x, targetSqlType, scaleOrLength}); // getVendorTypeNumber() returns the same constant integer values as in java.sql.Types - ps.setObject(parameterIndex, x, targetSqlType.getVendorTypeNumber().intValue(), scaleOrLength); + ps.setObject(parameterIndex, x, targetSqlType.getVendorTypeNumber(), scaleOrLength); SQLServerStatement.loggerExternal.exiting(ps.getClassNameLogging(), "setObject"); } @@ -63,7 +63,7 @@ static final void setObject(SQLServerPreparedStatement ps, new Object[] {parameterIndex, x, targetSqlType, precision, scale}); // getVendorTypeNumber() returns the same constant integer values as in java.sql.Types - ps.setObject(parameterIndex, x, targetSqlType.getVendorTypeNumber().intValue(), precision, scale, false); + ps.setObject(parameterIndex, x, targetSqlType.getVendorTypeNumber(), precision, scale, false); SQLServerStatement.loggerExternal.exiting(ps.getClassNameLogging(), "setObject"); } @@ -82,7 +82,7 @@ static final void setObject(SQLServerPreparedStatement ps, new Object[] {parameterIndex, x, targetSqlType, precision, scale, forceEncrypt}); // getVendorTypeNumber() returns the same constant integer values as in java.sql.Types - ps.setObject(parameterIndex, x, targetSqlType.getVendorTypeNumber().intValue(), precision, scale, forceEncrypt); + ps.setObject(parameterIndex, x, targetSqlType.getVendorTypeNumber(), precision, scale, forceEncrypt); SQLServerStatement.loggerExternal.exiting(ps.getClassNameLogging(), "setObject"); } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResultSet.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResultSet.java index 98da7f11d0..c092bd2943 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResultSet.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResultSet.java @@ -395,7 +395,7 @@ boolean onDone(TDSReader tdsReader) throws SQLServerException { public boolean isWrapperFor(Class iface) throws SQLException { loggerExternal.entering(getClassNameLogging(), "isWrapperFor"); boolean f = iface.isInstance(this); - loggerExternal.exiting(getClassNameLogging(), "isWrapperFor", Boolean.valueOf(f)); + loggerExternal.exiting(getClassNameLogging(), "isWrapperFor", f); return f; } @@ -539,7 +539,7 @@ private void verifyValidColumnIndex(int index) throws SQLServerException { if (index < 1 || index > nCols) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_indexOutOfRange")); - Object[] msgArgs = {new Integer(index)}; + Object[] msgArgs = {index}; SQLServerException.makeFromDriverError(stmt.connection, stmt, form.format(msgArgs), "07009", false); } } @@ -1818,7 +1818,7 @@ public void setFetchDirection(int direction) throws SQLServerException { (ResultSet.FETCH_FORWARD != direction && (SQLServerResultSet.TYPE_SS_DIRECT_FORWARD_ONLY == stmt.resultSetType || SQLServerResultSet.TYPE_SS_SERVER_CURSOR_FORWARD_ONLY == stmt.resultSetType))) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidFetchDirection")); - Object[] msgArgs = {new Integer(direction)}; + Object[] msgArgs = {direction}; SQLServerException.makeFromDriverError(stmt.connection, stmt, form.format(msgArgs), null, false); } @@ -2008,7 +2008,7 @@ public boolean getBoolean(int columnIndex) throws SQLServerException { checkClosed(); Boolean value = (Boolean) getValue(columnIndex, JDBCType.BIT); loggerExternal.exiting(getClassNameLogging(), "getBoolean", value); - return null != value ? value.booleanValue() : false; + return null != value ? value : false; } public boolean getBoolean(String columnName) throws SQLServerException { @@ -2016,7 +2016,7 @@ public boolean getBoolean(String columnName) throws SQLServerException { checkClosed(); Boolean value = (Boolean) getValue(findColumn(columnName), JDBCType.BIT); loggerExternal.exiting(getClassNameLogging(), "getBoolean", value); - return null != value ? value.booleanValue() : false; + return null != value ? value : false; } public byte getByte(int columnIndex) throws SQLServerException { @@ -2092,7 +2092,7 @@ public double getDouble(int columnIndex) throws SQLServerException { checkClosed(); Double value = (Double) getValue(columnIndex, JDBCType.DOUBLE); loggerExternal.exiting(getClassNameLogging(), "getDouble", value); - return null != value ? value.doubleValue() : 0; + return null != value ? value : 0; } public double getDouble(String columnName) throws SQLServerException { @@ -2100,7 +2100,7 @@ public double getDouble(String columnName) throws SQLServerException { checkClosed(); Double value = (Double) getValue(findColumn(columnName), JDBCType.DOUBLE); loggerExternal.exiting(getClassNameLogging(), "getDouble", value); - return null != value ? value.doubleValue() : 0; + return null != value ? value : 0; } public float getFloat(int columnIndex) throws SQLServerException { @@ -2108,7 +2108,7 @@ public float getFloat(int columnIndex) throws SQLServerException { checkClosed(); Float value = (Float) getValue(columnIndex, JDBCType.REAL); loggerExternal.exiting(getClassNameLogging(), "getFloat", value); - return null != value ? value.floatValue() : 0; + return null != value ? value : 0; } public float getFloat(String columnName) throws SQLServerException { @@ -2116,7 +2116,7 @@ public float getFloat(String columnName) throws SQLServerException { checkClosed(); Float value = (Float) getValue(findColumn(columnName), JDBCType.REAL); loggerExternal.exiting(getClassNameLogging(), "getFloat", value); - return null != value ? value.floatValue() : 0; + return null != value ? value : 0; } public int getInt(int columnIndex) throws SQLServerException { @@ -2124,7 +2124,7 @@ public int getInt(int columnIndex) throws SQLServerException { checkClosed(); Integer value = (Integer) getValue(columnIndex, JDBCType.INTEGER); loggerExternal.exiting(getClassNameLogging(), "getInt", value); - return null != value ? value.intValue() : 0; + return null != value ? value : 0; } public int getInt(String columnName) throws SQLServerException { @@ -2132,7 +2132,7 @@ public int getInt(String columnName) throws SQLServerException { checkClosed(); Integer value = (Integer) getValue(findColumn(columnName), JDBCType.INTEGER); loggerExternal.exiting(getClassNameLogging(), "getInt", value); - return null != value ? value.intValue() : 0; + return null != value ? value : 0; } public long getLong(int columnIndex) throws SQLServerException { @@ -2140,7 +2140,7 @@ public long getLong(int columnIndex) throws SQLServerException { checkClosed(); Long value = (Long) getValue(columnIndex, JDBCType.BIGINT); loggerExternal.exiting(getClassNameLogging(), "getLong", value); - return null != value ? value.longValue() : 0; + return null != value ? value : 0; } public long getLong(String columnName) throws SQLServerException { @@ -2148,7 +2148,7 @@ public long getLong(String columnName) throws SQLServerException { checkClosed(); Long value = (Long) getValue(findColumn(columnName), JDBCType.BIGINT); loggerExternal.exiting(getClassNameLogging(), "getLong", value); - return null != value ? value.longValue() : 0; + return null != value ? value : 0; } public java.sql.ResultSetMetaData getMetaData() throws SQLServerException { @@ -2193,7 +2193,7 @@ public short getShort(int columnIndex) throws SQLServerException { checkClosed(); Short value = (Short) getValue(columnIndex, JDBCType.SMALLINT); loggerExternal.exiting(getClassNameLogging(), "getShort", value); - return null != value ? value.shortValue() : 0; + return null != value ? value : 0; } public short getShort(String columnName) throws SQLServerException { @@ -2201,7 +2201,7 @@ public short getShort(String columnName) throws SQLServerException { checkClosed(); Short value = (Short) getValue(findColumn(columnName), JDBCType.SMALLINT); loggerExternal.exiting(getClassNameLogging(), "getShort", value); - return null != value ? value.shortValue() : 0; + return null != value ? value : 0; } public String getString(int columnIndex) throws SQLServerException { @@ -2946,7 +2946,7 @@ public void updateBoolean(int index, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "updateBoolean", new Object[] {index, x}); checkClosed(); - updateValue(index, JDBCType.BIT, Boolean.valueOf(x), JavaType.BOOLEAN, false); + updateValue(index, JDBCType.BIT, x, JavaType.BOOLEAN, false); loggerExternal.exiting(getClassNameLogging(), "updateBoolean"); } @@ -2973,7 +2973,7 @@ public void updateBoolean(int index, if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) loggerExternal.entering(getClassNameLogging(), "updateBoolean", new Object[] {index, x, forceEncrypt}); checkClosed(); - updateValue(index, JDBCType.BIT, Boolean.valueOf(x), JavaType.BOOLEAN, forceEncrypt); + updateValue(index, JDBCType.BIT, x, JavaType.BOOLEAN, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "updateBoolean"); } @@ -2984,7 +2984,7 @@ public void updateByte(int index, loggerExternal.entering(getClassNameLogging(), "updateByte", new Object[] {index, x}); checkClosed(); - updateValue(index, JDBCType.TINYINT, Byte.valueOf(x), JavaType.BYTE, false); + updateValue(index, JDBCType.TINYINT, x, JavaType.BYTE, false); loggerExternal.exiting(getClassNameLogging(), "updateByte"); } @@ -3012,7 +3012,7 @@ public void updateByte(int index, loggerExternal.entering(getClassNameLogging(), "updateByte", new Object[] {index, x, forceEncrypt}); checkClosed(); - updateValue(index, JDBCType.TINYINT, Byte.valueOf(x), JavaType.BYTE, forceEncrypt); + updateValue(index, JDBCType.TINYINT, x, JavaType.BYTE, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "updateByte"); } @@ -3023,7 +3023,7 @@ public void updateShort(int index, loggerExternal.entering(getClassNameLogging(), "updateShort", new Object[] {index, x}); checkClosed(); - updateValue(index, JDBCType.SMALLINT, Short.valueOf(x), JavaType.SHORT, false); + updateValue(index, JDBCType.SMALLINT, x, JavaType.SHORT, false); loggerExternal.exiting(getClassNameLogging(), "updateShort"); } @@ -3051,7 +3051,7 @@ public void updateShort(int index, loggerExternal.entering(getClassNameLogging(), "updateShort", new Object[] {index, x, forceEncrypt}); checkClosed(); - updateValue(index, JDBCType.SMALLINT, Short.valueOf(x), JavaType.SHORT, forceEncrypt); + updateValue(index, JDBCType.SMALLINT, x, JavaType.SHORT, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "updateShort"); } @@ -3062,7 +3062,7 @@ public void updateInt(int index, loggerExternal.entering(getClassNameLogging(), "updateInt", new Object[] {index, x}); checkClosed(); - updateValue(index, JDBCType.INTEGER, Integer.valueOf(x), JavaType.INTEGER, false); + updateValue(index, JDBCType.INTEGER, x, JavaType.INTEGER, false); loggerExternal.exiting(getClassNameLogging(), "updateInt"); } @@ -3090,7 +3090,7 @@ public void updateInt(int index, loggerExternal.entering(getClassNameLogging(), "updateInt", new Object[] {index, x, forceEncrypt}); checkClosed(); - updateValue(index, JDBCType.INTEGER, Integer.valueOf(x), JavaType.INTEGER, forceEncrypt); + updateValue(index, JDBCType.INTEGER, x, JavaType.INTEGER, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "updateInt"); } @@ -3101,7 +3101,7 @@ public void updateLong(int index, loggerExternal.entering(getClassNameLogging(), "updateLong", new Object[] {index, x}); checkClosed(); - updateValue(index, JDBCType.BIGINT, Long.valueOf(x), JavaType.LONG, false); + updateValue(index, JDBCType.BIGINT, x, JavaType.LONG, false); loggerExternal.exiting(getClassNameLogging(), "updateLong"); } @@ -3129,7 +3129,7 @@ public void updateLong(int index, loggerExternal.entering(getClassNameLogging(), "updateLong", new Object[] {index, x, forceEncrypt}); checkClosed(); - updateValue(index, JDBCType.BIGINT, Long.valueOf(x), JavaType.LONG, forceEncrypt); + updateValue(index, JDBCType.BIGINT, x, JavaType.LONG, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "updateLong"); } @@ -3140,7 +3140,7 @@ public void updateFloat(int index, loggerExternal.entering(getClassNameLogging(), "updateFloat", new Object[] {index, x}); checkClosed(); - updateValue(index, JDBCType.REAL, Float.valueOf(x), JavaType.FLOAT, false); + updateValue(index, JDBCType.REAL, x, JavaType.FLOAT, false); loggerExternal.exiting(getClassNameLogging(), "updateFloat"); } @@ -3168,7 +3168,7 @@ public void updateFloat(int index, loggerExternal.entering(getClassNameLogging(), "updateFloat", new Object[] {index, x, forceEncrypt}); checkClosed(); - updateValue(index, JDBCType.REAL, Float.valueOf(x), JavaType.FLOAT, forceEncrypt); + updateValue(index, JDBCType.REAL, x, JavaType.FLOAT, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "updateFloat"); } @@ -3179,7 +3179,7 @@ public void updateDouble(int index, loggerExternal.entering(getClassNameLogging(), "updateDouble", new Object[] {index, x}); checkClosed(); - updateValue(index, JDBCType.DOUBLE, Double.valueOf(x), JavaType.DOUBLE, false); + updateValue(index, JDBCType.DOUBLE, x, JavaType.DOUBLE, false); loggerExternal.exiting(getClassNameLogging(), "updateDouble"); } @@ -3207,7 +3207,7 @@ public void updateDouble(int index, loggerExternal.entering(getClassNameLogging(), "updateDouble", new Object[] {index, x, forceEncrypt}); checkClosed(); - updateValue(index, JDBCType.DOUBLE, Double.valueOf(x), JavaType.DOUBLE, forceEncrypt); + updateValue(index, JDBCType.DOUBLE, x, JavaType.DOUBLE, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "updateDouble"); } @@ -4364,7 +4364,7 @@ public void updateObject(int index, loggerExternal.entering(getClassNameLogging(), "updateObject", new Object[] {index, x, scale}); checkClosed(); - updateObject(index, x, Integer.valueOf(scale), null, null, false); + updateObject(index, x, scale, null, null, false); loggerExternal.exiting(getClassNameLogging(), "updateObject"); } @@ -4394,7 +4394,7 @@ public void updateObject(int index, loggerExternal.entering(getClassNameLogging(), "updateObject", new Object[] {index, x, scale}); checkClosed(); - updateObject(index, x, Integer.valueOf(scale), null, precision, false); + updateObject(index, x, scale, null, precision, false); loggerExternal.exiting(getClassNameLogging(), "updateObject"); } @@ -4429,7 +4429,7 @@ public void updateObject(int index, loggerExternal.entering(getClassNameLogging(), "updateObject", new Object[] {index, x, scale, forceEncrypt}); checkClosed(); - updateObject(index, x, Integer.valueOf(scale), null, precision, forceEncrypt); + updateObject(index, x, scale, null, precision, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "updateObject"); } @@ -4507,7 +4507,7 @@ public void updateBoolean(String columnName, loggerExternal.entering(getClassNameLogging(), "updateBoolean", new Object[] {columnName, x}); checkClosed(); - updateValue(findColumn(columnName), JDBCType.BIT, Boolean.valueOf(x), JavaType.BOOLEAN, false); + updateValue(findColumn(columnName), JDBCType.BIT, x, JavaType.BOOLEAN, false); loggerExternal.exiting(getClassNameLogging(), "updateBoolean"); } @@ -4535,7 +4535,7 @@ public void updateBoolean(String columnName, loggerExternal.entering(getClassNameLogging(), "updateBoolean", new Object[] {columnName, x, forceEncrypt}); checkClosed(); - updateValue(findColumn(columnName), JDBCType.BIT, Boolean.valueOf(x), JavaType.BOOLEAN, forceEncrypt); + updateValue(findColumn(columnName), JDBCType.BIT, x, JavaType.BOOLEAN, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "updateBoolean"); } @@ -4586,7 +4586,7 @@ public void updateShort(String columnName, loggerExternal.entering(getClassNameLogging(), "updateShort", new Object[] {columnName, x}); checkClosed(); - updateValue(findColumn(columnName), JDBCType.SMALLINT, Short.valueOf(x), JavaType.SHORT, false); + updateValue(findColumn(columnName), JDBCType.SMALLINT, x, JavaType.SHORT, false); loggerExternal.exiting(getClassNameLogging(), "updateShort"); } @@ -4614,7 +4614,7 @@ public void updateShort(String columnName, loggerExternal.entering(getClassNameLogging(), "updateShort", new Object[] {columnName, x, forceEncrypt}); checkClosed(); - updateValue(findColumn(columnName), JDBCType.SMALLINT, Short.valueOf(x), JavaType.SHORT, forceEncrypt); + updateValue(findColumn(columnName), JDBCType.SMALLINT, x, JavaType.SHORT, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "updateShort"); } @@ -4625,7 +4625,7 @@ public void updateInt(String columnName, loggerExternal.entering(getClassNameLogging(), "updateInt", new Object[] {columnName, x}); checkClosed(); - updateValue(findColumn(columnName), JDBCType.INTEGER, Integer.valueOf(x), JavaType.INTEGER, false); + updateValue(findColumn(columnName), JDBCType.INTEGER, x, JavaType.INTEGER, false); loggerExternal.exiting(getClassNameLogging(), "updateInt"); } @@ -4653,7 +4653,7 @@ public void updateInt(String columnName, loggerExternal.entering(getClassNameLogging(), "updateInt", new Object[] {columnName, x, forceEncrypt}); checkClosed(); - updateValue(findColumn(columnName), JDBCType.INTEGER, Integer.valueOf(x), JavaType.INTEGER, forceEncrypt); + updateValue(findColumn(columnName), JDBCType.INTEGER, x, JavaType.INTEGER, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "updateInt"); } @@ -4664,7 +4664,7 @@ public void updateLong(String columnName, loggerExternal.entering(getClassNameLogging(), "updateLong", new Object[] {columnName, x}); checkClosed(); - updateValue(findColumn(columnName), JDBCType.BIGINT, Long.valueOf(x), JavaType.LONG, false); + updateValue(findColumn(columnName), JDBCType.BIGINT, x, JavaType.LONG, false); loggerExternal.exiting(getClassNameLogging(), "updateLong"); } @@ -4692,7 +4692,7 @@ public void updateLong(String columnName, loggerExternal.entering(getClassNameLogging(), "updateLong", new Object[] {columnName, x, forceEncrypt}); checkClosed(); - updateValue(findColumn(columnName), JDBCType.BIGINT, Long.valueOf(x), JavaType.LONG, forceEncrypt); + updateValue(findColumn(columnName), JDBCType.BIGINT, x, JavaType.LONG, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "updateLong"); } @@ -4703,7 +4703,7 @@ public void updateFloat(String columnName, loggerExternal.entering(getClassNameLogging(), "updateFloat", new Object[] {columnName, x}); checkClosed(); - updateValue(findColumn(columnName), JDBCType.REAL, Float.valueOf(x), JavaType.FLOAT, false); + updateValue(findColumn(columnName), JDBCType.REAL, x, JavaType.FLOAT, false); loggerExternal.exiting(getClassNameLogging(), "updateFloat"); } @@ -4731,7 +4731,7 @@ public void updateFloat(String columnName, loggerExternal.entering(getClassNameLogging(), "updateFloat", new Object[] {columnName, x, forceEncrypt}); checkClosed(); - updateValue(findColumn(columnName), JDBCType.REAL, Float.valueOf(x), JavaType.FLOAT, forceEncrypt); + updateValue(findColumn(columnName), JDBCType.REAL, x, JavaType.FLOAT, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "updateFloat"); } @@ -4742,7 +4742,7 @@ public void updateDouble(String columnName, loggerExternal.entering(getClassNameLogging(), "updateDouble", new Object[] {columnName, x}); checkClosed(); - updateValue(findColumn(columnName), JDBCType.DOUBLE, Double.valueOf(x), JavaType.DOUBLE, false); + updateValue(findColumn(columnName), JDBCType.DOUBLE, x, JavaType.DOUBLE, false); loggerExternal.exiting(getClassNameLogging(), "updateDouble"); } @@ -4770,7 +4770,7 @@ public void updateDouble(String columnName, loggerExternal.entering(getClassNameLogging(), "updateDouble", new Object[] {columnName, x, forceEncrypt}); checkClosed(); - updateValue(findColumn(columnName), JDBCType.DOUBLE, Double.valueOf(x), JavaType.DOUBLE, forceEncrypt); + updateValue(findColumn(columnName), JDBCType.DOUBLE, x, JavaType.DOUBLE, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "updateDouble"); } @@ -5415,7 +5415,7 @@ public void updateObject(String columnName, loggerExternal.entering(getClassNameLogging(), "updateObject", new Object[] {columnName, x, scale}); checkClosed(); - updateObject(findColumn(columnName), x, Integer.valueOf(scale), null, null, false); + updateObject(findColumn(columnName), x, scale, null, null, false); loggerExternal.exiting(getClassNameLogging(), "updateObject"); } @@ -5445,7 +5445,7 @@ public void updateObject(String columnName, loggerExternal.entering(getClassNameLogging(), "updateObject", new Object[] {columnName, x, precision, scale}); checkClosed(); - updateObject(findColumn(columnName), x, Integer.valueOf(scale), null, precision, false); + updateObject(findColumn(columnName), x, scale, null, precision, false); loggerExternal.exiting(getClassNameLogging(), "updateObject"); } @@ -5480,7 +5480,7 @@ public void updateObject(String columnName, loggerExternal.entering(getClassNameLogging(), "updateObject", new Object[] {columnName, x, precision, scale, forceEncrypt}); checkClosed(); - updateObject(findColumn(columnName), x, Integer.valueOf(scale), null, precision, forceEncrypt); + updateObject(findColumn(columnName), x, scale, null, precision, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "updateObject"); } @@ -5631,9 +5631,9 @@ private void doInsertRowRPC(TDSCommand command, tdsWriter.writeShort(TDS.PROCID_SP_CURSOR); tdsWriter.writeByte((byte) 0); // RPC procedure option 1 tdsWriter.writeByte((byte) 0); // RPC procedure option 2 - tdsWriter.writeRPCInt(null, new Integer(serverCursorId), false); - tdsWriter.writeRPCInt(null, new Integer(TDS.SP_CURSOR_OP_INSERT), false); - tdsWriter.writeRPCInt(null, new Integer(fetchBufferGetRow()), false); + tdsWriter.writeRPCInt(null, serverCursorId, false); + tdsWriter.writeRPCInt(null, (int) TDS.SP_CURSOR_OP_INSERT, false); + tdsWriter.writeRPCInt(null, fetchBufferGetRow(), false); if (hasUpdatedColumns()) { tdsWriter.writeRPCStringUnicode(tableName); @@ -5706,9 +5706,9 @@ private void doUpdateRowRPC(TDSCommand command) throws SQLServerException { tdsWriter.writeShort(TDS.PROCID_SP_CURSOR); tdsWriter.writeByte((byte) 0); // RPC procedure option 1 tdsWriter.writeByte((byte) 0); // RPC procedure option 2 - tdsWriter.writeRPCInt(null, new Integer(serverCursorId), false); - tdsWriter.writeRPCInt(null, new Integer(TDS.SP_CURSOR_OP_UPDATE | TDS.SP_CURSOR_OP_SETPOSITION), false); - tdsWriter.writeRPCInt(null, new Integer(fetchBufferGetRow()), false); + tdsWriter.writeRPCInt(null, serverCursorId, false); + tdsWriter.writeRPCInt(null, TDS.SP_CURSOR_OP_UPDATE | TDS.SP_CURSOR_OP_SETPOSITION, false); + tdsWriter.writeRPCInt(null, fetchBufferGetRow(), false); tdsWriter.writeRPCStringUnicode(""); assert hasUpdatedColumns(); @@ -5779,9 +5779,9 @@ private void doDeleteRowRPC(TDSCommand command) throws SQLServerException { tdsWriter.writeShort(TDS.PROCID_SP_CURSOR); tdsWriter.writeByte((byte) 0); // RPC procedure option 1 tdsWriter.writeByte((byte) 0); // RPC procedure option 2 - tdsWriter.writeRPCInt(null, new Integer(serverCursorId), false); - tdsWriter.writeRPCInt(null, new Integer(TDS.SP_CURSOR_OP_DELETE | TDS.SP_CURSOR_OP_SETPOSITION), false); - tdsWriter.writeRPCInt(null, new Integer(fetchBufferGetRow()), false); + tdsWriter.writeRPCInt(null, serverCursorId, false); + tdsWriter.writeRPCInt(null, TDS.SP_CURSOR_OP_DELETE | TDS.SP_CURSOR_OP_SETPOSITION, false); + tdsWriter.writeRPCInt(null, fetchBufferGetRow(), false); tdsWriter.writeRPCStringUnicode(""); TDSParser.parse(command.startResponse(), command.getLogContext()); @@ -6337,10 +6337,10 @@ final boolean doExecute() throws SQLServerException { tdsWriter.writeShort(TDS.PROCID_SP_CURSORFETCH); tdsWriter.writeByte(TDS.RPC_OPTION_NO_METADATA); tdsWriter.writeByte((byte) 0); // RPC procedure option 2 - tdsWriter.writeRPCInt(null, new Integer(serverCursorId), false); - tdsWriter.writeRPCInt(null, new Integer(fetchType), false); - tdsWriter.writeRPCInt(null, new Integer(startRow), false); - tdsWriter.writeRPCInt(null, new Integer(numRows), false); + tdsWriter.writeRPCInt(null, serverCursorId, false); + tdsWriter.writeRPCInt(null, fetchType, false); + tdsWriter.writeRPCInt(null, startRow, false); + tdsWriter.writeRPCInt(null, numRows, false); // To free up the thread on the server that is feeding us these results, // read the entire response off the wire UNLESS this is a forward only @@ -6489,7 +6489,7 @@ final boolean doExecute() throws SQLServerException { tdsWriter.writeShort(TDS.PROCID_SP_CURSORCLOSE); tdsWriter.writeByte((byte) 0); // RPC procedure option 1 tdsWriter.writeByte((byte) 0); // RPC procedure option 2 - tdsWriter.writeRPCInt(null, new Integer(serverCursorId), false); + tdsWriter.writeRPCInt(null, serverCursorId, false); TDSParser.parse(startResponse(), getLogContext()); return true; } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResultSet42.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResultSet42.java index a780e7e39c..cc900e65f3 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResultSet42.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResultSet42.java @@ -57,7 +57,7 @@ public void updateObject(int index, checkClosed(); // getVendorTypeNumber() returns the same constant integer values as in java.sql.Types - updateObject(index, obj, Integer.valueOf(scale), JDBCType.of(targetSqlType.getVendorTypeNumber()), null, false); + updateObject(index, obj, scale, JDBCType.of(targetSqlType.getVendorTypeNumber()), null, false); loggerExternal.exiting(getClassNameLogging(), "updateObject"); } @@ -74,7 +74,7 @@ public void updateObject(int index, checkClosed(); // getVendorTypeNumber() returns the same constant integer values as in java.sql.Types - updateObject(index, obj, Integer.valueOf(scale), JDBCType.of(targetSqlType.getVendorTypeNumber()), null, forceEncrypt); + updateObject(index, obj, scale, JDBCType.of(targetSqlType.getVendorTypeNumber()), null, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "updateObject"); } @@ -91,7 +91,7 @@ public void updateObject(String columnName, checkClosed(); // getVendorTypeNumber() returns the same constant integer values as in java.sql.Types - updateObject(findColumn(columnName), obj, Integer.valueOf(scale), JDBCType.of(targetSqlType.getVendorTypeNumber()), null, false); + updateObject(findColumn(columnName), obj, scale, JDBCType.of(targetSqlType.getVendorTypeNumber()), null, false); loggerExternal.exiting(getClassNameLogging(), "updateObject"); } @@ -109,7 +109,7 @@ public void updateObject(String columnName, checkClosed(); // getVendorTypeNumber() returns the same constant integer values as in java.sql.Types - updateObject(findColumn(columnName), obj, Integer.valueOf(scale), JDBCType.of(targetSqlType.getVendorTypeNumber()), null, forceEncrypt); + updateObject(findColumn(columnName), obj, scale, JDBCType.of(targetSqlType.getVendorTypeNumber()), null, forceEncrypt); loggerExternal.exiting(getClassNameLogging(), "updateObject"); } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java index 3ae799ab92..632edf9e64 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java @@ -688,7 +688,7 @@ public int executeUpdate(String sql) throws SQLServerException { if (updateCount < Integer.MIN_VALUE || updateCount > Integer.MAX_VALUE) SQLServerException.makeFromDriverError(connection, this, SQLServerException.getErrString("R_updateCountOutofRange"), null, true); - loggerExternal.exiting(getClassNameLogging(), "executeUpdate", new Long(updateCount)); + loggerExternal.exiting(getClassNameLogging(), "executeUpdate", updateCount); return (int) updateCount; } @@ -712,7 +712,7 @@ public long executeLargeUpdate(String sql) throws SQLServerException { checkClosed(); executeStatement(new StmtExecCmd(this, sql, EXECUTE_UPDATE, NO_GENERATED_KEYS)); - loggerExternal.exiting(getClassNameLogging(), "executeLargeUpdate", new Long(updateCount)); + loggerExternal.exiting(getClassNameLogging(), "executeLargeUpdate", updateCount); return updateCount; } @@ -732,7 +732,7 @@ public boolean execute(String sql) throws SQLServerException { } checkClosed(); executeStatement(new StmtExecCmd(this, sql, EXECUTE, NO_GENERATED_KEYS)); - loggerExternal.exiting(getClassNameLogging(), "execute", Boolean.valueOf(null != resultSet)); + loggerExternal.exiting(getClassNameLogging(), "execute", null != resultSet); return null != resultSet; } @@ -1032,16 +1032,16 @@ final void resetForReexecute() throws SQLServerException { /* L0 */ public final int getMaxFieldSize() throws SQLServerException { loggerExternal.entering(getClassNameLogging(), "getMaxFieldSize"); checkClosed(); - loggerExternal.exiting(getClassNameLogging(), "getMaxFieldSize", new Integer(maxFieldSize)); + loggerExternal.exiting(getClassNameLogging(), "getMaxFieldSize", maxFieldSize); return maxFieldSize; } /* L0 */ public final void setMaxFieldSize(int max) throws SQLServerException { - loggerExternal.entering(getClassNameLogging(), "setMaxFieldSize", new Integer(max)); + loggerExternal.entering(getClassNameLogging(), "setMaxFieldSize", max); checkClosed(); if (max < 0) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidLength")); - Object[] msgArgs = {new Integer(max)}; + Object[] msgArgs = {max}; SQLServerException.makeFromDriverError(connection, this, form.format(msgArgs), null, true); } maxFieldSize = max; @@ -1051,7 +1051,7 @@ final void resetForReexecute() throws SQLServerException { /* L0 */ public final int getMaxRows() throws SQLServerException { loggerExternal.entering(getClassNameLogging(), "getMaxRows"); checkClosed(); - loggerExternal.exiting(getClassNameLogging(), "getMaxRows", new Integer(maxRows)); + loggerExternal.exiting(getClassNameLogging(), "getMaxRows", maxRows); return maxRows; } @@ -1062,18 +1062,18 @@ public final long getLargeMaxRows() throws SQLServerException { // SQL Server only supports integer limits for setting max rows. // So, getLargeMaxRows() and getMaxRows() will return the same value. - loggerExternal.exiting(getClassNameLogging(), "getLargeMaxRows", new Long(maxRows)); + loggerExternal.exiting(getClassNameLogging(), "getLargeMaxRows", (long) maxRows); return (long) getMaxRows(); } /* L0 */ public final void setMaxRows(int max) throws SQLServerException { if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) - loggerExternal.entering(getClassNameLogging(), "setMaxRows", new Integer(max)); + loggerExternal.entering(getClassNameLogging(), "setMaxRows", max); checkClosed(); if (max < 0) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidRowcount")); - Object[] msgArgs = {new Integer(max)}; + Object[] msgArgs = {max}; SQLServerException.makeFromDriverError(connection, this, form.format(msgArgs), null, true); } @@ -1089,7 +1089,7 @@ public final void setLargeMaxRows(long max) throws SQLServerException { DriverJDBCVersion.checkSupportsJDBC42(); if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) - loggerExternal.entering(getClassNameLogging(), "setLargeMaxRows", new Long(max)); + loggerExternal.entering(getClassNameLogging(), "setLargeMaxRows", max); // SQL server only supports integer limits for setting max rows. // If is bigger than integer limits then throw an exception, otherwise call setMaxRows(int) @@ -1102,7 +1102,7 @@ public final void setLargeMaxRows(long max) throws SQLServerException { /* L0 */ public final void setEscapeProcessing(boolean enable) throws SQLServerException { if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) - loggerExternal.entering(getClassNameLogging(), "setEscapeProcessing", Boolean.valueOf(enable)); + loggerExternal.entering(getClassNameLogging(), "setEscapeProcessing", enable); checkClosed(); escapeProcessing = enable; loggerExternal.exiting(getClassNameLogging(), "setEscapeProcessing"); @@ -1111,16 +1111,16 @@ public final void setLargeMaxRows(long max) throws SQLServerException { /* L0 */ public final int getQueryTimeout() throws SQLServerException { loggerExternal.entering(getClassNameLogging(), "getQueryTimeout"); checkClosed(); - loggerExternal.exiting(getClassNameLogging(), "getQueryTimeout", new Integer(queryTimeout)); + loggerExternal.exiting(getClassNameLogging(), "getQueryTimeout", queryTimeout); return queryTimeout; } /* L0 */ public final void setQueryTimeout(int seconds) throws SQLServerException { - loggerExternal.entering(getClassNameLogging(), "setQueryTimeout", new Integer(seconds)); + loggerExternal.entering(getClassNameLogging(), "setQueryTimeout", seconds); checkClosed(); if (seconds < 0) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidQueryTimeOutValue")); - Object[] msgArgs = {new Integer(seconds)}; + Object[] msgArgs = {seconds}; SQLServerException.makeFromDriverError(connection, this, form.format(msgArgs), null, true); } queryTimeout = seconds; @@ -1183,7 +1183,7 @@ public final java.sql.ResultSet getResultSet() throws SQLServerException { if (updateCount < Integer.MIN_VALUE || updateCount > Integer.MAX_VALUE) SQLServerException.makeFromDriverError(connection, this, SQLServerException.getErrString("R_updateCountOutofRange"), null, true); - loggerExternal.exiting(getClassNameLogging(), "getUpdateCount", new Long(updateCount)); + loggerExternal.exiting(getClassNameLogging(), "getUpdateCount", updateCount); return (int) updateCount; } @@ -1193,7 +1193,7 @@ public final long getLargeUpdateCount() throws SQLServerException { loggerExternal.entering(getClassNameLogging(), "getUpdateCount"); checkClosed(); - loggerExternal.exiting(getClassNameLogging(), "getUpdateCount", new Long(updateCount)); + loggerExternal.exiting(getClassNameLogging(), "getUpdateCount", updateCount); return updateCount; } @@ -1268,7 +1268,7 @@ final void processResults() throws SQLServerException { // Don't just return the value from the getNextResult() call, however. // The getMoreResults method has a subtle spec for its return value (see above). getNextResult(); - loggerExternal.exiting(getClassNameLogging(), "getMoreResults", Boolean.valueOf(null != resultSet)); + loggerExternal.exiting(getClassNameLogging(), "getMoreResults", null != resultSet); return null != resultSet; } @@ -1609,14 +1609,14 @@ boolean consumeExecOutParam(TDSReader tdsReader) throws SQLServerException { public final void setFetchDirection(int nDir) throws SQLServerException { if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) - loggerExternal.entering(getClassNameLogging(), "setFetchDirection", new Integer(nDir)); + loggerExternal.entering(getClassNameLogging(), "setFetchDirection", nDir); checkClosed(); if ((ResultSet.FETCH_FORWARD != nDir && ResultSet.FETCH_REVERSE != nDir && ResultSet.FETCH_UNKNOWN != nDir) || (ResultSet.FETCH_FORWARD != nDir && (SQLServerResultSet.TYPE_SS_DIRECT_FORWARD_ONLY == resultSetType || SQLServerResultSet.TYPE_SS_SERVER_CURSOR_FORWARD_ONLY == resultSetType))) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidFetchDirection")); - Object[] msgArgs = {new Integer(nDir)}; + Object[] msgArgs = {nDir}; SQLServerException.makeFromDriverError(connection, this, form.format(msgArgs), null, false); } @@ -1627,13 +1627,13 @@ public final void setFetchDirection(int nDir) throws SQLServerException { public final int getFetchDirection() throws SQLServerException { loggerExternal.entering(getClassNameLogging(), "getFetchDirection"); checkClosed(); - loggerExternal.exiting(getClassNameLogging(), "getFetchDirection", new Integer(nFetchDirection)); + loggerExternal.exiting(getClassNameLogging(), "getFetchDirection", nFetchDirection); return nFetchDirection; } /* L0 */ public final void setFetchSize(int rows) throws SQLServerException { if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) - loggerExternal.entering(getClassNameLogging(), "setFetchSize", new Integer(rows)); + loggerExternal.entering(getClassNameLogging(), "setFetchSize", rows); checkClosed(); if (rows < 0) SQLServerException.makeFromDriverError(connection, this, SQLServerException.getErrString("R_invalidFetchSize"), null, false); @@ -1645,21 +1645,21 @@ public final int getFetchDirection() throws SQLServerException { /* L0 */ public final int getFetchSize() throws SQLServerException { loggerExternal.entering(getClassNameLogging(), "getFetchSize"); checkClosed(); - loggerExternal.exiting(getClassNameLogging(), "getFetchSize", new Integer(nFetchSize)); + loggerExternal.exiting(getClassNameLogging(), "getFetchSize", nFetchSize); return nFetchSize; } /* L0 */ public final int getResultSetConcurrency() throws SQLServerException { loggerExternal.entering(getClassNameLogging(), "getResultSetConcurrency"); checkClosed(); - loggerExternal.exiting(getClassNameLogging(), "getResultSetConcurrency", new Integer(resultSetConcurrency)); + loggerExternal.exiting(getClassNameLogging(), "getResultSetConcurrency", resultSetConcurrency); return resultSetConcurrency; } /* L0 */ public final int getResultSetType() throws SQLServerException { loggerExternal.entering(getClassNameLogging(), "getResultSetType"); checkClosed(); - loggerExternal.exiting(getClassNameLogging(), "getResultSetType", new Integer(appResultSetType)); + loggerExternal.exiting(getClassNameLogging(), "getResultSetType", appResultSetType); return appResultSetType; } @@ -1929,19 +1929,19 @@ private void doExecuteCursored(StmtExecCmd execCmd, tdsWriter.writeByte((byte) 0); // RPC procedure option 2 // OUT - tdsWriter.writeRPCInt(null, new Integer(0), true); + tdsWriter.writeRPCInt(null, 0, true); // IN tdsWriter.writeRPCStringUnicode(sql); // IN - tdsWriter.writeRPCInt(null, new Integer(getResultSetScrollOpt()), false); + tdsWriter.writeRPCInt(null, getResultSetScrollOpt(), false); // IN - tdsWriter.writeRPCInt(null, new Integer(getResultSetCCOpt()), false); + tdsWriter.writeRPCInt(null, getResultSetCCOpt(), false); // OUT - tdsWriter.writeRPCInt(null, new Integer(0), true); + tdsWriter.writeRPCInt(null, 0, true); ensureExecuteResultsReader(execCmd.startResponse(isResponseBufferingAdaptive)); startResults(); @@ -1954,14 +1954,14 @@ private void doExecuteCursored(StmtExecCmd execCmd, loggerExternal.entering(getClassNameLogging(), "getResultSetHoldability"); checkClosed(); int holdability = connection.getHoldability(); // For SQL Server must be the same as the connection - loggerExternal.exiting(getClassNameLogging(), "getResultSetHoldability", new Integer(holdability)); + loggerExternal.exiting(getClassNameLogging(), "getResultSetHoldability", holdability); return holdability; } public final boolean execute(java.lang.String sql, int autoGeneratedKeys) throws SQLServerException { if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) { - loggerExternal.entering(getClassNameLogging(), "execute", new Object[] {sql, new Integer(autoGeneratedKeys)}); + loggerExternal.entering(getClassNameLogging(), "execute", new Object[] {sql, autoGeneratedKeys}); if (Util.IsActivityTraceOn()) { loggerExternal.finer(toString() + " ActivityId: " + ActivityCorrelator.getNext().toString()); } @@ -1969,12 +1969,12 @@ public final boolean execute(java.lang.String sql, checkClosed(); if (autoGeneratedKeys != Statement.RETURN_GENERATED_KEYS && autoGeneratedKeys != Statement.NO_GENERATED_KEYS) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidAutoGeneratedKeys")); - Object[] msgArgs = {new Integer(autoGeneratedKeys)}; + Object[] msgArgs = {autoGeneratedKeys}; SQLServerException.makeFromDriverError(connection, this, form.format(msgArgs), null, false); } executeStatement(new StmtExecCmd(this, sql, EXECUTE, autoGeneratedKeys)); - loggerExternal.exiting(getClassNameLogging(), "execute", Boolean.valueOf(null != resultSet)); + loggerExternal.exiting(getClassNameLogging(), "execute", null != resultSet); return null != resultSet; } @@ -1987,7 +1987,7 @@ public final boolean execute(java.lang.String sql, SQLServerException.makeFromDriverError(connection, this, SQLServerException.getErrString("R_invalidColumnArrayLength"), null, false); } boolean fSuccess = execute(sql, Statement.RETURN_GENERATED_KEYS); - loggerExternal.exiting(getClassNameLogging(), "execute", Boolean.valueOf(fSuccess)); + loggerExternal.exiting(getClassNameLogging(), "execute", fSuccess); return fSuccess; } @@ -2000,14 +2000,14 @@ public final boolean execute(java.lang.String sql, SQLServerException.makeFromDriverError(connection, this, SQLServerException.getErrString("R_invalidColumnArrayLength"), null, false); } boolean fSuccess = execute(sql, Statement.RETURN_GENERATED_KEYS); - loggerExternal.exiting(getClassNameLogging(), "execute", Boolean.valueOf(fSuccess)); + loggerExternal.exiting(getClassNameLogging(), "execute", fSuccess); return fSuccess; } public final int executeUpdate(String sql, int autoGeneratedKeys) throws SQLServerException { if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) { - loggerExternal.entering(getClassNameLogging(), "executeUpdate", new Object[] {sql, new Integer(autoGeneratedKeys)}); + loggerExternal.entering(getClassNameLogging(), "executeUpdate", new Object[] {sql, autoGeneratedKeys}); if (Util.IsActivityTraceOn()) { loggerExternal.finer(toString() + " ActivityId: " + ActivityCorrelator.getNext().toString()); } @@ -2015,7 +2015,7 @@ public final int executeUpdate(String sql, checkClosed(); if (autoGeneratedKeys != Statement.RETURN_GENERATED_KEYS && autoGeneratedKeys != Statement.NO_GENERATED_KEYS) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidAutoGeneratedKeys")); - Object[] msgArgs = {new Integer(autoGeneratedKeys)}; + Object[] msgArgs = {autoGeneratedKeys}; SQLServerException.makeFromDriverError(connection, this, form.format(msgArgs), null, false); } executeStatement(new StmtExecCmd(this, sql, EXECUTE_UPDATE, autoGeneratedKeys)); @@ -2024,7 +2024,7 @@ public final int executeUpdate(String sql, if (updateCount < Integer.MIN_VALUE || updateCount > Integer.MAX_VALUE) SQLServerException.makeFromDriverError(connection, this, SQLServerException.getErrString("R_updateCountOutofRange"), null, true); - loggerExternal.exiting(getClassNameLogging(), "executeUpdate", new Long(updateCount)); + loggerExternal.exiting(getClassNameLogging(), "executeUpdate", updateCount); return (int) updateCount; } @@ -2034,7 +2034,7 @@ public final long executeLargeUpdate(String sql, DriverJDBCVersion.checkSupportsJDBC42(); if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) { - loggerExternal.entering(getClassNameLogging(), "executeLargeUpdate", new Object[] {sql, new Integer(autoGeneratedKeys)}); + loggerExternal.entering(getClassNameLogging(), "executeLargeUpdate", new Object[] {sql, autoGeneratedKeys}); if (Util.IsActivityTraceOn()) { loggerExternal.finer(toString() + " ActivityId: " + ActivityCorrelator.getNext().toString()); } @@ -2042,11 +2042,11 @@ public final long executeLargeUpdate(String sql, checkClosed(); if (autoGeneratedKeys != Statement.RETURN_GENERATED_KEYS && autoGeneratedKeys != Statement.NO_GENERATED_KEYS) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_invalidAutoGeneratedKeys")); - Object[] msgArgs = {new Integer(autoGeneratedKeys)}; + Object[] msgArgs = {autoGeneratedKeys}; SQLServerException.makeFromDriverError(connection, this, form.format(msgArgs), null, false); } executeStatement(new StmtExecCmd(this, sql, EXECUTE_UPDATE, autoGeneratedKeys)); - loggerExternal.exiting(getClassNameLogging(), "executeLargeUpdate", new Long(updateCount)); + loggerExternal.exiting(getClassNameLogging(), "executeLargeUpdate", updateCount); return updateCount; } @@ -2059,7 +2059,7 @@ public final int executeUpdate(java.lang.String sql, SQLServerException.makeFromDriverError(connection, this, SQLServerException.getErrString("R_invalidColumnArrayLength"), null, false); } int count = executeUpdate(sql, Statement.RETURN_GENERATED_KEYS); - loggerExternal.exiting(getClassNameLogging(), "executeUpdate", new Integer(count)); + loggerExternal.exiting(getClassNameLogging(), "executeUpdate", count); return count; } @@ -2074,7 +2074,7 @@ public final long executeLargeUpdate(java.lang.String sql, SQLServerException.makeFromDriverError(connection, this, SQLServerException.getErrString("R_invalidColumnArrayLength"), null, false); } long count = executeLargeUpdate(sql, Statement.RETURN_GENERATED_KEYS); - loggerExternal.exiting(getClassNameLogging(), "executeLargeUpdate", new Long(count)); + loggerExternal.exiting(getClassNameLogging(), "executeLargeUpdate", count); return count; } @@ -2087,7 +2087,7 @@ public final int executeUpdate(java.lang.String sql, SQLServerException.makeFromDriverError(connection, this, SQLServerException.getErrString("R_invalidColumnArrayLength"), null, false); } int count = executeUpdate(sql, Statement.RETURN_GENERATED_KEYS); - loggerExternal.exiting(getClassNameLogging(), "executeUpdate", new Integer(count)); + loggerExternal.exiting(getClassNameLogging(), "executeUpdate", count); return count; } @@ -2102,7 +2102,7 @@ public final long executeLargeUpdate(java.lang.String sql, SQLServerException.makeFromDriverError(connection, this, SQLServerException.getErrString("R_invalidColumnArrayLength"), null, false); } long count = executeLargeUpdate(sql, Statement.RETURN_GENERATED_KEYS); - loggerExternal.exiting(getClassNameLogging(), "executeLargeUpdate", new Long(count)); + loggerExternal.exiting(getClassNameLogging(), "executeLargeUpdate", count); return count; } @@ -2129,7 +2129,7 @@ public final ResultSet getGeneratedKeys() throws SQLServerException { /* L3 */ public final boolean getMoreResults(int mode) throws SQLServerException { if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) - loggerExternal.entering(getClassNameLogging(), "getMoreResults", new Integer(mode)); + loggerExternal.entering(getClassNameLogging(), "getMoreResults", mode); checkClosed(); if (KEEP_CURRENT_RESULT == mode) NotImplemented(); @@ -2148,7 +2148,7 @@ public final ResultSet getGeneratedKeys() throws SQLServerException { } } - loggerExternal.exiting(getClassNameLogging(), "getMoreResults", Boolean.valueOf(fResults)); + loggerExternal.exiting(getClassNameLogging(), "getMoreResults", fResults); return fResults; } @@ -2183,7 +2183,7 @@ public void setPoolable(boolean poolable) throws SQLException { public boolean isWrapperFor(Class iface) throws SQLException { loggerExternal.entering(getClassNameLogging(), "isWrapperFor"); boolean f = iface.isInstance(this); - loggerExternal.exiting(getClassNameLogging(), "isWrapperFor", Boolean.valueOf(f)); + loggerExternal.exiting(getClassNameLogging(), "isWrapperFor", f); return f; } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/Util.java b/src/main/java/com/microsoft/sqlserver/jdbc/Util.java index 625a52797f..0480cbd386 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/Util.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/Util.java @@ -605,7 +605,7 @@ static String readUnicodeString(byte[] b, catch (IndexOutOfBoundsException ex) { String txtMsg = SQLServerException.checkAndAppendClientConnId(SQLServerException.getErrString("R_stringReadError"), conn); MessageFormat form = new MessageFormat(txtMsg); - Object[] msgArgs = {new Integer(offset)}; + Object[] msgArgs = {offset}; // Re-throw SQLServerException if conversion fails. throw new SQLServerException(form.format(msgArgs), null, 0, ex); } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java b/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java index 113f580594..c9d60be3a2 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java @@ -1070,7 +1070,7 @@ void execute(DTV dtv, * simply the assignment in the Java runtime). So the only way found is to convert the float to a string and init the double with that * string */ - Double doubleValue = (null == floatValue) ? null : new Double(floatValue.floatValue()); + Double doubleValue = (null == floatValue) ? null : (double) floatValue; tdsWriter.writeRPCDouble(name, doubleValue, isOutParam); } } @@ -2172,8 +2172,8 @@ void execute(DTV dtv, // Rescale the value if necessary if (null != bigDecimalValue) { Integer inScale = dtv.getScale(); - if (null != inScale && inScale.intValue() != bigDecimalValue.scale()) - bigDecimalValue = bigDecimalValue.setScale(inScale.intValue(), BigDecimal.ROUND_DOWN); + if (null != inScale && inScale != bigDecimalValue.scale()) + bigDecimalValue = bigDecimalValue.setScale(inScale, BigDecimal.ROUND_DOWN); } dtv.setValue(bigDecimalValue, JavaType.BIGDECIMAL); @@ -2261,7 +2261,7 @@ void execute(DTV dtv, // the actual stream length did not match then cancel the request. if (DataTypes.UNKNOWN_STREAM_LENGTH != readerLength && stringValue.length() != readerLength) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_mismatchedStreamLength")); - Object[] msgArgs = {Long.valueOf(readerLength), Integer.valueOf(stringValue.length())}; + Object[] msgArgs = {readerLength, stringValue.length()}; SQLServerException.makeFromDriverError(null, null, form.format(msgArgs), "", true); } diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java index da7e3eab18..ed19c6d177 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java @@ -1134,7 +1134,7 @@ public void testLargeMaxRows_JDBC42() throws Exception { // SQL Server only supports integer limits for setting max rows // If the value MAX_VALUE + 1 is accepted, throw exception try { - newValue = new Long(java.lang.Integer.MAX_VALUE) + 1; + newValue = (long) Integer.MAX_VALUE + 1; dbstmt.setLargeMaxRows(newValue); throw new SQLException("setLargeMaxRows(): Long values should not be set"); } diff --git a/src/test/java/com/microsoft/sqlserver/testframework/DBResultSet.java b/src/test/java/com/microsoft/sqlserver/testframework/DBResultSet.java index 5e8a07025f..0851f39079 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/DBResultSet.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/DBResultSet.java @@ -233,18 +233,18 @@ public void verifydata(int ordinal, switch (metaData.getColumnType(ordinal + 1)) { case java.sql.Types.BIGINT: assertTrue((((Long) expectedData).longValue() == ((Long) retrieved).longValue()), - "Unexpected bigint value, expected: " + ((Long) expectedData).longValue() + " .Retrieved: " + ((Long) retrieved).longValue()); + "Unexpected bigint value, expected: " + (Long) expectedData + " .Retrieved: " + (Long) retrieved); break; case java.sql.Types.INTEGER: assertTrue((((Integer) expectedData).intValue() == ((Integer) retrieved).intValue()), "Unexpected int value, expected : " - + ((Integer) expectedData).intValue() + " ,received: " + ((Integer) retrieved).intValue()); + + (Integer) expectedData + " ,received: " + (Integer) retrieved); break; case java.sql.Types.SMALLINT: case java.sql.Types.TINYINT: assertTrue((((Short) expectedData).shortValue() == ((Short) retrieved).shortValue()), "Unexpected smallint/tinyint value, expected: " - + " " + ((Short) expectedData).shortValue() + " received: " + ((Short) retrieved).shortValue()); + + " " + (Short) expectedData + " received: " + (Short) retrieved); break; case java.sql.Types.BIT: @@ -253,7 +253,7 @@ public void verifydata(int ordinal, else expectedData = false; assertTrue((((Boolean) expectedData).booleanValue() == ((Boolean) retrieved).booleanValue()), "Unexpected bit value, expected: " - + ((Boolean) expectedData).booleanValue() + " ,received: " + ((Boolean) retrieved).booleanValue()); + + (Boolean) expectedData + " ,received: " + (Boolean) retrieved); break; case java.sql.Types.DECIMAL: @@ -264,12 +264,12 @@ public void verifydata(int ordinal, case java.sql.Types.DOUBLE: assertTrue((((Double) expectedData).doubleValue() == ((Double) retrieved).doubleValue()), "Unexpected float value, expected: " - + ((Double) expectedData).doubleValue() + " received: " + ((Double) retrieved).doubleValue()); + + (Double) expectedData + " received: " + (Double) retrieved); break; case java.sql.Types.REAL: assertTrue((((Float) expectedData).floatValue() == ((Float) retrieved).floatValue()), - "Unexpected real value, expected: " + ((Float) expectedData).floatValue() + " received: " + ((Float) retrieved).floatValue()); + "Unexpected real value, expected: " + (Float) expectedData + " received: " + (Float) retrieved); break; case java.sql.Types.VARCHAR: @@ -350,7 +350,7 @@ public Object getXXX(Object idx, } else if (idx instanceof Integer) { isInteger = true; - intOrdinal = ((Integer) idx).intValue(); + intOrdinal = (Integer) idx; } else { // Otherwise diff --git a/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlBigInt.java b/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlBigInt.java index e8fef48a8d..84126f5da5 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlBigInt.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlBigInt.java @@ -22,6 +22,6 @@ public SqlBigInt() { public Object createdata() { // TODO: include max value - return new Long(ThreadLocalRandom.current().nextLong(Long.MIN_VALUE, Long.MAX_VALUE)); + return ThreadLocalRandom.current().nextLong(Long.MIN_VALUE, Long.MAX_VALUE); } } \ No newline at end of file diff --git a/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlInt.java b/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlInt.java index e988fc49ed..2622f0745e 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlInt.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlInt.java @@ -21,6 +21,6 @@ public SqlInt() { public Object createdata() { // TODO: include max value - return new Integer(ThreadLocalRandom.current().nextInt(Integer.MIN_VALUE, Integer.MAX_VALUE)); + return ThreadLocalRandom.current().nextInt(Integer.MIN_VALUE, Integer.MAX_VALUE); } } \ No newline at end of file diff --git a/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlReal.java b/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlReal.java index bea1096960..5edaf59ac1 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlReal.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlReal.java @@ -20,6 +20,6 @@ public SqlReal() { @Override public Object createdata() { - return new Float(ThreadLocalRandom.current().nextDouble((Float) minvalue, (Float) maxvalue)); + return (float) ThreadLocalRandom.current().nextDouble((Float) minvalue, (Float) maxvalue); } } \ No newline at end of file diff --git a/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlSmallInt.java b/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlSmallInt.java index d821c9d7c0..7d2cebcae2 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlSmallInt.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlSmallInt.java @@ -21,6 +21,6 @@ public SqlSmallInt() { public Object createdata() { // TODO: include max value - return new Short((short) ThreadLocalRandom.current().nextInt(Short.MIN_VALUE, Short.MAX_VALUE)); + return (short) ThreadLocalRandom.current().nextInt(Short.MIN_VALUE, Short.MAX_VALUE); } } \ No newline at end of file diff --git a/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlTinyInt.java b/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlTinyInt.java index d8c7750dd8..ca5ca58fbc 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlTinyInt.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlTinyInt.java @@ -20,6 +20,6 @@ public SqlTinyInt() { public Object createdata() { // TODO: include max value - return new Short((short) ThreadLocalRandom.current().nextInt((short) minvalue, ((short) maxvalue))); + return (short) ThreadLocalRandom.current().nextInt((short) minvalue, ((short) maxvalue)); } } \ No newline at end of file diff --git a/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlTypeValue.java b/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlTypeValue.java index b1a7d94274..0855749da5 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlTypeValue.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlTypeValue.java @@ -17,16 +17,16 @@ */ enum SqlTypeValue { // minValue // maxValue // nullValue - BIGINT (new Long(Long.MIN_VALUE), new Long(Long.MAX_VALUE), new Long(0)), - INTEGER (new Integer(Integer.MIN_VALUE), new Integer(Integer.MAX_VALUE), new Integer(0)), - SMALLINT (new Short(Short.MIN_VALUE), new Short(Short.MAX_VALUE), new Short((short) 0)), - TINYINT (new Short((short) 0), new Short((short) 255), new Short((short) 0)), + BIGINT (Long.MIN_VALUE, Long.MAX_VALUE, 0L), + INTEGER (Integer.MIN_VALUE, Integer.MAX_VALUE, 0), + SMALLINT (Short.MIN_VALUE, Short.MAX_VALUE, (short) 0), + TINYINT ((short) 0, (short) 255, (short) 0), BIT (0, 1, null), DECIMAL (new BigDecimal("-1.0E38").add(new BigDecimal("1")), new BigDecimal("1.0E38").subtract(new BigDecimal("1")), null), MONEY (new BigDecimal("-922337203685477.5808"), new BigDecimal("+922337203685477.5807"), null), SMALLMONEY (new BigDecimal("-214748.3648"), new BigDecimal("214748.3647"), null), - FLOAT (new Double(-1.79E308), new Double(+1.79E308), new Double(0)), - REAL (new Float(-3.4E38), new Float(+3.4E38), new Float(0)), + FLOAT (-1.79E308, +1.79E308, 0d), + REAL ((float) -3.4E38, (float) +3.4E38, 0f), CHAR (null, null, null),// CHAR used by char, nchar, varchar, nvarchar BINARY (null, null, null), DATETIME ("17530101T00:00:00.000", "99991231T23:59:59.997", null), From df11dfaa02fa742cb3057a7d25b892c6615efe4d Mon Sep 17 00:00:00 2001 From: Peter Bae Date: Mon, 24 Jul 2017 14:24:26 -0700 Subject: [PATCH 2/3] Update SqlTypeValue.java Formatting changes --- .../testframework/sqlType/SqlTypeValue.java | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlTypeValue.java b/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlTypeValue.java index 0855749da5..f4a594f291 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlTypeValue.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlTypeValue.java @@ -16,32 +16,33 @@ * temporal min/max values used are not DATEFORMAT dependent as in https://msdn.microsoft.com/en-us/library/ms180878.aspx */ enum SqlTypeValue { - // minValue // maxValue // nullValue - BIGINT (Long.MIN_VALUE, Long.MAX_VALUE, 0L), - INTEGER (Integer.MIN_VALUE, Integer.MAX_VALUE, 0), - SMALLINT (Short.MIN_VALUE, Short.MAX_VALUE, (short) 0), - TINYINT ((short) 0, (short) 255, (short) 0), - BIT (0, 1, null), - DECIMAL (new BigDecimal("-1.0E38").add(new BigDecimal("1")), new BigDecimal("1.0E38").subtract(new BigDecimal("1")), null), - MONEY (new BigDecimal("-922337203685477.5808"), new BigDecimal("+922337203685477.5807"), null), - SMALLMONEY (new BigDecimal("-214748.3648"), new BigDecimal("214748.3647"), null), - FLOAT (-1.79E308, +1.79E308, 0d), - REAL ((float) -3.4E38, (float) +3.4E38, 0f), - CHAR (null, null, null),// CHAR used by char, nchar, varchar, nvarchar - BINARY (null, null, null), - DATETIME ("17530101T00:00:00.000", "99991231T23:59:59.997", null), - DATE ("00010101", "99991231", null), - TIME ("00:00:00.0000000", "23:59:59.9999999", null), - SMALLDATETIME ("19000101T00:00:00", "20790606T23:59:59", null), - DATETIME2 ("00010101T00:00:00.0000000", "99991231T23:59:59.9999999", null), - DATETIMEOFFSET ("0001-01-01 00:00:00", "9999-12-31 23:59:59", null), - ; - + // minValue // maxValue // nullValue + BIGINT(Long.MIN_VALUE, Long.MAX_VALUE, 0L), + INTEGER(Integer.MIN_VALUE, Integer.MAX_VALUE, 0), + SMALLINT(Short.MIN_VALUE, Short.MAX_VALUE, (short) 0), + TINYINT((short) 0, (short) 255, (short) 0), + BIT(0, 1, null), + DECIMAL(new BigDecimal("-1.0E38").add(new BigDecimal("1")), new BigDecimal("1.0E38").subtract(new BigDecimal("1")), null), + MONEY(new BigDecimal("-922337203685477.5808"), new BigDecimal("+922337203685477.5807"), null), + SMALLMONEY(new BigDecimal("-214748.3648"), new BigDecimal("214748.3647"), null), + FLOAT(-1.79E308, +1.79E308, 0d), + REAL((float) -3.4E38, (float) +3.4E38, 0f), + CHAR(null, null, null),// CHAR used by char, nchar, varchar, nvarchar + BINARY(null, null, null), + DATETIME("17530101T00:00:00.000", "99991231T23:59:59.997", null), + DATE("00010101", "99991231", null), + TIME("00:00:00.0000000", "23:59:59.9999999", null), + SMALLDATETIME("19000101T00:00:00", "20790606T23:59:59", null), + DATETIME2("00010101T00:00:00.0000000", "99991231T23:59:59.9999999", null), + DATETIMEOFFSET("0001-01-01 00:00:00", "9999-12-31 23:59:59", null),; + Object minValue; Object maxValue; Object nullValue; - SqlTypeValue(Object minValue, Object maxValue, Object nullValue) { + SqlTypeValue(Object minValue, + Object maxValue, + Object nullValue) { this.minValue = minValue; this.maxValue = maxValue; this.nullValue = nullValue; From d09ab279c09531e6aae17d8aa8071a306edc21ce Mon Sep 17 00:00:00 2001 From: Peter Bae Date: Mon, 24 Jul 2017 17:14:02 -0700 Subject: [PATCH 3/3] Update SqlTypeValue.java Change the formatting to previous version without the auto formatting --- .../testframework/sqlType/SqlTypeValue.java | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlTypeValue.java b/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlTypeValue.java index f4a594f291..ae2b3345bd 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlTypeValue.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/sqlType/SqlTypeValue.java @@ -16,33 +16,32 @@ * temporal min/max values used are not DATEFORMAT dependent as in https://msdn.microsoft.com/en-us/library/ms180878.aspx */ enum SqlTypeValue { - // minValue // maxValue // nullValue - BIGINT(Long.MIN_VALUE, Long.MAX_VALUE, 0L), - INTEGER(Integer.MIN_VALUE, Integer.MAX_VALUE, 0), - SMALLINT(Short.MIN_VALUE, Short.MAX_VALUE, (short) 0), - TINYINT((short) 0, (short) 255, (short) 0), - BIT(0, 1, null), - DECIMAL(new BigDecimal("-1.0E38").add(new BigDecimal("1")), new BigDecimal("1.0E38").subtract(new BigDecimal("1")), null), - MONEY(new BigDecimal("-922337203685477.5808"), new BigDecimal("+922337203685477.5807"), null), - SMALLMONEY(new BigDecimal("-214748.3648"), new BigDecimal("214748.3647"), null), - FLOAT(-1.79E308, +1.79E308, 0d), - REAL((float) -3.4E38, (float) +3.4E38, 0f), - CHAR(null, null, null),// CHAR used by char, nchar, varchar, nvarchar - BINARY(null, null, null), - DATETIME("17530101T00:00:00.000", "99991231T23:59:59.997", null), - DATE("00010101", "99991231", null), - TIME("00:00:00.0000000", "23:59:59.9999999", null), - SMALLDATETIME("19000101T00:00:00", "20790606T23:59:59", null), - DATETIME2("00010101T00:00:00.0000000", "99991231T23:59:59.9999999", null), - DATETIMEOFFSET("0001-01-01 00:00:00", "9999-12-31 23:59:59", null),; - + // minValue // maxValue // nullValue + BIGINT (Long.MIN_VALUE, Long.MAX_VALUE, 0L), + INTEGER (Integer.MIN_VALUE, Integer.MAX_VALUE, 0), + SMALLINT (Short.MIN_VALUE, Short.MAX_VALUE, (short) 0), + TINYINT ((short) 0, (short) 255, (short) 0), + BIT (0, 1, null), + DECIMAL (new BigDecimal("-1.0E38").add(new BigDecimal("1")), new BigDecimal("1.0E38").subtract(new BigDecimal("1")), null), + MONEY (new BigDecimal("-922337203685477.5808"), new BigDecimal("+922337203685477.5807"), null), + SMALLMONEY (new BigDecimal("-214748.3648"), new BigDecimal("214748.3647"), null), + FLOAT (-1.79E308, +1.79E308, 0d), + REAL ((float) -3.4E38, (float) +3.4E38, 0f), + CHAR (null, null, null),// CHAR used by char, nchar, varchar, nvarchar + BINARY (null, null, null), + DATETIME ("17530101T00:00:00.000", "99991231T23:59:59.997", null), + DATE ("00010101", "99991231", null), + TIME ("00:00:00.0000000", "23:59:59.9999999", null), + SMALLDATETIME ("19000101T00:00:00", "20790606T23:59:59", null), + DATETIME2 ("00010101T00:00:00.0000000", "99991231T23:59:59.9999999", null), + DATETIMEOFFSET ("0001-01-01 00:00:00", "9999-12-31 23:59:59", null), + ; + Object minValue; Object maxValue; Object nullValue; - SqlTypeValue(Object minValue, - Object maxValue, - Object nullValue) { + SqlTypeValue(Object minValue, Object maxValue, Object nullValue) { this.minValue = minValue; this.maxValue = maxValue; this.nullValue = nullValue;