Stop super-sourcing System.nanoTime usages as the API was available s…

…ince 2021. RELNOTES=n/a PiperOrigin-RevId: 534596151
google · May 23, 2023 · 9407ed6 · 9407ed6
1 parent 7c473d8
commit 9407ed6
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 24 deletions.
diff --git a/android/guava/src/com/google/common/base/Platform.java b/android/guava/src/com/google/common/base/Platform.java
@@ -36,12 +36,6 @@ final class Platform {
 
   private Platform() {}
 
-  /** Calls {@link System#nanoTime()}. */
-  @SuppressWarnings("GoodTime") // reading system time without TimeSource
-  static long systemNanoTime() {
-    return System.nanoTime();
-  }
-
   static CharMatcher precomputeCharMatcher(CharMatcher matcher) {
     return matcher.precomputedInternal();
   }

diff --git a/android/guava/src/com/google/common/base/Suppliers.java b/android/guava/src/com/google/common/base/Suppliers.java
@@ -245,6 +245,7 @@ static class ExpiringMemoizingSupplier<T extends @Nullable Object>
 
     @Override
     @ParametricNullness
+    @SuppressWarnings("GoodTime") // reading system time without TimeSource
     public T get() {
       // Another variant of Double Checked Locking.
       //
@@ -253,7 +254,7 @@ public T get() {
       // the extra memory consumption and indirection are more
       // expensive than the extra volatile reads.
       long nanos = expirationNanos;
-      long now = Platform.systemNanoTime();
+      long now = System.nanoTime();
       if (nanos == 0 || now - nanos >= 0) {
         synchronized (this) {
           if (nanos == expirationNanos) { // recheck for lost race

diff --git a/android/guava/src/com/google/common/base/Ticker.java b/android/guava/src/com/google/common/base/Ticker.java
@@ -48,8 +48,9 @@ public static Ticker systemTicker() {
   private static final Ticker SYSTEM_TICKER =
       new Ticker() {
         @Override
+        @SuppressWarnings("GoodTime") // reading system time without TimeSource
         public long read() {
-          return Platform.systemNanoTime();
+          return System.nanoTime();
         }
       };
 }
diff --git a/guava-gwt/src-super/com/google/common/base/super/com/google/common/base/Platform.java b/guava-gwt/src-super/com/google/common/base/super/com/google/common/base/Platform.java
@@ -18,7 +18,6 @@
 
 import static jsinterop.annotations.JsPackage.GLOBAL;
 
-import java.util.concurrent.TimeUnit;
 import jsinterop.annotations.JsMethod;
 import jsinterop.annotations.JsType;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -33,13 +32,6 @@ static CharMatcher precomputeCharMatcher(CharMatcher matcher) {
     return matcher;
   }
 
-  @SuppressWarnings("GoodTime") // reading system time without TimeSource
-  static long systemNanoTime() {
-    // System.nanoTime() is not available in GWT, so we get milliseconds
-    // and convert to nanos.
-    return TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis());
-  }
-
   static <T extends Enum<T>> Optional<T> getEnumIfPresent(Class<T> enumClass, String value) {
     try {
       return Optional.of(Enum.valueOf(enumClass, value));

diff --git a/guava/src/com/google/common/base/Platform.java b/guava/src/com/google/common/base/Platform.java
@@ -36,12 +36,6 @@ final class Platform {
 
   private Platform() {}
 
-  /** Calls {@link System#nanoTime()}. */
-  @SuppressWarnings("GoodTime") // reading system time without TimeSource
-  static long systemNanoTime() {
-    return System.nanoTime();
-  }
-
   static CharMatcher precomputeCharMatcher(CharMatcher matcher) {
     return matcher.precomputedInternal();
   }

diff --git a/guava/src/com/google/common/base/Suppliers.java b/guava/src/com/google/common/base/Suppliers.java
@@ -245,6 +245,7 @@ static class ExpiringMemoizingSupplier<T extends @Nullable Object>
 
     @Override
     @ParametricNullness
+    @SuppressWarnings("GoodTime") // reading system time without TimeSource
     public T get() {
       // Another variant of Double Checked Locking.
       //
@@ -253,7 +254,7 @@ public T get() {
       // the extra memory consumption and indirection are more
       // expensive than the extra volatile reads.
       long nanos = expirationNanos;
-      long now = Platform.systemNanoTime();
+      long now = System.nanoTime();
       if (nanos == 0 || now - nanos >= 0) {
         synchronized (this) {
           if (nanos == expirationNanos) { // recheck for lost race

diff --git a/guava/src/com/google/common/base/Ticker.java b/guava/src/com/google/common/base/Ticker.java
@@ -48,8 +48,9 @@ public static Ticker systemTicker() {
   private static final Ticker SYSTEM_TICKER =
       new Ticker() {
         @Override
+        @SuppressWarnings("GoodTime") // reading system time without TimeSource
         public long read() {
-          return Platform.systemNanoTime();
+          return System.nanoTime();
         }
       };
 }