Drive-by cleanup to remove unnecessary function from the ActionCache interface.

--
MOS_MIGRATED_REVID=129753109

7 files changed, 3 insertions, 75 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionCacheChecker.java b/src/main/java/com/google/devtools/build/lib/actions/ActionCacheChecker.java
index 4a977890a7..86cbd0a07f 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/ActionCacheChecker.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/ActionCacheChecker.java
@@ -219,8 +219,7 @@ public class ActionCacheChecker {
       // This cache entry has already been updated by a shared action. We don't need to do it again.
       return;
     }
-    ActionCache.Entry entry =
-        actionCache.createEntry(action.getKey(), action.discoversInputs());
+    ActionCache.Entry entry = new ActionCache.Entry(action.getKey(), action.discoversInputs());
     for (Artifact output : action.getOutputs()) {
       // Remove old records from the cache if they used different key.
       String execPath = output.getExecPathString();
@@ -298,7 +297,7 @@ public class ActionCacheChecker {
       // Compute the aggregated middleman digest.
       // Since we never validate action key for middlemen, we should not store
       // it in the cache entry and just use empty string instead.
-      entry = actionCache.createEntry("", false);
+      entry = new ActionCache.Entry("", false);
       for (Artifact input : action.getInputs()) {
         entry.addFile(input.getExecPath(), metadataHandler.getMetadataMaybe(input));
       }
diff --git a/src/main/java/com/google/devtools/build/lib/actions/cache/ActionCache.java b/src/main/java/com/google/devtools/build/lib/actions/cache/ActionCache.java
index d992fb6b13..b87dd846ab 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/cache/ActionCache.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/cache/ActionCache.java
@@ -61,12 +61,6 @@ public interface ActionCache {
   void remove(String key);
 
   /**
-   * Returns a new Entry instance. This method allows ActionCache subclasses to
-   * define their own Entry implementation.
-   */
-  ActionCache.Entry createEntry(String key, boolean discoversInputs);
-
-  /**
    * An entry in the ActionCache that contains all action input and output
    * artifact paths and their metadata plus action key itself.
    *
diff --git a/src/main/java/com/google/devtools/build/lib/actions/cache/CompactPersistentActionCache.java b/src/main/java/com/google/devtools/build/lib/actions/cache/CompactPersistentActionCache.java
index 5e1d7ca7c2..8cbfd7705b 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/cache/CompactPersistentActionCache.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/cache/CompactPersistentActionCache.java
@@ -239,11 +239,6 @@ public class CompactPersistentActionCache implements ActionCache {
   }
 
   @Override
-  public ActionCache.Entry createEntry(String key, boolean discoversInputs) {
-    return new ActionCache.Entry(key, discoversInputs);
-  }
-
-  @Override
   public ActionCache.Entry get(String key) {
     int index = indexer.getIndex(key);
     if (index < 0) {
diff --git a/src/main/java/com/google/devtools/build/lib/actions/cache/NullActionCache.java b/src/main/java/com/google/devtools/build/lib/actions/cache/NullActionCache.java
deleted file mode 100644
index f3f12de553..0000000000
--- a/src/main/java/com/google/devtools/build/lib/actions/cache/NullActionCache.java
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2014 The Bazel Authors. All rights reserved.
-//
-// 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 com.google.devtools.build.lib.actions.cache;
-
-import java.io.IOException;
-import java.io.PrintStream;
-
-/**
- * A no-op action cache that never caches anything.
- */
-public final class NullActionCache implements ActionCache {
-
-  @Override
-  public void put(String key, Entry entry) {
-  }
-
-  @Override
-  public Entry get(String key) {
-    return null;
-  }
-
-  @Override
-  public void remove(String key) {
-  }
-
-  @Override
-  public Entry createEntry(String key, boolean discoversInputs) {
-    return new ActionCache.Entry(key, discoversInputs);
-  }
-
-  @Override
-  public long save() throws IOException {
-    return 0;
-  }
-
-  @Override
-  public void dump(PrintStream out) {
-  }
-}
diff --git a/src/test/java/com/google/devtools/build/lib/actions/cache/CompactPersistentActionCacheTest.java b/src/test/java/com/google/devtools/build/lib/actions/cache/CompactPersistentActionCacheTest.java
index ff0dca21d9..41dfd5d4b3 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/cache/CompactPersistentActionCacheTest.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/cache/CompactPersistentActionCacheTest.java
@@ -217,7 +217,7 @@ public class CompactPersistentActionCacheTest {
   }
 
   private void putKey(String key, ActionCache ac, boolean discoversInputs) {
-    ActionCache.Entry entry = ac.createEntry(key, discoversInputs);
+    ActionCache.Entry entry = new ActionCache.Entry(key, discoversInputs);
     entry.getFileDigest();
     ac.put(key, entry);
   }
diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/ActionCacheTestHelper.java b/src/test/java/com/google/devtools/build/lib/actions/util/ActionCacheTestHelper.java
index 6b3b8a179a..eddd94d5b0 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/util/ActionCacheTestHelper.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/util/ActionCacheTestHelper.java
@@ -33,10 +33,6 @@ public class ActionCacheTestHelper {
       @Override
       public void remove(String key) {}
       @Override
-      public Entry createEntry(String key, boolean discoversInputs) {
-        return new ActionCache.Entry(key, discoversInputs);
-      }
-      @Override
       public long save() { return -1; }
       @Override
       public void dump(PrintStream out) { }
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
index 037a9e8620..0a2c7ddf06 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java
@@ -401,11 +401,6 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase {
       actionCache.remove(key);
     }
 
-    @Override
-    public Entry createEntry(String key, boolean discoversInputs) {
-      return new ActionCache.Entry(key, discoversInputs);
-    }
-
     public synchronized void reset() {
       actionCache.clear();
     }