grpc-api/stub: Changes for InternalTimeUtils and TimeUtils files as per review comments

SreeramdasLavanya · SreeramdasLavanya · commit 3dbb61ec1015 · 2024-10-22T13:30:23.000Z
diff --git a/api/src/main/java/io/grpc/InternalTimeUtils.java b/api/src/main/java/io/grpc/InternalTimeUtils.java
@@ -0,0 +1,26 @@
+/*
+ * 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 {
+  public static long convert(Duration duration) {
+   return TimeUtils.convertToNanos(duration);
+  }
+}
diff --git a/api/src/main/java/io/grpc/TimeUtils.java b/api/src/main/java/io/grpc/TimeUtils.java
@@ -18,8 +18,8 @@
 
 import java.time.Duration;
 
-public final class TimeUtils {
-  public static long convertToNanos(Duration duration) {
+final class TimeUtils {
+  static long convertToNanos(Duration duration) {
     try {
       return duration.toNanos();
     } catch (ArithmeticException tooBig) {
diff --git a/stub/src/main/java/io/grpc/stub/AbstractStub.java b/stub/src/main/java/io/grpc/stub/AbstractStub.java
@@ -17,7 +17,7 @@
 package io.grpc.stub;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static io.grpc.TimeUtils.convertToNanos;
+import static io.grpc.InternalTimeUtils.convert;
 
 import io.grpc.CallCredentials;
 import io.grpc.CallOptions;
@@ -152,7 +152,7 @@ public final S withDeadlineAfter(long duration, TimeUnit unit) {
   }
 
   public final S withDeadlineAfter(Duration duration) {
-    return withDeadlineAfter(convertToNanos(duration), TimeUnit.NANOSECONDS);
+    return withDeadlineAfter(convert(duration), TimeUnit.NANOSECONDS);
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`package io.grpc.stub;`
`18`	`18`
`19`	`19`	`import static com.google.common.base.Preconditions.checkNotNull;`
`20`		`-import static io.grpc.TimeUtils.convertToNanos;`
	`20`	`+import static io.grpc.InternalTimeUtils.convert;`
`21`	`21`
`22`	`22`	`import io.grpc.CallCredentials;`
`23`	`23`	`import io.grpc.CallOptions;`
`@@ -152,7 +152,7 @@ public final S withDeadlineAfter(long duration, TimeUnit unit) {`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`public final S withDeadlineAfter(Duration duration) {`
`155`		`- return withDeadlineAfter(convertToNanos(duration), TimeUnit.NANOSECONDS);`
	`155`	`+ return withDeadlineAfter(convert(duration), TimeUnit.NANOSECONDS);`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`/**`