Issue 10245 - Reverted java.time.Duration changes for Deadline and De…

…adlineTest files
grpc · Oct 2, 2024 · 4531bc2 · 4531bc2
1 parent 6c56aae
commit 4531bc2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 48 deletions.
diff --git a/api/src/context/java/io/grpc/Deadline.java b/api/src/context/java/io/grpc/Deadline.java
@@ -16,7 +16,6 @@
 
 package io.grpc;
 
-import java.time.Duration;
 import java.util.Arrays;
 import java.util.Locale;
 import java.util.concurrent.ScheduledExecutorService;
@@ -69,11 +68,6 @@ public static Deadline after(long duration, TimeUnit units) {
     return after(duration, units, SYSTEM_TICKER);
   }
 
-  public static Deadline after(Duration duration) {
-    return after(TimeUnit.NANOSECONDS.convert(duration.getSeconds(), TimeUnit.SECONDS),
-        TimeUnit.NANOSECONDS, SYSTEM_TICKER);
-  }
-
   /**
    * Create a deadline that will expire at the specified offset based on the given {@link Ticker}.
    *
@@ -101,11 +95,6 @@ public static Deadline after(long duration, TimeUnit units, Ticker ticker) {
     return new Deadline(ticker, units.toNanos(duration), true);
   }
 
-  public static Deadline after(Duration duration, Ticker ticker) {
-    return after(TimeUnit.NANOSECONDS.convert(duration.getSeconds(), TimeUnit.SECONDS),
-        TimeUnit.NANOSECONDS, ticker);
-  }
-
   private final Ticker ticker;
   private final long deadlineNanos;
   private volatile boolean expired;

diff --git a/api/src/test/java/io/grpc/DeadlineTest.java b/api/src/test/java/io/grpc/DeadlineTest.java
@@ -29,7 +29,6 @@
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.truth.Truth;
-import java.time.Duration;
 import java.util.Arrays;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
@@ -138,12 +137,6 @@ public void deadlineMatchesLongValue() {
     assertEquals(10, Deadline.after(10, TimeUnit.MINUTES, ticker).timeRemaining(TimeUnit.MINUTES));
   }
 
-  @Test
-  public void deadLineMatchesDurationValue() {
-    assertEquals(10, Deadline.after(Duration.ofMinutes(10), ticker)
-        .timeRemaining(TimeUnit.MINUTES));
-  }
-
   @Test
   public void pastDeadlineIsExpired() {
     Deadline d = Deadline.after(-1, TimeUnit.SECONDS, ticker);
@@ -312,36 +305,6 @@ public void tickersDontMatch() {
     assertFalse(success);
   }
 
-  @Test
-  public void tickersDontMatchDuration() {
-    Deadline d1 = Deadline.after(Duration.ofSeconds(10));
-    Deadline d2 = Deadline.after(Duration.ofSeconds(10), ticker);
-    boolean success = false;
-    try {
-      d1.compareTo(d2);
-      success = true;
-    } catch (AssertionError e) {
-      // Expected
-    }
-    assertFalse(success);
-
-    try {
-      d1.minimum(d2);
-      success = true;
-    } catch (AssertionError e) {
-      // Expected
-    }
-    assertFalse(success);
-
-    try {
-      d1.isBefore(d2);
-      success = true;
-    } catch (AssertionError e) {
-      // Expected
-    }
-    assertFalse(success);
-  }
-
   @Test
   public void toString_before() {
     Deadline d = Deadline.after(12, TimeUnit.MICROSECONDS, ticker);