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 <[email protected]> Co-authored-by: Lawrence Qiu <[email protected]>
googleapis · Aug 6, 2024 · 93f66a7 · 93f66a7
1 parent ec7b322
commit 93f66a7
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 13 deletions.
diff --git 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.32.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.33.0
       with:
         bom-path: google-cloud-bigtable-bom/pom.xml
diff --git 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.32.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.33.0"
 }
 
 env_vars: {

diff --git 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.32.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.33.0"
 }
 
 env_vars: {

diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>sdk-platform-java-config</artifactId>
-        <version>3.32.0</version>
+        <version>3.33.0</version>
         <relativePath/>
     </parent>
 

diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
-    <version>3.32.0</version>
+    <version>3.33.0</version>
     <relativePath/>
   </parent>
 
@@ -66,7 +66,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>gapic-libraries-bom</artifactId>
-        <version>1.40.0</version>
+        <version>1.41.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/...e/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettingsTest.java b/...e/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettingsTest.java
@@ -144,7 +144,7 @@ public void testToString() throws IOException {
     BigtableInstanceAdminSettings settings = builder.build();
     checkToString(settings);
     assertThat(settings.toString()).contains("endpoint=example.com:1234");
-    assertThat(settings.toString()).contains("totalTimeout=PT13H32M");
+    assertThat(settings.toString()).contains("totalTimeoutDuration=PT13H32M");
   }
 
   void checkToString(BigtableInstanceAdminSettings settings) {

diff --git a/...able/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettingsTest.java b/...able/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettingsTest.java
@@ -171,8 +171,8 @@ public void testToString() throws IOException {
     checkToString(settings);
     assertThat(defaultSettings.toString()).doesNotContain("endpoint=example.com:1234");
     assertThat(settings.toString()).contains("endpoint=example.com:1234");
-    assertThat(defaultSettings.toString()).doesNotContain("totalTimeout=PT13H32M");
-    assertThat(settings.toString()).contains("totalTimeout=PT13H32M");
+    assertThat(defaultSettings.toString()).doesNotContain("totalTimeoutDuration=PT13H32M");
+    assertThat(settings.toString()).contains("totalTimeoutDuration=PT13H32M");
 
     List<String> nonStaticFields =
         Arrays.stream(BigtableTableAdminStubSettings.class.getDeclaredFields())

diff --git a/...rc/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsTracerTest.java b/...rc/test/java/com/google/cloud/bigtable/data/v2/stub/metrics/BuiltinMetricsTracerTest.java
@@ -113,7 +113,6 @@
 import org.junit.runners.JUnit4;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
-import org.threeten.bp.Duration;
 
 @RunWith(JUnit4.class)
 public class BuiltinMetricsTracerTest {
@@ -232,7 +231,7 @@ public void sendMessage(ReqT message) {
     stubSettingsBuilder
         .mutateRowSettings()
         .retrySettings()
-        .setInitialRetryDelay(Duration.ofMillis(200));
+        .setInitialRetryDelayDuration(java.time.Duration.ofMillis(200));
 
     stubSettingsBuilder
         .bulkMutateRowsSettings()
@@ -242,7 +241,7 @@ public void sendMessage(ReqT message) {
             BatchingSettings.newBuilder()
                 .setElementCountThreshold((long) batchElementCount)
                 .setRequestByteThreshold(1000L)
-                .setDelayThreshold(Duration.ofHours(1))
+                .setDelayThresholdDuration(java.time.Duration.ofHours(1))
                 .setFlowControlSettings(
                     FlowControlSettings.newBuilder()
                         .setMaxOutstandingElementCount((long) batchElementCount + 1)

diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>sdk-platform-java-config</artifactId>
-        <version>3.32.0</version>
+        <version>3.33.0</version>
         <relativePath/>
     </parent>