Skip to content

Commit ea0b557

Browse files
deps: update dependency com.google.cloud:sdk-platform-java-config to v3.46.0 (#1992)
* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.46.0 * chore: reformat code --------- Co-authored-by: Knut Olav Løite <[email protected]>
1 parent 9489fa0 commit ea0b557

File tree

10 files changed

+14
-22
lines changed

10 files changed

+14
-22
lines changed

.github/workflows/unmanaged_dependency_check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ jobs:
1414
shell: bash
1515
run: .kokoro/build.sh
1616
- name: Unmanaged dependency check
17-
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.45.1
17+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.46.0
1818
with:
1919
bom-path: pom.xml

.kokoro/presubmit/graalvm-native-17.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.45.1"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.0"
77
}
88

99
env_vars: {

.kokoro/presubmit/graalvm-native.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.45.1"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.0"
77
}
88

99
env_vars: {

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>com.google.cloud</groupId>
1616
<artifactId>sdk-platform-java-config</artifactId>
17-
<version>3.45.1</version>
17+
<version>3.46.0</version>
1818
</parent>
1919
<developers>
2020
<developer>

samples/quickperf/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>com.google.cloud</groupId>
1414
<artifactId>sdk-platform-java-config</artifactId>
15-
<version>3.45.1</version>
15+
<version>3.46.0</version>
1616
<relativePath/>
1717
</parent>
1818

samples/snippets/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>com.google.cloud</groupId>
1111
<artifactId>sdk-platform-java-config</artifactId>
12-
<version>3.45.1</version>
12+
<version>3.46.0</version>
1313
<relativePath/>
1414
</parent>
1515

src/main/java/com/google/cloud/spanner/jdbc/JdbcStatement.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,15 +201,13 @@ Statement addReturningToStatement(Statement statement, ImmutableList<String> gen
201201
if (generatedKeysColumns.size() == 1
202202
&& ALL_COLUMNS.get(0).equals(generatedKeysColumns.get(0))) {
203203
// Add a 'THEN RETURN/RETURNING *' clause to the statement.
204-
return statement
205-
.toBuilder()
204+
return statement.toBuilder()
206205
.replace(statement.getSql() + getReturningAllColumnsClause())
207206
.build();
208207
}
209208
// Add a 'THEN RETURN/RETURNING col1, col2, ...' to the statement.
210209
// The column names will be quoted using the dialect-specific identifier quoting character.
211-
return statement
212-
.toBuilder()
210+
return statement.toBuilder()
213211
.replace(
214212
generatedKeysColumns.stream()
215213
.map(this::quoteColumn)

src/test/java/com/google/cloud/spanner/jdbc/AllTypesMockServerTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,7 @@ public void testInsertAllTypes() {
144144
if (dialect == Dialect.POSTGRESQL) {
145145
Statement insertStatement = createInsertStatement(dialect);
146146
insertStatement =
147-
insertStatement
148-
.toBuilder()
147+
insertStatement.toBuilder()
149148
.replace(insertStatement.getSql().replaceAll("@p", "\\$"))
150149
.bind("p16")
151150
.to(

src/test/java/com/google/cloud/spanner/jdbc/ExecuteMockServerTest.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,22 +176,19 @@ public void setupResults() {
176176
mockSpanner.putStatementResult(
177177
StatementResult.query(
178178
com.google.cloud.spanner.Statement.of(dmlReturning),
179-
resultSet
180-
.toBuilder()
179+
resultSet.toBuilder()
181180
.setStats(ResultSetStats.newBuilder().setRowCountExact(1L).build())
182181
.build()));
183182
mockSpanner.putStatementResult(
184183
StatementResult.query(
185184
com.google.cloud.spanner.Statement.of(DML_THEN_RETURN_ID),
186-
returnIdResultSet
187-
.toBuilder()
185+
returnIdResultSet.toBuilder()
188186
.setStats(ResultSetStats.newBuilder().setRowCountExact(1L).build())
189187
.build()));
190188
mockSpanner.putStatementResult(
191189
StatementResult.query(
192190
com.google.cloud.spanner.Statement.of(LARGE_DML_THEN_RETURN_ID),
193-
returnIdResultSet
194-
.toBuilder()
191+
returnIdResultSet.toBuilder()
195192
.setStats(
196193
ResultSetStats.newBuilder().setRowCountExact(LARGE_UPDATE_COUNT).build())
197194
.build()));

src/test/java/com/google/cloud/spanner/jdbc/MultiplexedSessionsTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,13 @@ public void setupResults() {
167167
mockSpanner.putStatementResult(
168168
StatementResult.query(
169169
com.google.cloud.spanner.Statement.of(dmlReturning),
170-
resultSet
171-
.toBuilder()
170+
resultSet.toBuilder()
172171
.setStats(ResultSetStats.newBuilder().setRowCountExact(1L).build())
173172
.build()));
174173
mockSpanner.putStatementResult(
175174
StatementResult.query(
176175
com.google.cloud.spanner.Statement.of(DML_THEN_RETURN_ID),
177-
returnIdResultSet
178-
.toBuilder()
176+
returnIdResultSet.toBuilder()
179177
.setStats(ResultSetStats.newBuilder().setRowCountExact(1L).build())
180178
.build()));
181179
}

0 commit comments

Comments
 (0)