Use the JRE for hashing, not guava (#429)

bazelbuild · Jul 1, 2020 · a7b4e46 · a7b4e46
1 parent dd13fea
commit a7b4e46
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/private/rules/maven_project_jar.bzl b/private/rules/maven_project_jar.bzl
@@ -87,7 +87,6 @@ single artifact that other teams can download and use.
             executable = True,
             cfg = "host",
             default = "//private/tools/java/rules/jvm/external/jar:MergeJars",
-            allow_files = True,
         ),
         "_java_toolchain": attr.label(
             default = "@bazel_tools//tools/jdk:current_java_toolchain",

diff --git a/private/tools/java/rules/jvm/external/BUILD.bazel b/private/tools/java/rules/jvm/external/BUILD.bazel
@@ -3,6 +3,7 @@ java_library(
     srcs = ["ByteStreams.java"],
     visibility = [
         "//private/tools/java/rules/jvm/external:__subpackages__",
+        "//tests/com/jvm/external:__subpackages__",
     ]
 )
 

diff --git a/private/tools/java/rules/jvm/external/jar/DuplicateEntryStrategy.java b/private/tools/java/rules/jvm/external/jar/DuplicateEntryStrategy.java
@@ -1,15 +1,14 @@
 package rules.jvm.external.jar;
 
-import com.google.common.hash.HashCode;
-import com.google.common.hash.HashFunction;
-import com.google.common.hash.Hashing;
-import com.google.common.io.ByteStreams;
+import rules.jvm.external.ByteStreams;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 
 import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING;
@@ -34,12 +33,10 @@ public void resolve(Path current, InputStream inputStreamForDuplicate) {
   IS_ERROR("are-errors") {
     @Override
     public void resolve(Path current, InputStream inputStreamForDuplicate) throws IOException {
-      HashFunction hashFunction = Hashing.goodFastHash(64);
+      byte[] first = hash(Files.readAllBytes(current));
+      byte[] second = hash(ByteStreams.toByteArray(inputStreamForDuplicate));
 
-      HashCode first = hashFunction.hashBytes(Files.readAllBytes(current));
-      HashCode second = hashFunction.hashBytes(ByteStreams.toByteArray(inputStreamForDuplicate));
-
-      if (first.equals(second)) {
+      if (Arrays.equals(first, second)) {
         return;
       }
       throw new IOException("Attempt to write different duplicate file for: " + current);
@@ -69,4 +66,14 @@ public String toString() {
   }
 
   public abstract void resolve(Path current, InputStream inputStreamForDuplicate) throws IOException;
+
+  protected byte[] hash(byte[] bytes) {
+    try {
+      MessageDigest digest = MessageDigest.getInstance("SHA-1");
+      digest.update(bytes);
+      return digest.digest();
+    } catch (NoSuchAlgorithmException e) {
+      throw new RuntimeException(e);
+    }
+  }
 }
diff --git a/tests/com/jvm/external/jar/BUILD b/tests/com/jvm/external/jar/BUILD
@@ -5,6 +5,7 @@ java_test(
     test_class = "com.jvm.external.jar.MergeJarsTest",
     srcs = ["MergeJarsTest.java"],
     deps = [
+        "//private/tools/java/rules/jvm/external:byte-streams",
         "//private/tools/java/rules/jvm/external/jar:MergeJars",
         "//private/tools/java/rules/jvm/external/zip",
         artifact("com.google.guava:guava"),