googleapis
diff --git a/‎gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/ChannelPool.java
+1-2 b/‎gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/ChannelPool.java
+1-2
diff --git a/‎gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcCallContext.java
+77-20 b/‎gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcCallContext.java
+77-20
diff --git a/‎gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcClientCalls.java
+2-2 b/‎gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcClientCalls.java
+2-2
diff --git a/‎gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java
+54-11 b/‎gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java
+54-11
diff --git a/‎gax-java/gax-grpc/src/main/java/com/google/longrunning/stub/OperationsStubSettings.java
+5-6 b/‎gax-java/gax-grpc/src/main/java/com/google/longrunning/stub/OperationsStubSettings.java
+5-6
@@ -55,7 +55,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
-import org.threeten.bp.Duration;
 
 /**
  * A {@link ManagedChannel} that will send requests round-robin via a set of channels.
@@ -69,7 +68,7 @@
  */
 class ChannelPool extends ManagedChannel {
   @VisibleForTesting static final Logger LOG = Logger.getLogger(ChannelPool.class.getName());
-  private static final Duration REFRESH_PERIOD = Duration.ofMinutes(50);
+  private static final java.time.Duration REFRESH_PERIOD = java.time.Duration.ofMinutes(50);
 
   private final ChannelPoolSettings settings;
   private final ChannelFactory channelFactory;
 
@@ -29,8 +29,12 @@
  */
 package com.google.api.gax.grpc;
 
+import static com.google.api.gax.util.TimeConversionUtils.toJavaTimeDuration;
+import static com.google.api.gax.util.TimeConversionUtils.toThreetenDuration;
+
 import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.retrying.RetrySettings;
 import com.google.api.gax.rpc.ApiCallContext;
 import com.google.api.gax.rpc.ApiExceptionFactory;
@@ -62,7 +66,6 @@
 import java.util.Set;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import org.threeten.bp.Duration;
 
 /**
  * GrpcCallContext encapsulates context data used to make a grpc call.
@@ -84,9 +87,9 @@ public final class GrpcCallContext implements ApiCallContext {
   private final Channel channel;
   @Nullable private final Credentials credentials;
   private final CallOptions callOptions;
-  @Nullable private final Duration timeout;
-  @Nullable private final Duration streamWaitTimeout;
-  @Nullable private final Duration streamIdleTimeout;
+  @Nullable private final java.time.Duration timeout;
+  @Nullable private final java.time.Duration streamWaitTimeout;
+  @Nullable private final java.time.Duration streamIdleTimeout;
   @Nullable private final Integer channelAffinity;
   @Nullable private final RetrySettings retrySettings;
   @Nullable private final ImmutableSet<StatusCode.Code> retryableCodes;
@@ -132,9 +135,9 @@ private GrpcCallContext(
       Channel channel,
       @Nullable Credentials credentials,
       CallOptions callOptions,
-      @Nullable Duration timeout,
-      @Nullable Duration streamWaitTimeout,
-      @Nullable Duration streamIdleTimeout,
+      @Nullable java.time.Duration timeout,
+      @Nullable java.time.Duration streamWaitTimeout,
+      @Nullable java.time.Duration streamIdleTimeout,
       @Nullable Integer channelAffinity,
       ImmutableMap<String, List<String>> extraHeaders,
       ApiCallContextOptions options,
@@ -228,8 +231,15 @@ public GrpcCallContext withEndpointContext(EndpointContext endpointContext) {
         endpointContext);
   }
 
+  /** This method is obsolete. Use {@link #withTimeoutDuration(java.time.Duration)} instead. */
+  @Override
+  @ObsoleteApi("Use withTimeoutDuration(java.time.Duration) instead")
+  public GrpcCallContext withTimeout(@Nullable org.threeten.bp.Duration timeout) {
+    return withTimeoutDuration(toJavaTimeDuration(timeout));
+  }
+
   @Override
-  public GrpcCallContext withTimeout(@Nullable Duration timeout) {
+  public GrpcCallContext withTimeoutDuration(@Nullable java.time.Duration timeout) {
     // Default RetrySettings use 0 for RPC timeout. Treat that as disabled timeouts.
     if (timeout != null && (timeout.isZero() || timeout.isNegative())) {
       timeout = null;
@@ -255,17 +265,37 @@ public GrpcCallContext withTimeout(@Nullable Duration timeout) {
         endpointContext);
   }
 
+  /** This method is obsolete. Use {@link #getTimeoutDuration()} instead. */
   @Nullable
   @Override
-  public Duration getTimeout() {
+  @ObsoleteApi("Use getTimeoutDuration() instead")
+  public org.threeten.bp.Duration getTimeout() {
+    return toThreetenDuration(getTimeoutDuration());
+  }
+
+  @Nullable
+  @Override
+  public java.time.Duration getTimeoutDuration() {
     return timeout;
   }
 
+  /**
+   * This method is obsolete. Use {@link #withStreamWaitTimeoutDuration(java.time.Duration)}
+   * instead.
+   */
+  @Override
+  @ObsoleteApi("Use withStreamWaitTimeoutDuration(java.time.Duration) instead")
+  public GrpcCallContext withStreamWaitTimeout(
+      @Nullable org.threeten.bp.Duration streamWaitTimeout) {
+    return withStreamWaitTimeoutDuration(toJavaTimeDuration(streamWaitTimeout));
+  }
+
   @Override
-  public GrpcCallContext withStreamWaitTimeout(@Nullable Duration streamWaitTimeout) {
+  public GrpcCallContext withStreamWaitTimeoutDuration(
+      @Nullable java.time.Duration streamWaitTimeout) {
     if (streamWaitTimeout != null) {
       Preconditions.checkArgument(
-          streamWaitTimeout.compareTo(Duration.ZERO) >= 0, "Invalid timeout: < 0 s");
+          streamWaitTimeout.compareTo(java.time.Duration.ZERO) >= 0, "Invalid timeout: < 0 s");
     }
 
     return new GrpcCallContext(
@@ -283,11 +313,23 @@ public GrpcCallContext withStreamWaitTimeout(@Nullable Duration streamWaitTimeou
         endpointContext);
   }
 
+  /**
+   * This method is obsolete. Use {@link #withStreamIdleTimeoutDuration(java.time.Duration)}
+   * instead.
+   */
+  @Override
+  @ObsoleteApi("Use withStreamIdleTimeoutDuration(java.time.Duration) instead")
+  public GrpcCallContext withStreamIdleTimeout(
+      @Nullable org.threeten.bp.Duration streamIdleTimeout) {
+    return withStreamIdleTimeoutDuration(toJavaTimeDuration(streamIdleTimeout));
+  }
+
   @Override
-  public GrpcCallContext withStreamIdleTimeout(@Nullable Duration streamIdleTimeout) {
+  public GrpcCallContext withStreamIdleTimeoutDuration(
+      @Nullable java.time.Duration streamIdleTimeout) {
     if (streamIdleTimeout != null) {
       Preconditions.checkArgument(
-          streamIdleTimeout.compareTo(Duration.ZERO) >= 0, "Invalid timeout: < 0 s");
+          streamIdleTimeout.compareTo(java.time.Duration.ZERO) >= 0, "Invalid timeout: < 0 s");
     }
 
     return new GrpcCallContext(
@@ -424,17 +466,17 @@ public ApiCallContext merge(ApiCallContext inputCallContext) {
       newTracer = callOptions.getOption(TRACER_KEY);
     }
 
-    Duration newTimeout = grpcCallContext.timeout;
+    java.time.Duration newTimeout = grpcCallContext.timeout;
     if (newTimeout == null) {
       newTimeout = timeout;
     }
 
-    Duration newStreamWaitTimeout = grpcCallContext.streamWaitTimeout;
+    java.time.Duration newStreamWaitTimeout = grpcCallContext.streamWaitTimeout;
     if (newStreamWaitTimeout == null) {
       newStreamWaitTimeout = streamWaitTimeout;
     }
 
-    Duration newStreamIdleTimeout = grpcCallContext.streamIdleTimeout;
+    java.time.Duration newStreamIdleTimeout = grpcCallContext.streamIdleTimeout;
     if (newStreamIdleTimeout == null) {
       newStreamIdleTimeout = streamIdleTimeout;
     }
@@ -496,25 +538,40 @@ public CallOptions getCallOptions() {
     return callOptions;
   }
 
+  /** This method is obsolete. Use {@link #getStreamWaitTimeoutDuration()} instead. */
+  @Override
+  @Nullable
+  @ObsoleteApi("Use getStreamWaitTimeoutDuration() instead")
+  public org.threeten.bp.Duration getStreamWaitTimeout() {
+    return toThreetenDuration(getStreamWaitTimeoutDuration());
+  }
+
   /**
    * The stream wait timeout set for this context.
    *
-   * @see ApiCallContext#withStreamWaitTimeout(Duration)
+   * @see ApiCallContext#withStreamWaitTimeoutDuration(java.time.Duration)
    */
   @Override
   @Nullable
-  public Duration getStreamWaitTimeout() {
+  public java.time.Duration getStreamWaitTimeoutDuration() {
     return streamWaitTimeout;
   }
 
+  /** This method is obsolete. Use {@link #getStreamIdleTimeoutDuration()} instead. */
+  @Override
+  @Nullable
+  @ObsoleteApi("Use getStreamIdleTimeoutDuration() instead")
+  public org.threeten.bp.Duration getStreamIdleTimeout() {
+    return toThreetenDuration(getStreamIdleTimeoutDuration());
+  }
   /**
    * The stream idle timeout set for this context.
    *
-   * @see ApiCallContext#withStreamIdleTimeout(Duration)
+   * @see ApiCallContext#withStreamIdleTimeoutDuration(java.time.Duration)
    */
   @Override
   @Nullable
-  public Duration getStreamIdleTimeout() {
+  public java.time.Duration getStreamIdleTimeoutDuration() {
     return streamIdleTimeout;
   }
 
 
@@ -74,9 +74,9 @@ public static <RequestT, ResponseT> ClientCall<RequestT, ResponseT> newCall(
     Preconditions.checkNotNull(callOptions);
 
     // Try to convert the timeout into a deadline and use it if it occurs before the actual deadline
-    if (grpcContext.getTimeout() != null) {
+    if (grpcContext.getTimeoutDuration() != null) {
       Deadline newDeadline =
-          Deadline.after(grpcContext.getTimeout().toMillis(), TimeUnit.MILLISECONDS);
+          Deadline.after(grpcContext.getTimeoutDuration().toMillis(), TimeUnit.MILLISECONDS);
       Deadline oldDeadline = callOptions.getDeadline();
 
       if (oldDeadline == null || newDeadline.isBefore(oldDeadline)) {
 
@@ -29,9 +29,13 @@
  */
 package com.google.api.gax.grpc;
 
+import static com.google.api.gax.util.TimeConversionUtils.toJavaTimeDuration;
+import static com.google.api.gax.util.TimeConversionUtils.toThreetenDuration;
+
 import com.google.api.core.ApiFunction;
 import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.ExecutorProvider;
 import com.google.api.gax.rpc.FixedHeaderProvider;
 import com.google.api.gax.rpc.HeaderProvider;
@@ -67,7 +71,6 @@
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
 import javax.net.ssl.KeyManagerFactory;
-import org.threeten.bp.Duration;
 
 /**
  * InstantiatingGrpcChannelProvider is a TransportChannelProvider which constructs a gRPC
@@ -106,8 +109,8 @@ public final class InstantiatingGrpcChannelProvider implements TransportChannelP
   @Nullable private final GrpcInterceptorProvider interceptorProvider;
   @Nullable private final Integer maxInboundMessageSize;
   @Nullable private final Integer maxInboundMetadataSize;
-  @Nullable private final Duration keepAliveTime;
-  @Nullable private final Duration keepAliveTimeout;
+  @Nullable private final java.time.Duration keepAliveTime;
+  @Nullable private final java.time.Duration keepAliveTimeout;
   @Nullable private final Boolean keepAliveWithoutCalls;
   private final ChannelPoolSettings channelPoolSettings;
   @Nullable private final Credentials credentials;
@@ -490,13 +493,25 @@ public String getEndpoint() {
     return endpoint;
   }
 
+  /** This method is obsolete. Use {@link #getKeepAliveTimeDuration()} instead. */
+  @ObsoleteApi("Use getKeepAliveTimeDuration() instead")
+  public org.threeten.bp.Duration getKeepAliveTime() {
+    return toThreetenDuration(getKeepAliveTimeDuration());
+  }
+
   /** The time without read activity before sending a keepalive ping. */
-  public Duration getKeepAliveTime() {
+  public java.time.Duration getKeepAliveTimeDuration() {
     return keepAliveTime;
   }
 
+  /** This method is obsolete. Use {@link #getKeepAliveTimeoutDuration()} instead */
+  @ObsoleteApi("Use getKeepAliveTimeoutDuration() instead")
+  public org.threeten.bp.Duration getKeepAliveTimeout() {
+    return toThreetenDuration(getKeepAliveTimeoutDuration());
+  }
+
   /** The time without read activity after sending a keepalive ping. */
-  public Duration getKeepAliveTimeout() {
+  public java.time.Duration getKeepAliveTimeoutDuration() {
     return keepAliveTimeout;
   }
 
@@ -540,8 +555,8 @@ public static final class Builder {
     @Nullable private GrpcInterceptorProvider interceptorProvider;
     @Nullable private Integer maxInboundMessageSize;
     @Nullable private Integer maxInboundMetadataSize;
-    @Nullable private Duration keepAliveTime;
-    @Nullable private Duration keepAliveTimeout;
+    @Nullable private java.time.Duration keepAliveTime;
+    @Nullable private java.time.Duration keepAliveTimeout;
     @Nullable private Boolean keepAliveWithoutCalls;
     @Nullable private ApiFunction<ManagedChannelBuilder, ManagedChannelBuilder> channelConfigurator;
     @Nullable private Credentials credentials;
@@ -679,25 +694,53 @@ public Integer getMaxInboundMetadataSize() {
       return maxInboundMetadataSize;
     }
 
+    /**
+     * This method is obsolete. Use {@link #setKeepAliveTimeDuration(java.time.Duration)} instead.
+     */
+    @ObsoleteApi("Use setKeepAliveTimeDuration(java.time.Duration) instead")
+    public Builder setKeepAliveTime(org.threeten.bp.Duration duration) {
+      return setKeepAliveTimeDuration(toJavaTimeDuration(duration));
+    }
     /** The time without read activity before sending a keepalive ping. */
-    public Builder setKeepAliveTime(Duration duration) {
+    public Builder setKeepAliveTimeDuration(java.time.Duration duration) {
       this.keepAliveTime = duration;
       return this;
     }
 
+    /** This method is obsolete. Use {@link #getKeepAliveTimeDuration()} instead. */
+    @ObsoleteApi("Use getKeepAliveTimeDuration() instead")
+    public org.threeten.bp.Duration getKeepAliveTime() {
+      return toThreetenDuration(getKeepAliveTimeDuration());
+    }
+
     /** The time without read activity before sending a keepalive ping. */
-    public Duration getKeepAliveTime() {
+    public java.time.Duration getKeepAliveTimeDuration() {
       return keepAliveTime;
     }
 
+    /**
+     * This method is obsolete. Use {@link #setKeepAliveTimeoutDuration(java.time.Duration)}
+     * instead.
+     */
+    @ObsoleteApi("Use setKeepAliveTimeoutDuration(java.time.Duration) instead")
+    public Builder setKeepAliveTimeout(org.threeten.bp.Duration duration) {
+      return setKeepAliveTimeoutDuration(toJavaTimeDuration(duration));
+    }
+
     /** The time without read activity after sending a keepalive ping. */
-    public Builder setKeepAliveTimeout(Duration duration) {
+    public Builder setKeepAliveTimeoutDuration(java.time.Duration duration) {
       this.keepAliveTimeout = duration;
       return this;
     }
 
+    /** This method is obsolete. Use {@link #getKeepAliveTimeoutDuration()} instead */
+    @ObsoleteApi("Use getKeepAliveTimeoutDuration() instead")
+    public org.threeten.bp.Duration getKeepAliveTimeout() {
+      return toThreetenDuration(getKeepAliveTimeoutDuration());
+    }
+
     /** The time without read activity after sending a keepalive ping. */
-    public Duration getKeepAliveTimeout() {
+    public java.time.Duration getKeepAliveTimeoutDuration() {
       return keepAliveTimeout;
     }
 
 
@@ -63,7 +63,6 @@
 import com.google.longrunning.WaitOperationRequest;
 import com.google.protobuf.Empty;
 import java.io.IOException;
-import org.threeten.bp.Duration;
 
 /** Settings class to configure an instance of {@link OperationsStub}. */
 public class OperationsStubSettings extends StubSettings<OperationsStubSettings> {
@@ -243,13 +242,13 @@ public static class Builder extends StubSettings.Builder<OperationsStubSettings,
       RetrySettings settings = null;
       settings =
           RetrySettings.newBuilder()
-              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setInitialRetryDelayDuration(java.time.Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
-              .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(90000L))
+              .setMaxRetryDelayDuration(java.time.Duration.ofMillis(60000L))
+              .setInitialRpcTimeoutDuration(java.time.Duration.ofMillis(90000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(90000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
+              .setMaxRpcTimeoutDuration(java.time.Duration.ofMillis(90000L))
+              .setTotalTimeoutDuration(java.time.Duration.ofMillis(600000L))
               .build();
       definitions.put("default", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();