Fixed java.time.duration merging conflicts

Author: cindy-peng

google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestGrpc.java

@@ -20,12 +20,12 @@
 import com.google.cloud.grpc.GrpcTransportOptions;
 import com.google.common.truth.Truth;
 import java.io.IOException;
+import java.time.Duration;
 import java.util.Arrays;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import org.threeten.bp.Duration;
 
 @RunWith(Parameterized.class)
 public class DatastoreTestGrpc extends AbstractDatastoreTest {
@@ -56,6 +56,6 @@ public static void beforeClass() throws IOException, InterruptedException {
   public static void afterClass() throws Exception {
     datastore.close();
     Truth.assertThat(datastore.isClosed()).isTrue();
-    helper.stop(Duration.ofMinutes(1));
+    helper.stopDuration(Duration.ofMinutes(1));
   }
 }

google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTestHttp.java

@@ -19,12 +19,12 @@
 import com.google.cloud.datastore.testing.LocalDatastoreHelper;
 import com.google.cloud.grpc.GrpcTransportOptions;
 import java.io.IOException;
+import java.time.Duration;
 import java.util.Arrays;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import org.threeten.bp.Duration;
 
 @RunWith(Parameterized.class)
 public class DatastoreTestHttp extends AbstractDatastoreTest {
@@ -52,6 +52,6 @@ public static void beforeClass() throws IOException, InterruptedException {
 
   @AfterClass
   public static void afterClass() throws Exception {
-    helper.stop(Duration.ofMinutes(1));
+    helper.stopDuration(Duration.ofMinutes(1));
   }
 }

google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/AbstractITDatastoreTest.java

@@ -85,6 +85,7 @@
 import com.google.common.truth.Truth;
 import com.google.datastore.v1.TransactionOptions;
 import com.google.datastore.v1.TransactionOptions.ReadOnly;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -105,7 +106,6 @@
 import org.junit.rules.Timeout;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import org.threeten.bp.Duration;
 
 @RunWith(Parameterized.class)
 public abstract class AbstractITDatastoreTest {
@@ -649,7 +649,7 @@ private void assertExecutionStats(
     Truth.assertThat(debugStats.get("index_entries_scanned"))
         .isEqualTo(expectedIndexEntriesScanned);
 
-    Duration executionDuration = executionStats.getExecutionDuration();
+    Duration executionDuration = executionStats.getExecutionDurationJavaTime();
     Truth.assertThat(executionDuration).isIn(Range.greaterThan(Duration.ofMillis(0)));
 
     long readOperations = executionStats.getReadOperations();

google-cloud-datastore/src/test/java/com/google/cloud/datastore/spi/v1/RpcUtilsTest.java

@@ -22,7 +22,7 @@
 import com.google.api.gax.rpc.UnaryCallSettings;
 import com.google.cloud.datastore.DatastoreOptions;
 import org.junit.Test;
-import org.threeten.bp.Duration;
+import java.time.Duration;
 
 public class RpcUtilsTest {
 
@@ -40,9 +40,9 @@ public void testRetrySettingSetter() {
     // datastoreOptions with custom retry settings
     RetrySettings customRetrySettings =
         RetrySettings.newBuilder()
-            .setTotalTimeout(Duration.ofMinutes(2))
-            .setInitialRpcTimeout(Duration.ofSeconds(5))
-            .setMaxRpcTimeout(Duration.ofSeconds(10))
+            .setTotalTimeoutDuraion(Duration.ofMinutes(2))
+            .setInitialRpcTimeoutDuraion(Duration.ofSeconds(5))
+            .setMaxRpcTimeoutDuraion(Duration.ofSeconds(10))
             .setRetryDelayMultiplier(1.5)
             .setMaxAttempts(5)
             .build();

google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java

@@ -29,9 +29,9 @@
 import com.google.cloud.grpc.GrpcTransportOptions;
 import com.google.cloud.http.HttpTransportOptions;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
+import java.time.Duration;
 import java.util.UUID;
 import javax.annotation.Nullable;
-import org.threeten.bp.Duration;
 
 /**
  * Utility to create a remote datastore configuration for testing. Datastore options can be obtained