Florezchava
diff --git a/‎gax-java/gax/src/main/java/com/google/api/gax/rpc/FixedWatchdogProvider.java
Copy file name to clipboardExpand all lines: gax-java/gax/src/main/java/com/google/api/gax/rpc/FixedWatchdogProvider.java
-7Lines changed: 0 additions & 7 deletions b/‎gax-java/gax/src/main/java/com/google/api/gax/rpc/FixedWatchdogProvider.java
Copy file name to clipboardExpand all lines: gax-java/gax/src/main/java/com/google/api/gax/rpc/FixedWatchdogProvider.java
-7Lines changed: 0 additions & 7 deletions
diff --git a/‎gax-java/gax/src/main/java/com/google/api/gax/rpc/InstantiatingWatchdogProvider.java
Copy file name to clipboardExpand all lines: gax-java/gax/src/main/java/com/google/api/gax/rpc/InstantiatingWatchdogProvider.java
-15Lines changed: 0 additions & 15 deletions b/‎gax-java/gax/src/main/java/com/google/api/gax/rpc/InstantiatingWatchdogProvider.java
Copy file name to clipboardExpand all lines: gax-java/gax/src/main/java/com/google/api/gax/rpc/InstantiatingWatchdogProvider.java
-15Lines changed: 0 additions & 15 deletions
diff --git a/‎gax-java/gax/src/main/java/com/google/api/gax/rpc/WatchdogProvider.java
Copy file name to clipboardExpand all lines: gax-java/gax/src/main/java/com/google/api/gax/rpc/WatchdogProvider.java
+2-8Lines changed: 2 additions & 8 deletions b/‎gax-java/gax/src/main/java/com/google/api/gax/rpc/WatchdogProvider.java
Copy file name to clipboardExpand all lines: gax-java/gax/src/main/java/com/google/api/gax/rpc/WatchdogProvider.java
+2-8Lines changed: 2 additions & 8 deletions
diff --git a/‎gax-java/gax/src/test/java/com/google/api/gax/rpc/FixedWatchdogProviderTest.java
Copy file name to clipboardExpand all lines: gax-java/gax/src/test/java/com/google/api/gax/rpc/FixedWatchdogProviderTest.java
-15Lines changed: 0 additions & 15 deletions b/‎gax-java/gax/src/test/java/com/google/api/gax/rpc/FixedWatchdogProviderTest.java
Copy file name to clipboardExpand all lines: gax-java/gax/src/test/java/com/google/api/gax/rpc/FixedWatchdogProviderTest.java
-15Lines changed: 0 additions & 15 deletions
@@ -31,7 +31,6 @@
 
 import com.google.api.core.ApiClock;
 import com.google.api.core.InternalApi;
-import com.google.api.core.ObsoleteApi;
 import java.util.concurrent.ScheduledExecutorService;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -70,12 +69,6 @@ public boolean needsCheckInterval() {
     return false;
   }
 
-  @Override
-  @ObsoleteApi("Use withCheckInterval(java.time.Duration) instead")
-  public WatchdogProvider withCheckInterval(org.threeten.bp.Duration checkInterval) {
-    throw new UnsupportedOperationException("FixedWatchdogProvider doesn't need a checkInterval");
-  }
-
   @Override
   public WatchdogProvider withCheckInterval(java.time.Duration checkInterval) {
     throw new UnsupportedOperationException("FixedWatchdogProvider doesn't need a checkInterval");
 
@@ -29,11 +29,9 @@
  */
 package com.google.api.gax.rpc;
 
-import static com.google.api.gax.util.TimeConversionUtils.toJavaTimeDuration;
 
 import com.google.api.core.ApiClock;
 import com.google.api.core.InternalApi;
-import com.google.api.core.ObsoleteApi;
 import com.google.common.base.Preconditions;
 import java.util.concurrent.ScheduledExecutorService;
 import javax.annotation.Nonnull;
@@ -80,19 +78,6 @@ public boolean needsCheckInterval() {
     return checkInterval == null;
   }
 
-  /**
-   * Overload of {@link #withCheckInterval(java.time.Duration)} using {@link
-   * org.threeten.bp.Duration}
-   *
-   * @param checkInterval
-   * @return
-   */
-  @Override
-  @ObsoleteApi("Use withCheckInterval(java.time.Duration) instead")
-  public WatchdogProvider withCheckInterval(@Nonnull org.threeten.bp.Duration checkInterval) {
-    return withCheckInterval(toJavaTimeDuration(Preconditions.checkNotNull(checkInterval)));
-  }
-
   @Override
   public WatchdogProvider withCheckInterval(@Nonnull java.time.Duration checkInterval) {
     return new InstantiatingWatchdogProvider(
 
@@ -30,24 +30,18 @@
 package com.google.api.gax.rpc;
 
 import com.google.api.core.ApiClock;
-import com.google.api.core.ObsoleteApi;
+import com.google.api.core.InternalApi;
 import java.util.concurrent.ScheduledExecutorService;
 import javax.annotation.Nonnull;
 
+@InternalApi
 public interface WatchdogProvider {
   boolean needsClock();
 
   WatchdogProvider withClock(@Nonnull ApiClock clock);
 
   boolean needsCheckInterval();
 
-  /**
-   * Overload of {@link #withCheckInterval(java.time.Duration)} using {@link
-   * org.threeten.bp.Duration}
-   */
-  @ObsoleteApi("Use withCheckInterval(java.time.Duration) instead")
-  WatchdogProvider withCheckInterval(org.threeten.bp.Duration checkInterval);
-
   WatchdogProvider withCheckInterval(java.time.Duration checkInterval);
 
   boolean needsExecutor();
 
@@ -29,9 +29,7 @@
  */
 package com.google.api.gax.rpc;
 
-import static com.google.api.gax.util.TimeConversionTestUtils.testDurationMethod;
 import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertThrows;
 
 import com.google.api.core.ApiClock;
 import java.util.concurrent.ScheduledExecutorService;
@@ -98,17 +96,4 @@ public void testNoModifications() {
     }
     assertThat(actualError).isInstanceOf(UnsupportedOperationException.class);
   }
-
-  @Test
-  public void testWithCheckInterval_backportMethodsBehaveCorrectly() {
-    final FixedWatchdogProvider provider =
-        (FixedWatchdogProvider) FixedWatchdogProvider.create(null);
-    long millis = 123l;
-    assertThrows(
-        UnsupportedOperationException.class,
-        () -> provider.withCheckInterval(java.time.Duration.ofMillis(millis)));
-    assertThrows(
-        UnsupportedOperationException.class,
-        () -> provider.withCheckInterval(org.threeten.bp.Duration.ofMillis(millis)));
-  }
 }