diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 6b4a8e5c5..fdc1fa6a6 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -14,6 +14,6 @@ jobs: shell: bash run: .kokoro/build.sh - name: Unmanaged dependency check - uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.45.1 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.46.0 with: bom-path: pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index 07ae08a98..ed336a5a8 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.45.1" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index fb1979a33..4477760a6 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.45.1" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.0" } env_vars: { diff --git a/pom.xml b/pom.xml index 78173b914..eaf6acd0f 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.45.1 + 3.46.0 diff --git a/samples/quickperf/pom.xml b/samples/quickperf/pom.xml index 5e35b6317..49ad5f842 100644 --- a/samples/quickperf/pom.xml +++ b/samples/quickperf/pom.xml @@ -12,7 +12,7 @@ com.google.cloud sdk-platform-java-config - 3.45.1 + 3.46.0 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index e1919e95b..082c1993e 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -9,7 +9,7 @@ com.google.cloud sdk-platform-java-config - 3.45.1 + 3.46.0 diff --git a/src/main/java/com/google/cloud/spanner/jdbc/JdbcStatement.java b/src/main/java/com/google/cloud/spanner/jdbc/JdbcStatement.java index 5d8dfd9ee..0a764b351 100644 --- a/src/main/java/com/google/cloud/spanner/jdbc/JdbcStatement.java +++ b/src/main/java/com/google/cloud/spanner/jdbc/JdbcStatement.java @@ -201,15 +201,13 @@ Statement addReturningToStatement(Statement statement, ImmutableList gen if (generatedKeysColumns.size() == 1 && ALL_COLUMNS.get(0).equals(generatedKeysColumns.get(0))) { // Add a 'THEN RETURN/RETURNING *' clause to the statement. - return statement - .toBuilder() + return statement.toBuilder() .replace(statement.getSql() + getReturningAllColumnsClause()) .build(); } // Add a 'THEN RETURN/RETURNING col1, col2, ...' to the statement. // The column names will be quoted using the dialect-specific identifier quoting character. - return statement - .toBuilder() + return statement.toBuilder() .replace( generatedKeysColumns.stream() .map(this::quoteColumn) diff --git a/src/test/java/com/google/cloud/spanner/jdbc/AllTypesMockServerTest.java b/src/test/java/com/google/cloud/spanner/jdbc/AllTypesMockServerTest.java index cf4b7dfb5..c38489339 100644 --- a/src/test/java/com/google/cloud/spanner/jdbc/AllTypesMockServerTest.java +++ b/src/test/java/com/google/cloud/spanner/jdbc/AllTypesMockServerTest.java @@ -144,8 +144,7 @@ public void testInsertAllTypes() { if (dialect == Dialect.POSTGRESQL) { Statement insertStatement = createInsertStatement(dialect); insertStatement = - insertStatement - .toBuilder() + insertStatement.toBuilder() .replace(insertStatement.getSql().replaceAll("@p", "\\$")) .bind("p16") .to( diff --git a/src/test/java/com/google/cloud/spanner/jdbc/ExecuteMockServerTest.java b/src/test/java/com/google/cloud/spanner/jdbc/ExecuteMockServerTest.java index 0da181444..c226bd673 100644 --- a/src/test/java/com/google/cloud/spanner/jdbc/ExecuteMockServerTest.java +++ b/src/test/java/com/google/cloud/spanner/jdbc/ExecuteMockServerTest.java @@ -176,22 +176,19 @@ public void setupResults() { mockSpanner.putStatementResult( StatementResult.query( com.google.cloud.spanner.Statement.of(dmlReturning), - resultSet - .toBuilder() + resultSet.toBuilder() .setStats(ResultSetStats.newBuilder().setRowCountExact(1L).build()) .build())); mockSpanner.putStatementResult( StatementResult.query( com.google.cloud.spanner.Statement.of(DML_THEN_RETURN_ID), - returnIdResultSet - .toBuilder() + returnIdResultSet.toBuilder() .setStats(ResultSetStats.newBuilder().setRowCountExact(1L).build()) .build())); mockSpanner.putStatementResult( StatementResult.query( com.google.cloud.spanner.Statement.of(LARGE_DML_THEN_RETURN_ID), - returnIdResultSet - .toBuilder() + returnIdResultSet.toBuilder() .setStats( ResultSetStats.newBuilder().setRowCountExact(LARGE_UPDATE_COUNT).build()) .build())); diff --git a/src/test/java/com/google/cloud/spanner/jdbc/MultiplexedSessionsTest.java b/src/test/java/com/google/cloud/spanner/jdbc/MultiplexedSessionsTest.java index b7b2d2869..171832414 100644 --- a/src/test/java/com/google/cloud/spanner/jdbc/MultiplexedSessionsTest.java +++ b/src/test/java/com/google/cloud/spanner/jdbc/MultiplexedSessionsTest.java @@ -167,15 +167,13 @@ public void setupResults() { mockSpanner.putStatementResult( StatementResult.query( com.google.cloud.spanner.Statement.of(dmlReturning), - resultSet - .toBuilder() + resultSet.toBuilder() .setStats(ResultSetStats.newBuilder().setRowCountExact(1L).build()) .build())); mockSpanner.putStatementResult( StatementResult.query( com.google.cloud.spanner.Statement.of(DML_THEN_RETURN_ID), - returnIdResultSet - .toBuilder() + returnIdResultSet.toBuilder() .setStats(ResultSetStats.newBuilder().setRowCountExact(1L).build()) .build())); }