reset java-core and showcase to main

Author: diegomarquezp

java-core/google-cloud-core/clirr-ignored-differences.xml

@@ -12,10 +12,4 @@
         <className>com/google/cloud/ReadChannel</className>
         <method>long limit()</method>
     </difference>
-    <difference>
-        <differenceType>7005</differenceType>
-        <className>com/google/cloud/testing/*</className>
-        <method>* *(org.threeten.bp.Duration)</method>
-        <to>*</to>
-    </difference>
 </differences>

java-core/google-cloud-core/src/main/java/com/google/cloud/RetryOption.java

@@ -16,13 +16,12 @@
 
 package com.google.cloud;
 
-import static com.google.api.gax.util.TimeConversionUtils.toThreetenDuration;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.api.core.BetaApi;
-import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.retrying.RetrySettings;
 import java.io.Serializable;
+import org.threeten.bp.Duration;
 
 /**
  * This class represents an options wrapper around the {@link RetrySettings} class and is an
@@ -53,43 +52,25 @@ private RetryOption(OptionType type, Object value) {
   }
 
   /** See {@link RetrySettings#getTotalTimeout()}. */
-  @ObsoleteApi("Use totalTimeout(java.time.Duration) instead")
-  public static RetryOption totalTimeout(org.threeten.bp.Duration totalTimeout) {
+  public static RetryOption totalTimeout(Duration totalTimeout) {
     return new RetryOption(OptionType.TOTAL_TIMEOUT, totalTimeout);
   }
 
-  /** See {@link RetrySettings#getTotalTimeout()}. */
-  public static RetryOption totalTimeout(java.time.Duration totalTimeout) {
-    return totalTimeout(toThreetenDuration(totalTimeout));
-  }
-
   /** See {@link RetrySettings#getInitialRetryDelay()}. */
-  @ObsoleteApi("Use initialRetryDelay(java.time.Duration) instead")
-  public static RetryOption initialRetryDelay(org.threeten.bp.Duration initialRetryDelay) {
+  public static RetryOption initialRetryDelay(Duration initialRetryDelay) {
     return new RetryOption(OptionType.INITIAL_RETRY_DELAY, initialRetryDelay);
   }
 
-  /** See {@link RetrySettings#getInitialRetryDelay()}. */
-  public static RetryOption initialRetryDelay(java.time.Duration initialRetryDelay) {
-    return initialRetryDelay(toThreetenDuration(initialRetryDelay));
-  }
-
   /** See {@link RetrySettings#getRetryDelayMultiplier()}. */
   public static RetryOption retryDelayMultiplier(double retryDelayMultiplier) {
     return new RetryOption(OptionType.RETRY_DELAY_MULTIPLIER, retryDelayMultiplier);
   }
 
   /** See {@link RetrySettings#getMaxRetryDelay()}. */
-  @ObsoleteApi("Use maxRetryDelay(java.time.Duration) instead")
-  public static RetryOption maxRetryDelay(org.threeten.bp.Duration maxRetryDelay) {
+  public static RetryOption maxRetryDelay(Duration maxRetryDelay) {
     return new RetryOption(OptionType.MAX_RETRY_DELAY, maxRetryDelay);
   }
 
-  /** See {@link RetrySettings#getMaxRetryDelay()}. */
-  public static RetryOption maxRetryDelay(java.time.Duration maxRetryDelay) {
-    return maxRetryDelay(toThreetenDuration(maxRetryDelay));
-  }
-
   /** See {@link RetrySettings#getMaxAttempts()}. */
   public static RetryOption maxAttempts(int maxAttempts) {
     return new RetryOption(OptionType.MAX_ATTEMPTS, maxAttempts);
@@ -143,16 +124,16 @@ public static RetrySettings mergeToSettings(RetrySettings settings, RetryOption.
     for (RetryOption option : options) {
       switch (option.type) {
         case TOTAL_TIMEOUT:
-          builder.setTotalTimeout((org.threeten.bp.Duration) option.value);
+          builder.setTotalTimeout((Duration) option.value);
           break;
         case INITIAL_RETRY_DELAY:
-          builder.setInitialRetryDelay((org.threeten.bp.Duration) option.value);
+          builder.setInitialRetryDelay((Duration) option.value);
           break;
         case RETRY_DELAY_MULTIPLIER:
           builder.setRetryDelayMultiplier((Double) option.value);
           break;
         case MAX_RETRY_DELAY:
-          builder.setMaxRetryDelay((org.threeten.bp.Duration) option.value);
+          builder.setMaxRetryDelay((Duration) option.value);
           break;
         case MAX_ATTEMPTS:
           builder.setMaxAttempts((Integer) option.value);

java-core/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java

@@ -70,6 +70,7 @@
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.threeten.bp.Duration;
 
 /**
  * Abstract class representing service options.
@@ -786,13 +787,13 @@ public static RetrySettings getNoRetrySettings() {
   private static RetrySettings.Builder getDefaultRetrySettingsBuilder() {
     return RetrySettings.newBuilder()
         .setMaxAttempts(6)
-        .setInitialRetryDelay(org.threeten.bp.Duration.ofMillis(1000L))
-        .setMaxRetryDelay(org.threeten.bp.Duration.ofMillis(32_000L))
+        .setInitialRetryDelay(Duration.ofMillis(1000L))
+        .setMaxRetryDelay(Duration.ofMillis(32_000L))
         .setRetryDelayMultiplier(2.0)
-        .setTotalTimeout(org.threeten.bp.Duration.ofMillis(50_000L))
-        .setInitialRpcTimeout(org.threeten.bp.Duration.ofMillis(50_000L))
+        .setTotalTimeout(Duration.ofMillis(50_000L))
+        .setInitialRpcTimeout(Duration.ofMillis(50_000L))
         .setRpcTimeoutMultiplier(1.0)
-        .setMaxRpcTimeout(org.threeten.bp.Duration.ofMillis(50_000L));
+        .setMaxRpcTimeout(Duration.ofMillis(50_000L));
   }
 
   protected abstract Set<String> getScopes();

java-core/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java

@@ -56,6 +56,7 @@
 import java.util.logging.Logger;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
+import org.threeten.bp.Duration;
 
 /** Utility class to start and stop a local service which is used by unit testing. */
 @InternalApi
@@ -115,7 +116,7 @@ protected final void startProcess(String blockUntilOutput)
    * Waits for the local service's subprocess to terminate, and stop any possible thread listening
    * for its output.
    */
-  protected final int waitForProcess(java.time.Duration timeout)
+  protected final int waitForProcess(Duration timeout)
       throws IOException, InterruptedException, TimeoutException {
     if (activeRunner != null) {
       int exitCode = activeRunner.waitFor(timeout);
@@ -129,7 +130,7 @@ protected final int waitForProcess(java.time.Duration timeout)
     return 0;
   }
 
-  private static int waitForProcess(final Process process, java.time.Duration timeout)
+  private static int waitForProcess(final Process process, Duration timeout)
       throws InterruptedException, TimeoutException {
     if (process == null) {
       return 0;
@@ -180,7 +181,7 @@ public String getProjectId() {
   public abstract void start() throws IOException, InterruptedException;
 
   /** Stops the local emulator. */
-  public abstract void stop(java.time.Duration timeout)
+  public abstract void stop(Duration timeout)
       throws IOException, InterruptedException, TimeoutException;
 
   /** Resets the internal state of the emulator. */
@@ -226,7 +227,7 @@ protected interface EmulatorRunner {
     void start() throws IOException;
 
     /** Wait for the emulator associated to this runner to terminate, returning the exit status. */
-    int waitFor(java.time.Duration timeout) throws InterruptedException, TimeoutException;
+    int waitFor(Duration timeout) throws InterruptedException, TimeoutException;
 
     /** Returns the process associated to the emulator, if any. */
     Process getProcess();
@@ -264,7 +265,7 @@ public void start() throws IOException {
     }
 
     @Override
-    public int waitFor(java.time.Duration timeout) throws InterruptedException, TimeoutException {
+    public int waitFor(Duration timeout) throws InterruptedException, TimeoutException {
       return waitForProcess(process, timeout);
     }
 
@@ -374,7 +375,7 @@ public Path call() throws IOException {
     }
 
     @Override
-    public int waitFor(java.time.Duration timeout) throws InterruptedException, TimeoutException {
+    public int waitFor(Duration timeout) throws InterruptedException, TimeoutException {
       return waitForProcess(process, timeout);
     }
 

java-core/google-cloud-core/src/test/java/com/google/cloud/RetryOptionTest.java

@@ -21,25 +21,26 @@
 
 import com.google.api.gax.retrying.RetrySettings;
 import org.junit.Test;
+import org.threeten.bp.Duration;
 
 public class RetryOptionTest {
 
   private static final RetryOption TOTAL_TIMEOUT =
-      RetryOption.totalTimeout(java.time.Duration.ofMillis(420L));
+      RetryOption.totalTimeout(Duration.ofMillis(420L));
   private static final RetryOption INITIAL_RETRY_DELAY =
-      RetryOption.initialRetryDelay(java.time.Duration.ofMillis(42L));
+      RetryOption.initialRetryDelay(Duration.ofMillis(42L));
   private static final RetryOption RETRY_DELAY_MULTIPLIER = RetryOption.retryDelayMultiplier(1.5);
   private static final RetryOption MAX_RETRY_DELAY =
-      RetryOption.maxRetryDelay(java.time.Duration.ofMillis(100));
+      RetryOption.maxRetryDelay(Duration.ofMillis(100));
   private static final RetryOption MAX_ATTEMPTS = RetryOption.maxAttempts(100);
   private static final RetryOption JITTERED = RetryOption.jittered(false);
 
   private static final RetrySettings retrySettings =
       RetrySettings.newBuilder()
-          .setTotalTimeout(java.time.Duration.ofMillis(420L))
-          .setInitialRetryDelay(java.time.Duration.ofMillis(42L))
+          .setTotalTimeout(Duration.ofMillis(420L))
+          .setInitialRetryDelay(Duration.ofMillis(42L))
           .setRetryDelayMultiplier(1.5)
-          .setMaxRetryDelay(java.time.Duration.ofMillis(100))
+          .setMaxRetryDelay(Duration.ofMillis(100))
           .setMaxAttempts(100)
           .setJittered(false)
           .build();
@@ -60,10 +61,10 @@ public void testEqualsAndHashCode() {
     assertNotEquals(MAX_ATTEMPTS, MAX_RETRY_DELAY);
     assertNotEquals(JITTERED, MAX_ATTEMPTS);
 
-    RetryOption totalTimeout = RetryOption.totalTimeout(java.time.Duration.ofMillis(420L));
-    RetryOption initialRetryDelay = RetryOption.initialRetryDelay(java.time.Duration.ofMillis(42L));
+    RetryOption totalTimeout = RetryOption.totalTimeout(Duration.ofMillis(420L));
+    RetryOption initialRetryDelay = RetryOption.initialRetryDelay(Duration.ofMillis(42L));
     RetryOption retryDelayMultiplier = RetryOption.retryDelayMultiplier(1.5);
-    RetryOption maxRetryDelay = RetryOption.maxRetryDelay(java.time.Duration.ofMillis(100));
+    RetryOption maxRetryDelay = RetryOption.maxRetryDelay(Duration.ofMillis(100));
     RetryOption maxAttempts = RetryOption.maxAttempts(100);
     RetryOption jittered = RetryOption.jittered(false);
 
@@ -100,17 +101,17 @@ public void testMergeToSettings() {
     assertEquals(retrySettings, mergedRetrySettings);
 
     defRetrySettings =
-        defRetrySettings.toBuilder().setTotalTimeout(java.time.Duration.ofMillis(420L)).build();
+        defRetrySettings.toBuilder().setTotalTimeout(Duration.ofMillis(420L)).build();
     mergedRetrySettings = RetryOption.mergeToSettings(defRetrySettings, TOTAL_TIMEOUT);
     assertEquals(defRetrySettings, mergedRetrySettings);
 
     defRetrySettings =
-        defRetrySettings.toBuilder().setMaxRetryDelay(java.time.Duration.ofMillis(100)).build();
+        defRetrySettings.toBuilder().setMaxRetryDelay(Duration.ofMillis(100)).build();
     mergedRetrySettings = RetryOption.mergeToSettings(defRetrySettings, MAX_RETRY_DELAY);
     assertEquals(defRetrySettings, mergedRetrySettings);
 
     defRetrySettings =
-        defRetrySettings.toBuilder().setInitialRetryDelay(java.time.Duration.ofMillis(42L)).build();
+        defRetrySettings.toBuilder().setInitialRetryDelay(Duration.ofMillis(42L)).build();
     mergedRetrySettings = RetryOption.mergeToSettings(defRetrySettings, INITIAL_RETRY_DELAY);
     assertEquals(defRetrySettings, mergedRetrySettings);
 

java-core/google-cloud-core/src/test/java/com/google/cloud/SerializationTest.java

@@ -23,6 +23,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import java.io.Serializable;
+import org.threeten.bp.Duration;
 
 public class SerializationTest extends BaseSerializationTest {
 
@@ -36,7 +37,7 @@ public class SerializationTest extends BaseSerializationTest {
   private static final Role SOME_ROLE = Role.viewer();
   private static final Policy SOME_IAM_POLICY = Policy.newBuilder().build();
   private static final RetryOption CHECKING_PERIOD =
-      RetryOption.initialRetryDelay(java.time.Duration.ofSeconds(42));
+      RetryOption.initialRetryDelay(Duration.ofSeconds(42));
   private static final LabelDescriptor LABEL_DESCRIPTOR =
       new LabelDescriptor("project_id", ValueType.STRING, "The project id");
   private static final MonitoredResourceDescriptor MONITORED_RESOURCE_DESCRIPTOR =

java-core/google-cloud-core/src/test/java/com/google/cloud/testing/BaseEmulatorHelperTest.java

@@ -33,6 +33,7 @@
 import java.util.logging.Logger;
 import org.easymock.EasyMock;
 import org.junit.Test;
+import org.threeten.bp.Duration;
 
 public class BaseEmulatorHelperTest {
 
@@ -70,8 +71,7 @@ public void start() throws IOException, InterruptedException {
     }
 
     @Override
-    public void stop(java.time.Duration timeout)
-        throws IOException, InterruptedException, TimeoutException {
+    public void stop(Duration timeout) throws IOException, InterruptedException, TimeoutException {
       waitForProcess(timeout);
     }
 
@@ -91,13 +91,13 @@ public void testEmulatorHelper() throws IOException, InterruptedException, Timeo
     emulatorRunner.start();
     EasyMock.expectLastCall();
     EasyMock.expect(emulatorRunner.getProcess()).andReturn(process);
-    emulatorRunner.waitFor(java.time.Duration.ofMinutes(1));
+    emulatorRunner.waitFor(Duration.ofMinutes(1));
     EasyMock.expectLastCall().andReturn(0);
     EasyMock.replay(process, emulatorRunner);
     TestEmulatorHelper helper =
         new TestEmulatorHelper(ImmutableList.of(emulatorRunner), BLOCK_UNTIL);
     helper.start();
-    helper.stop(java.time.Duration.ofMinutes(1));
+    helper.stop(Duration.ofMinutes(1));
     EasyMock.verify();
   }
 
@@ -157,13 +157,13 @@ public void testEmulatorHelperMultipleRunners()
     secondRunner.start();
     EasyMock.expectLastCall();
     EasyMock.expect(secondRunner.getProcess()).andReturn(process);
-    secondRunner.waitFor(java.time.Duration.ofMinutes(1));
+    secondRunner.waitFor(Duration.ofMinutes(1));
     EasyMock.expectLastCall().andReturn(0);
     EasyMock.replay(process, secondRunner);
     TestEmulatorHelper helper =
         new TestEmulatorHelper(ImmutableList.of(firstRunner, secondRunner), BLOCK_UNTIL);
     helper.start();
-    helper.stop(java.time.Duration.ofMinutes(1));
+    helper.stop(Duration.ofMinutes(1));
     EasyMock.verify();
   }
 

showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITDynamicRoutingHeaders.java

@@ -43,6 +43,7 @@
 import io.grpc.MethodDescriptor;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import org.junit.After;
 import org.junit.Before;
@@ -153,11 +154,21 @@ public void createClients() throws Exception {
   }
 
   @After
-  public void destroyClient() {
+  public void destroyClient() throws InterruptedException {
     grpcClient.close();
-    httpJsonClient.close();
     grpcComplianceClient.close();
+
+    httpJsonClient.close();
     httpJsonComplianceClient.close();
+
+    grpcClient.awaitTermination(TestClientInitializer.AWAIT_TERMINATION_SECONDS, TimeUnit.SECONDS);
+    grpcComplianceClient.awaitTermination(
+        TestClientInitializer.AWAIT_TERMINATION_SECONDS, TimeUnit.SECONDS);
+
+    httpJsonClient.awaitTermination(
+        TestClientInitializer.AWAIT_TERMINATION_SECONDS, TimeUnit.SECONDS);
+    httpJsonComplianceClient.awaitTermination(
+        TestClientInitializer.AWAIT_TERMINATION_SECONDS, TimeUnit.SECONDS);
   }
 
   @Test