Rename GrpcActionCache to GrpcRemoteCache

PiperOrigin-RevId: 160872755

5 files changed, 7 insertions, 9 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/remote/GrpcActionCache.java b/src/main/java/com/google/devtools/build/lib/remote/GrpcRemoteCache.java
index 5d7ab862e2..d077cbcf8f 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/GrpcActionCache.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/GrpcRemoteCache.java
@@ -74,7 +74,7 @@ import java.util.concurrent.atomic.AtomicReference;
 
 /** A RemoteActionCache implementation that uses gRPC calls to a remote cache server. */
 @ThreadSafe
-public class GrpcActionCache implements RemoteActionCache {
+public class GrpcRemoteCache implements RemoteActionCache {
   private final RemoteOptions options;
   private final ChannelOptions channelOptions;
   private final Channel channel;
@@ -86,7 +86,7 @@ public class GrpcActionCache implements RemoteActionCache {
   private final Supplier<ActionCacheBlockingStub> acBlockingStub;
 
   @VisibleForTesting
-  public GrpcActionCache(Channel channel, ChannelOptions channelOptions, RemoteOptions options) {
+  public GrpcRemoteCache(Channel channel, ChannelOptions channelOptions, RemoteOptions options) {
     this.options = options;
     this.channelOptions = channelOptions;
     this.channel = channel;
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteActionContextProvider.java
index 29789cea13..af0f1a81d4 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteActionContextProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteActionContextProvider.java
@@ -33,7 +33,6 @@ import com.google.devtools.build.lib.standalone.StandaloneSpawnStrategy;
  */
 final class RemoteActionContextProvider extends ActionContextProvider {
   private final CommandEnvironment env;
-  private ActionInputPrefetcher actionInputPrefetcher;
   private RemoteSpawnStrategy spawnStrategy;
 
   RemoteActionContextProvider(CommandEnvironment env) {
@@ -43,7 +42,6 @@ final class RemoteActionContextProvider extends ActionContextProvider {
   @Override
   public void init(
       ActionInputFileCache actionInputFileCache, ActionInputPrefetcher actionInputPrefetcher) {
-    this.actionInputPrefetcher = Preconditions.checkNotNull(actionInputPrefetcher);
     ExecutionOptions executionOptions = env.getOptions().getOptions(ExecutionOptions.class);
     LocalExecutionOptions localExecutionOptions =
         env.getOptions().getOptions(LocalExecutionOptions.class);
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java
index d3fd125dfb..63ef0b6337 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java
@@ -104,6 +104,6 @@ public final class RemoteModule extends BlazeModule {
 
   public static boolean remoteEnabled(RemoteOptions options) {
     return SimpleBlobStoreFactory.isRemoteCacheOptions(options)
-        || GrpcActionCache.isRemoteCacheOptions(options);
+        || GrpcRemoteCache.isRemoteCacheOptions(options);
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java
index d70dc15937..46485771d4 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java
@@ -53,13 +53,13 @@ final class RemoteSpawnRunner implements SpawnRunner {
   private final Platform platform;
 
   private final GrpcRemoteExecutor executor;
-  private final GrpcActionCache remoteCache;
+  private final GrpcRemoteCache remoteCache;
 
   RemoteSpawnRunner(
       Path execRoot,
       RemoteOptions options,
       GrpcRemoteExecutor executor,
-      GrpcActionCache remoteCache) {
+      GrpcRemoteCache remoteCache) {
     this.execRoot = execRoot;
     this.options = options;
     if (options.experimentalRemotePlatformOverride != null) {
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java
index 8426ae3864..49eb04c938 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java
@@ -103,9 +103,9 @@ final class RemoteSpawnStrategy implements SpawnActionContext {
     // action to enable server-side parallelism (need a different gRPC channel per action).
     if (SimpleBlobStoreFactory.isRemoteCacheOptions(remoteOptions)) {
       remoteCache = new SimpleBlobStoreActionCache(SimpleBlobStoreFactory.create(remoteOptions));
-    } else if (GrpcActionCache.isRemoteCacheOptions(remoteOptions)) {
+    } else if (GrpcRemoteCache.isRemoteCacheOptions(remoteOptions)) {
       remoteCache =
-          new GrpcActionCache(
+          new GrpcRemoteCache(
               GrpcUtils.createChannel(remoteOptions.remoteCache, channelOptions),
               channelOptions,
               remoteOptions);