From 0deeff698bb231fede4403bc53897823bf95d70a Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Fri, 1 Sep 2017 11:13:16 +0000 Subject: [PATCH] Simplify overly complex boolean expressions |Example|Replacement| |-|-| |`condition ? true : false`|`condition`| |`condition ? false : true`|`!condition`| |`value == null ? null : value`|`value`| |`result != 0 ? result : 0`|`result`| |`a == b ? a : b`|`b`| --- src/main/java/com/microsoft/sqlserver/jdbc/AE.java | 2 +- src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java | 2 +- src/main/java/com/microsoft/sqlserver/jdbc/Parameter.java | 2 +- .../java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java | 4 ++-- .../com/microsoft/sqlserver/jdbc/SQLServerConnection.java | 4 ++-- .../java/com/microsoft/sqlserver/jdbc/SQLServerDataTable.java | 2 +- src/main/java/com/microsoft/sqlserver/jdbc/dtv.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/AE.java b/src/main/java/com/microsoft/sqlserver/jdbc/AE.java index c6345d25b..fbe618d28 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/AE.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/AE.java @@ -237,7 +237,7 @@ short getOrdinal() { } boolean IsAlgorithmInitialized() { - return (null != cipherAlgorithm) ? true : false; + return null != cipherAlgorithm; } } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java b/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java index e70f04bbf..a80eb09ff 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java @@ -4996,7 +4996,7 @@ else if (DataTypes.UNKNOWN_STREAM_LENGTH == dataLength) } break; case SQL_VARIANT: - boolean isShiloh = (8 >= con.getServerMajorVersion() ? true : false); + boolean isShiloh = (8 >= con.getServerMajorVersion()); if (isShiloh) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_SQLVariantSupport")); throw new SQLServerException(null, form.format(new Object[] {}), null, 0, false); diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/Parameter.java b/src/main/java/com/microsoft/sqlserver/jdbc/Parameter.java index afb71cd7f..961e12173 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/Parameter.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/Parameter.java @@ -397,7 +397,7 @@ boolean isNull() { } boolean isValueGotten() { - return (null != getterDTV) ? (true) : (false); + return null != getterDTV; } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java index 3076c9017..d65ca11b9 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java @@ -1801,7 +1801,7 @@ private void getSourceMetadata() throws SQLServerException { for (int i = 1; i <= srcColumnCount; ++i) { srcColumnMetadata.put(i, new BulkColumnMetaData(sourceResultSetMetaData.getColumnName(i), - ((ResultSetMetaData.columnNoNulls == sourceResultSetMetaData.isNullable(i)) ? false : true), + (ResultSetMetaData.columnNoNulls != sourceResultSetMetaData.isNullable(i)), sourceResultSetMetaData.getPrecision(i), sourceResultSetMetaData.getScale(i), sourceResultSetMetaData.getColumnType(i), null)); } @@ -2518,7 +2518,7 @@ else if (4 >= bulkScale) } break; case microsoft.sql.Types.SQL_VARIANT: - boolean isShiloh = (8 >= connection.getServerMajorVersion() ? true : false); + boolean isShiloh = (8 >= connection.getServerMajorVersion()); if (isShiloh) { MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_SQLVariantSupport")); throw new SQLServerException(null, form.format(new Object[] {}), null, 0, false); diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java index 487c99c38..659dcff84 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java @@ -1788,7 +1788,7 @@ private void login(String primary, long timerStart) throws SQLServerException { // standardLogin would be false only for db mirroring scenarios. It would be true // for all other cases, including multiSubnetFailover - final boolean isDBMirroring = (null == mirror && null == foActual) ? false : true; + final boolean isDBMirroring = null != mirror || null != foActual; int sleepInterval = 100; // milliseconds to sleep (back off) between attempts. long timeoutUnitInterval; @@ -2592,7 +2592,7 @@ void Prelogin(String serverName, // Or AccessToken is not null, mean token based authentication is used. if (((null != authenticationString) && (!authenticationString.equalsIgnoreCase(SqlAuthentication.NotSpecified.toString()))) || (null != accessTokenInByte)) { - fedAuthRequiredPreLoginResponse = (preloginResponse[optionOffset] == 1 ? true : false); + fedAuthRequiredPreLoginResponse = (preloginResponse[optionOffset] == 1); } break; diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataTable.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataTable.java index 53284f372..340db2de3 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataTable.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataTable.java @@ -118,7 +118,7 @@ public synchronized void addRow(Object... values) throws SQLServerException { Object val = null; if ((null != values) && (currentColumn < values.length) && (null != values[currentColumn])) - val = (null == values[currentColumn]) ? null : values[currentColumn]; + val = values[currentColumn]; currentColumn++; Map.Entry pair = columnsIterator.next(); JDBCType jdbcType = JDBCType.of(pair.getValue().javaSqlType); diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java b/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java index 5030c22c9..5303ced03 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java @@ -1213,7 +1213,7 @@ void writeEncryptData(DTV dtv, // the default length for decimal value } - tdsWriter.writeByte((byte) ((0 != outScale) ? outScale : 0)); // send scale + tdsWriter.writeByte((byte) (outScale)); // send scale } else { tdsWriter.writeByte((byte) 0x11); // maximum length