Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 93f66a7

Browse files
diegomarquezpgcf-owl-bot[bot]renovate-botlqiu96
authoredAug 6, 2024
fix: adapt toString tests to introduction of java.time in gax (#2274)
* fix: adapt `toString` tests to introduction of java.time in gax * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * deps: update shared dependencies --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Mend Renovate <bot@renovateapp.com> Co-authored-by: Lawrence Qiu <lawrenceqiu@google.com>
1 parent ec7b322 commit 93f66a7

File tree

9 files changed

+12
-13
lines changed

9 files changed

+12
-13
lines changed
 

‎.github/workflows/unmanaged_dependency_check.yaml

+1-1
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.32.0
17+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.33.0
1818
with:
1919
bom-path: google-cloud-bigtable-bom/pom.xml

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

+1-1
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.32.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.33.0"
77
}
88

99
env_vars: {

‎.kokoro/presubmit/graalvm-native.cfg

+1-1
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.32.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.33.0"
77
}
88

99
env_vars: {

‎google-cloud-bigtable-bom/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.google.cloud</groupId>
1010
<artifactId>sdk-platform-java-config</artifactId>
11-
<version>3.32.0</version>
11+
<version>3.33.0</version>
1212
<relativePath/>
1313
</parent>
1414

‎google-cloud-bigtable-deps-bom/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.google.cloud</groupId>
99
<artifactId>sdk-platform-java-config</artifactId>
10-
<version>3.32.0</version>
10+
<version>3.33.0</version>
1111
<relativePath/>
1212
</parent>
1313

@@ -66,7 +66,7 @@
6666
<dependency>
6767
<groupId>com.google.cloud</groupId>
6868
<artifactId>gapic-libraries-bom</artifactId>
69-
<version>1.40.0</version>
69+
<version>1.41.0</version>
7070
<type>pom</type>
7171
<scope>import</scope>
7272
</dependency>

‎google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettingsTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public void testToString() throws IOException {
144144
BigtableInstanceAdminSettings settings = builder.build();
145145
checkToString(settings);
146146
assertThat(settings.toString()).contains("endpoint=example.com:1234");
147-
assertThat(settings.toString()).contains("totalTimeout=PT13H32M");
147+
assertThat(settings.toString()).contains("totalTimeoutDuration=PT13H32M");
148148
}
149149

150150
void checkToString(BigtableInstanceAdminSettings settings) {

‎google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettingsTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,8 @@ public void testToString() throws IOException {
171171
checkToString(settings);
172172
assertThat(defaultSettings.toString()).doesNotContain("endpoint=example.com:1234");
173173
assertThat(settings.toString()).contains("endpoint=example.com:1234");
174-
assertThat(defaultSettings.toString()).doesNotContain("totalTimeout=PT13H32M");
175-
assertThat(settings.toString()).contains("totalTimeout=PT13H32M");
174+
assertThat(defaultSettings.toString()).doesNotContain("totalTimeoutDuration=PT13H32M");
175+
assertThat(settings.toString()).contains("totalTimeoutDuration=PT13H32M");
176176

177177
List<String> nonStaticFields =
178178
Arrays.stream(BigtableTableAdminStubSettings.class.getDeclaredFields())

‎google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsTracerTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@
113113
import org.junit.runners.JUnit4;
114114
import org.mockito.junit.MockitoJUnit;
115115
import org.mockito.junit.MockitoRule;
116-
import org.threeten.bp.Duration;
117116

118117
@RunWith(JUnit4.class)
119118
public class BuiltinMetricsTracerTest {
@@ -232,7 +231,7 @@ public void sendMessage(ReqT message) {
232231
stubSettingsBuilder
233232
.mutateRowSettings()
234233
.retrySettings()
235-
.setInitialRetryDelay(Duration.ofMillis(200));
234+
.setInitialRetryDelayDuration(java.time.Duration.ofMillis(200));
236235

237236
stubSettingsBuilder
238237
.bulkMutateRowsSettings()
@@ -242,7 +241,7 @@ public void sendMessage(ReqT message) {
242241
BatchingSettings.newBuilder()
243242
.setElementCountThreshold((long) batchElementCount)
244243
.setRequestByteThreshold(1000L)
245-
.setDelayThreshold(Duration.ofHours(1))
244+
.setDelayThresholdDuration(java.time.Duration.ofHours(1))
246245
.setFlowControlSettings(
247246
FlowControlSettings.newBuilder()
248247
.setMaxOutstandingElementCount((long) batchElementCount + 1)

‎pom.xml

+1-1
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.32.0</version>
17+
<version>3.33.0</version>
1818
<relativePath/>
1919
</parent>
2020

0 commit comments

Comments
 (0)
Failed to load comments.