Make Metadata an interface for FileArtifactValue

Replace all previous uses of Metadata with FileArtifactValue (or a simple inner
class in the case of ActionCacheChecker.CONSTANT_METADATA).

Care was taken to make the equals method obey the equals contract, even in the
presence of multiple implementations.

PiperOrigin-RevId: 160115080

2 files changed, 2 insertions, 46 deletions

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 c2bf185d29..dfadf2072f 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
@@ -17,6 +17,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.devtools.build.lib.skyframe.FileArtifactValue;
 import com.google.devtools.build.lib.testutil.Scratch;
 import com.google.devtools.build.lib.util.Clock;
 import com.google.devtools.build.lib.vfs.Path;
@@ -157,7 +158,7 @@ public class CompactPersistentActionCacheTest {
     ActionCache.Entry entry =
         new ActionCache.Entry("actionKey", ImmutableMap.<String, String>of(), false);
     entry.toString();
-    entry.addFile(PathFragment.create("foo/bar"), Metadata.CONSTANT_METADATA);
+    entry.addFile(PathFragment.create("foo/bar"), FileArtifactValue.createDirectory(1234));
     entry.toString();
     entry.getFileDigest();
     entry.toString();
diff --git a/src/test/java/com/google/devtools/build/lib/actions/cache/MetadataTest.java b/src/test/java/com/google/devtools/build/lib/actions/cache/MetadataTest.java
deleted file mode 100644
index 545871363a..0000000000
--- a/src/test/java/com/google/devtools/build/lib/actions/cache/MetadataTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2015 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 com.google.common.io.BaseEncoding;
-import com.google.common.testing.EqualsTester;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public class MetadataTest {
-
-  private static byte[] toBytes(String hex) {
-    return BaseEncoding.base16().upperCase().decode(hex);
-  }
-
-  @Test
-  public void testEqualsAndHashCode() throws Exception {
-    // Each "equality group" is checked for equality within itself (including hashCode equality)
-    // and inequality with members of other equality groups.
-    new EqualsTester()
-        .addEqualityGroup(new Metadata(toBytes("00112233445566778899AABBCCDDEEFF")),
-                          new Metadata(toBytes("00112233445566778899AABBCCDDEEFF")))
-        .addEqualityGroup(new Metadata(1))
-        .addEqualityGroup(new Metadata(toBytes("FFFFFF00000000000000000000000000")))
-        .addEqualityGroup(new Metadata(2),
-                          new Metadata(2))
-        .addEqualityGroup("a string")
-        .testEquals();
-  }
-}