googleapis · gcf-merge-on-green · Nov 1, 2021 · Oct 7, 2021 · Aug 24, 2021 · Oct 19, 2021
@@ -170,7 +170,7 @@ public SQLXML createSQLXML() throws SQLException {
 
   @Override
   public void setClientInfo(String name, String value) throws SQLClientInfoException {
-    Properties supported = null;
+    Properties supported;
     try {
       checkClosed();
       supported = JdbcDatabaseMetaData.getDefaultClientInfoProperties();
@@ -255,10 +255,9 @@ public int getNetworkTimeout() throws SQLException {
   void pushWarning(SQLWarning warning) {
     if (lastWarning == null) {
       firstWarning = warning;
-      lastWarning = warning;
     } else {
       lastWarning.setNextWarning(warning);
-      lastWarning = warning;
     }
+    lastWarning = warning;
   }
 }
@@ -47,12 +47,12 @@ abstract class AbstractJdbcResultSet extends AbstractJdbcWrapper implements Resu
   }
 
   @Override
-  public SQLWarning getWarnings() throws SQLException {
+  public SQLWarning getWarnings() {
     return null;
   }
 
   @Override
-  public void clearWarnings() throws SQLException {}
+  public void clearWarnings() {}
 
   @Override
   public String getCursorName() throws SQLException {
@@ -105,42 +105,42 @@ public void setFetchDirection(int direction) throws SQLException {
   }
 
   @Override
-  public int getFetchDirection() throws SQLException {
+  public int getFetchDirection() {
     return FETCH_FORWARD;
   }
 
   @Override
-  public void setFetchSize(int rows) throws SQLException {
+  public void setFetchSize(int rows) {
     this.fetchSize = rows;
   }
 
   @Override
-  public int getFetchSize() throws SQLException {
+  public int getFetchSize() {
     return fetchSize;
   }
 
   @Override
-  public int getType() throws SQLException {
+  public int getType() {
     return TYPE_FORWARD_ONLY;
   }
 
   @Override
-  public int getConcurrency() throws SQLException {
+  public int getConcurrency() {
     return CONCUR_READ_ONLY;
   }
 
   @Override
-  public boolean rowUpdated() throws SQLException {
+  public boolean rowUpdated() {
     return false;
   }
 
   @Override
-  public boolean rowInserted() throws SQLException {
+  public boolean rowInserted() {
     return false;
   }
 
   @Override
-  public boolean rowDeleted() throws SQLException {
+  public boolean rowDeleted() {
     return false;
   }
 

@@ -20,6 +20,7 @@
 import com.google.cloud.spanner.Options.QueryOption;
 import com.google.cloud.spanner.ReadContext.QueryAnalyzeMode;
 import com.google.cloud.spanner.SpannerException;
+import com.google.cloud.spanner.connection.Connection;
 import com.google.cloud.spanner.connection.StatementResult;
 import com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType;
 import com.google.rpc.Code;
@@ -252,7 +253,7 @@ StatementResult execute(com.google.cloud.spanner.Statement statement) throws SQL
       if (mustResetTimeout && resultIsShowStatementTimeout(result)) {
         // it was a 'SHOW STATEMENT_TIMEOUT statement, we need to re-run to get the correct value
         mustResetTimeout = false;
-        result = rerunShowStatementTimeout(statement, result, originalTimeout);
+        result = rerunShowStatementTimeout(statement, originalTimeout);
       }
       return result;
     } catch (SpannerException e) {
@@ -292,9 +293,7 @@ private boolean resultIsShowStatementTimeout(StatementResult result) {
   }
 
   private StatementResult rerunShowStatementTimeout(
-      com.google.cloud.spanner.Statement statement,
-      StatementResult result,
-      StatementTimeout originalTimeout)
+      com.google.cloud.spanner.Statement statement, StatementTimeout originalTimeout)
       throws SQLException {
     resetStatementTimeout(originalTimeout);
     return connection.getSpannerConnection().execute(statement);
@@ -319,12 +318,12 @@ public void cancel() throws SQLException {
   }
 
   @Override
-  public void close() throws SQLException {
+  public void close() {
     this.closed = true;
   }
 
   @Override
-  public boolean isClosed() throws SQLException {
+  public boolean isClosed() {
     return closed;
   }
 
@@ -414,22 +413,22 @@ public void setFetchDirection(int direction) throws SQLException {
   }
 
   @Override
-  public int getFetchDirection() throws SQLException {
+  public int getFetchDirection() {
     return ResultSet.FETCH_FORWARD;
   }
 
   @Override
-  public int getResultSetConcurrency() throws SQLException {
+  public int getResultSetConcurrency() {
     return ResultSet.CONCUR_READ_ONLY;
   }
 
   @Override
-  public int getResultSetType() throws SQLException {
+  public int getResultSetType() {
     return ResultSet.TYPE_FORWARD_ONLY;
   }
 
   @Override
-  public int getResultSetHoldability() throws SQLException {
+  public int getResultSetHoldability() {
     return ResultSet.CLOSE_CURSORS_AT_COMMIT;
   }
 }
@@ -199,7 +199,7 @@ static float checkedCastToFloat(double val) throws SQLException {
   static long parseLong(String val) throws SQLException {
     Preconditions.checkNotNull(val);
     try {
-      return Long.valueOf(val);
+      return Long.parseLong(val);
     } catch (NumberFormatException e) {
       throw JdbcSqlExceptionFactory.of(
           String.format("%s is not a valid number", val), com.google.rpc.Code.INVALID_ARGUMENT, e);
@@ -233,7 +233,7 @@ static long checkedCastToLong(BigDecimal val) throws SQLException {
   static double parseDouble(String val) throws SQLException {
     Preconditions.checkNotNull(val);
     try {
-      return Double.valueOf(val);
+      return Double.parseDouble(val);
     } catch (NumberFormatException e) {
       throw JdbcSqlExceptionFactory.of(
           String.format("%s is not a valid number", val), com.google.rpc.Code.INVALID_ARGUMENT, e);
@@ -333,7 +333,7 @@ static Timestamp parseTimestamp(String val, Calendar cal) throws SQLException {
   }
 
   /** Should return true if this object has been closed */
-  public abstract boolean isClosed() throws SQLException;
+  public abstract boolean isClosed();
 
   /** Throws a {@link SQLException} if this object is closed */
   void checkClosed() throws SQLException {
@@ -354,7 +354,7 @@ <T> T checkClosedAndThrowUnsupported(String message) throws SQLException {
   }
 
   @Override
-  public boolean isWrapperFor(Class<?> iface) throws SQLException {
+  public boolean isWrapperFor(Class<?> iface) {
     return iface != null && iface.isAssignableFrom(getClass());
   }
 

@@ -16,6 +16,7 @@
 
 package com.google.cloud.spanner.jdbc;
 
+import com.google.cloud.spanner.AbortedDueToConcurrentModificationException;
 import com.google.cloud.spanner.AbortedException;
 import com.google.cloud.spanner.CommitResponse;
 import com.google.cloud.spanner.CommitStats;
@@ -53,12 +54,12 @@ public interface CloudSpannerJdbcConnection extends Connection {
    */
   default void setTransactionTag(String tag) throws SQLException {
     throw new UnsupportedOperationException();
-  };
+  }
 
   /** @return The transaction tag of the current transaction. */
   default String getTransactionTag() throws SQLException {
     throw new UnsupportedOperationException();
-  };
+  }
 
   /**
    * Sets the statement tag to use for the next statement that will be executed. The tag is
@@ -70,15 +71,15 @@ default String getTransactionTag() throws SQLException {
    */
   default void setStatementTag(String tag) throws SQLException {
     throw new UnsupportedOperationException();
-  };
+  }
 
   /**
    * @return The statement tag that will be used with the next statement that is executed on this
    *     connection.
    */
   default String getStatementTag() throws SQLException {
     throw new UnsupportedOperationException();
-  };
+  }
 
   /**
    * Sets the transaction mode to use for current transaction. This method may only be called when
@@ -96,10 +97,10 @@ default String getStatementTag() throws SQLException {
    *           not acquire locks on Cloud Spanner, and read-only transactions never abort.
    *       <li>{@link TransactionMode#READ_WRITE_TRANSACTION} this value is only allowed when the
    *           connection is not in read-only mode and will create a read-write transaction. If
-   *           {@link Connection#isRetryAbortsInternally()} is <code>true</code>, each read/write
-   *           transaction will keep track of a running SHA256 checksum for each {@link ResultSet}
-   *           that is returned in order to be able to retry the transaction in case the transaction
-   *           is aborted by Spanner.
+   *           {@link CloudSpannerJdbcConnection#isRetryAbortsInternally()} is <code>true</code>,
+   *           each read/write transaction will keep track of a running SHA256 checksum for each
+   *           {@link ResultSet} that is returned in order to be able to retry the transaction in
+   *           case the transaction is aborted by Spanner.
    *     </ul>
    */
   void setTransactionMode(TransactionMode transactionMode) throws SQLException;
@@ -175,9 +176,8 @@ default String getStatementTag() throws SQLException {
   /**
    * @return <code>true</code> if this connection has a transaction (that has not necessarily
    *     started). This method will only return false when the {@link Connection} is in autocommit
-   *     mode and no explicit transaction has been started by calling {@link
-   *     Connection#beginTransaction()}. If the {@link Connection} is not in autocommit mode, there
-   *     will always be a transaction.
+   *     mode and no explicit transaction has been started by executing `BEGIN TRANSACTION`. If the
+   *     {@link Connection} is not in autocommit mode, there will always be a transaction.
    */
   boolean isInTransaction() throws SQLException;
 
@@ -323,37 +323,39 @@ default String getStatementTag() throws SQLException {
 
   /**
    * @see
-   *     com.google.cloud.spanner.connection.Connection#addTransactionRetryListener(TransactionRetryListener)
+   *     com.google.cloud.spanner.connection.Connection#addTransactionRetryListener(com.google.cloud.spanner.connection.TransactionRetryListener)
    * @throws SQLException if the {@link Connection} is closed.
    */
   void addTransactionRetryListener(
       com.google.cloud.spanner.connection.TransactionRetryListener listener) throws SQLException;
 
   /**
    * Use {@link
-   * #addTransactionRetryListener(com.google.cloud.spanner.jdbc.TransactionRetryListener)}
+   * #addTransactionRetryListener(com.google.cloud.spanner.connection.TransactionRetryListener)}
+   * instead.
    */
   @Deprecated
   void addTransactionRetryListener(com.google.cloud.spanner.jdbc.TransactionRetryListener listener)
       throws SQLException;
 
   /**
    * @see
-   *     com.google.cloud.spanner.connection.Connection#removeTransactionRetryListener(TransactionRetryListener)
+   *     com.google.cloud.spanner.connection.Connection#removeTransactionRetryListener(com.google.cloud.spanner.connection.TransactionRetryListener)
    * @throws SQLException if the {@link Connection} is closed.
    */
   boolean removeTransactionRetryListener(
       com.google.cloud.spanner.connection.TransactionRetryListener listener) throws SQLException;
 
   /**
    * Use {@link
-   * #removeTransactionRetryListener(com.google.cloud.spanner.jdbc.TransactionRetryListener)}
+   * #removeTransactionRetryListener(com.google.cloud.spanner.connection.TransactionRetryListener)}
+   * instead.
    */
   @Deprecated
   boolean removeTransactionRetryListener(
       com.google.cloud.spanner.jdbc.TransactionRetryListener listener) throws SQLException;
 
-  /** Use {@link #getTransactionRetryListenersFromConnection()} */
+  /** Use {@link #getTransactionRetryListenersFromConnection()} instead. */
   @Deprecated
   Iterator<com.google.cloud.spanner.jdbc.TransactionRetryListener> getTransactionRetryListeners()
       throws SQLException;

@@ -67,13 +67,11 @@ static JdbcArray createArray(String typeName, Object[] elements) throws SQLExcep
   /**
    * Create a JDBC {@link Array} from the given type name and list.
    *
-   * @param typeName The Google Cloud Spanner type name to be used as the base type of the array.
+   * @param type The Google Cloud Spanner type to be used as the base type of the array.
    * @param elements The elements to store in the array.
    * @return the initialized {@link Array}.
-   * @throws SQLException if the type name is not a valid Cloud Spanner type or if the contents of
-   *     the elements array is not compatible with the base type of the array.
    */
-  static JdbcArray createArray(JdbcDataType type, List<? extends Object> elements) {
+  static JdbcArray createArray(JdbcDataType type, List<?> elements) {
     return new JdbcArray(type, elements);
   }
 
@@ -93,7 +91,7 @@ private JdbcArray(JdbcDataType type, Object[] elements) throws SQLException {
     }
   }
 
-  private JdbcArray(JdbcDataType type, List<? extends Object> elements) {
+  private JdbcArray(JdbcDataType type, List<?> elements) {
     this.type = type;
     if (elements != null) {
       this.data = java.lang.reflect.Array.newInstance(type.getJavaClass(), elements.size());
@@ -179,7 +177,7 @@ public ResultSet getResultSet(long startIndex, int count) throws SQLException {
         Object value = ((Object[]) data)[index - 1];
         ValueBinder<Struct.Builder> binder =
             Struct.newBuilder().set("INDEX").to(index).set("VALUE");
-        Struct.Builder builder = null;
+        Struct.Builder builder;
         switch (type.getCode()) {
           case BOOL:
             builder = binder.to((Boolean) value);
@@ -237,7 +235,7 @@ public ResultSet getResultSet(long index, int count, Map<String, Class<?>> map)
   }
 
   @Override
-  public void free() throws SQLException {
+  public void free() {
     this.freed = true;
     this.data = null;
   }
@@ -257,7 +255,7 @@ public String toString() {
       if (o == null) {
         builder.append("null");
       } else {
-        builder.append(o.toString());
+        builder.append(o);
       }
     }
     builder.append("}");