From d7af1ee8740e4a8271cb3db86850110fadff6ea7 Mon Sep 17 00:00:00 2001
From: zpencer <spencerfang@google.com>
Date: Thu, 25 Oct 2018 10:00:55 -0700
Subject: [PATCH] core: fix FakeClock, SynchronizationContext lints (#4991)

Fix lints for import.

Remove unused vars. Make path and package match so tests run
successfully internally.
---
 core/src/main/java/io/grpc/SynchronizationContext.java     | 3 ---
 core/src/test/java/io/grpc/SynchronizationContextTest.java | 4 ++--
 core/src/test/java/io/grpc/internal/FakeClock.java         | 2 --
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/io/grpc/SynchronizationContext.java b/core/src/main/java/io/grpc/SynchronizationContext.java
index 21f32a37e8..55ee8873c6 100644
--- a/core/src/main/java/io/grpc/SynchronizationContext.java
+++ b/core/src/main/java/io/grpc/SynchronizationContext.java
@@ -25,7 +25,6 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
-import java.util.logging.Logger;
 import javax.annotation.concurrent.GuardedBy;
 import javax.annotation.concurrent.ThreadSafe;
 
@@ -52,8 +51,6 @@ import javax.annotation.concurrent.ThreadSafe;
 @ThreadSafe
 @ExperimentalApi("https://github.com/grpc/grpc-java/issues/4984")
 public final class SynchronizationContext implements Executor {
-  private static final Logger log = Logger.getLogger(SynchronizationContext.class.getName());
-
   private final Object lock = new Object();
   private final UncaughtExceptionHandler uncaughtExceptionHandler;
 
diff --git a/core/src/test/java/io/grpc/SynchronizationContextTest.java b/core/src/test/java/io/grpc/SynchronizationContextTest.java
index f43cd7299a..477e4e57db 100644
--- a/core/src/test/java/io/grpc/SynchronizationContextTest.java
+++ b/core/src/test/java/io/grpc/SynchronizationContextTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.grpc.internal;
+package io.grpc;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertSame;
@@ -24,8 +24,8 @@ import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
-import io.grpc.SynchronizationContext;
 import io.grpc.SynchronizationContext.ScheduledHandle;
+import io.grpc.internal.FakeClock;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
diff --git a/core/src/test/java/io/grpc/internal/FakeClock.java b/core/src/test/java/io/grpc/internal/FakeClock.java
index 9aeffedbac..ff2d90ee73 100644
--- a/core/src/test/java/io/grpc/internal/FakeClock.java
+++ b/core/src/test/java/io/grpc/internal/FakeClock.java
@@ -81,7 +81,6 @@ public final class FakeClock {
   public class ScheduledTask extends AbstractFuture<Void> implements ScheduledFuture<Void> {
     public final Runnable command;
     public final long dueTimeNanos;
-    private boolean hasRun;
 
     ScheduledTask(long dueTimeNanos, Runnable command) {
       this.dueTimeNanos = dueTimeNanos;
@@ -244,7 +243,6 @@ public final class FakeClock {
       }
       ScheduledTask task;
       while ((task = dueTasks.poll()) != null) {
-        task.hasRun = true;
         task.command.run();
         task.complete();
         count++;