Issue 10245 - Implementation for Duration.toNanos() changes

SreeramdasLavanya · SreeramdasLavanya · commit bd5a80aad187 · 2024-10-08T11:05:57.000Z
diff --git a/api/src/main/java/io/grpc/CallOptions.java b/api/src/main/java/io/grpc/CallOptions.java
@@ -17,6 +17,7 @@
 package io.grpc;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static io.grpc.InternalTimeUtils.convert;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
@@ -178,8 +179,7 @@ public CallOptions withDeadlineAfter(long duration, TimeUnit unit) {
   }
 
   public CallOptions withDeadlineAfter(Duration duration) {
-    return withDeadlineAfter(TimeUnit.NANOSECONDS.convert(duration.getSeconds(), TimeUnit.SECONDS),
-        TimeUnit.NANOSECONDS);
+    return withDeadlineAfter(convert(duration), TimeUnit.NANOSECONDS);
   }
 
   /**
diff --git a/api/src/main/java/io/grpc/InternalTimeUtils.java b/api/src/main/java/io/grpc/InternalTimeUtils.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2024 The gRPC Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.grpc;
+
+import java.time.Duration;
+
+@Internal
+public final class InternalTimeUtils {
+  static long convert(Duration duration) {
+    try {
+      return duration.toNanos();
+    } catch (ArithmeticException tooBig) {
+      return duration.isNegative() ? Long.MIN_VALUE : Long.MAX_VALUE;
+    }
+  }
+}
diff --git a/api/src/main/java/io/grpc/SynchronizationContext.java b/api/src/main/java/io/grpc/SynchronizationContext.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
+import static io.grpc.InternalTimeUtils.convert;
 
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.time.Duration;
@@ -197,8 +198,7 @@ public String toString() {
   public final ScheduledHandle scheduleWithFixedDelay(
       final Runnable task, Duration initialDelay, Duration delay,
       ScheduledExecutorService timerService) {
-    return scheduleWithFixedDelay(task, TimeUnit.NANOSECONDS.convert(initialDelay.getSeconds(),
-        TimeUnit.SECONDS), TimeUnit.NANOSECONDS.convert(delay.getSeconds(), TimeUnit.SECONDS),
+    return scheduleWithFixedDelay(task, convert(initialDelay), convert(delay),
         TimeUnit.NANOSECONDS, timerService);
   }
 
diff --git a/stub/src/main/java/io/grpc/stub/AbstractStub.java b/stub/src/main/java/io/grpc/stub/AbstractStub.java
@@ -17,6 +17,7 @@
 package io.grpc.stub;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static io.grpc.stub.InternalTimeUtils.convert;
 
 import io.grpc.CallCredentials;
 import io.grpc.CallOptions;
@@ -151,8 +152,7 @@ public final S withDeadlineAfter(long duration, TimeUnit unit) {
   }
 
   public final S withDeadlineAfter(Duration duration) {
-    return withDeadlineAfter(TimeUnit.NANOSECONDS.convert(duration.getSeconds(),
-        TimeUnit.SECONDS), TimeUnit.NANOSECONDS);
+    return withDeadlineAfter(convert(duration), TimeUnit.NANOSECONDS);
   }
 
   /**
diff --git a/stub/src/main/java/io/grpc/stub/InternalTimeUtils.java b/stub/src/main/java/io/grpc/stub/InternalTimeUtils.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 The gRPC Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.grpc.stub;
+
+import io.grpc.Internal;
+import java.time.Duration;
+
+@Internal
+public final class InternalTimeUtils {
+  static long convert(Duration duration) {
+    try {
+      return duration.toNanos();
+    } catch (ArithmeticException tooBig) {
+      return duration.isNegative() ? Long.MIN_VALUE : Long.MAX_VALUE;
+    }
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`package io.grpc;`
`18`	`18`
`19`	`19`	`import static com.google.common.base.Preconditions.checkArgument;`
	`20`	`+import static io.grpc.InternalTimeUtils.convert;`
`20`	`21`
`21`	`22`	`import com.google.common.base.MoreObjects;`
`22`	`23`	`import com.google.common.base.Preconditions;`
`@@ -178,8 +179,7 @@ public CallOptions withDeadlineAfter(long duration, TimeUnit unit) {`
`178`	`179`	`}`
`179`	`180`
`180`	`181`	`public CallOptions withDeadlineAfter(Duration duration) {`
`181`		`- return withDeadlineAfter(TimeUnit.NANOSECONDS.convert(duration.getSeconds(), TimeUnit.SECONDS),`
`182`		`- TimeUnit.NANOSECONDS);`
	`182`	`+ return withDeadlineAfter(convert(duration), TimeUnit.NANOSECONDS);`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`/**`