Bump HashUtils

Author: LexManos

settings.gradle

@@ -21,10 +21,10 @@ dependencyResolutionManagement {
         library 'jtar', 'org.kamranzafar:jtar:2.3'
 
         library 'utils-download', 'net.minecraftforge', 'download-utils'  version '0.4.0'
-        library 'utils-hash', 'net.minecraftforge', 'hash-utils' version '0.1.9'
+        library 'utils-hash', 'net.minecraftforge', 'hash-utils' version '0.2.2'
         library 'utils-os', 'net.minecraftforge', 'os-utils' version '0.1.0'
         bundle 'utils', ['utils-download', 'utils-hash', 'utils-os']
     }
 }
 
-rootProject.name = 'java-provisioner'
+rootProject.name = 'java-provisioner'

src/main/java/net/minecraftforge/java_provisioner/Disco.java

@@ -22,8 +22,8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.EnumMap;
 import java.util.EnumSet;
+import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
@@ -286,15 +286,15 @@ public List<Package> getPackages(int version, OS os, Distro distro, Arch arch) {
     }
 
     public @Nullable File download(Package pkg) {
-        Map<HashFunction, String> checksums = new EnumMap<>(HashFunction.class);
+        Map<HashFunction, String> checksums = new IdentityHashMap<>();
         String download = pkg.links.pkg_download_redirect;
 
         //debug("Downloading " + pkg.filename);
         try {
             PackageInfo info = getInfo(pkg);
 
             if (info.checksum != null && info.checksum_type != null) {
-                HashFunction func = HashFunction.find(info.checksum_type);
+                HashFunction func = HashFunction.byName(info.checksum_type);
                 if (func != null)
                     checksums.put(func, info.checksum);
                 else
@@ -304,7 +304,7 @@ public List<Package> getPackages(int version, OS os, Distro distro, Arch arch) {
                     String raw = DownloadUtils.downloadString(info.checksum_uri);
 
                     String checksum = raw.split(" ")[0];
-                    HashFunction func = HashFunction.findByHash(checksum);
+                    HashFunction func = findByHash(checksum);
                     if (func != null)
                         checksums.put(func, checksum);
                     else
@@ -349,15 +349,15 @@ public List<Package> getPackages(int version, OS os, Distro distro, Arch arch) {
                     String actual = func.hash(archive);
                     String expected = entry.getValue();
                     if (expected.equals(actual)) {
-                        debug("  " + func.name() + " Validated");
+                        debug("  " + func.extension() + " Validated");
                     } else {
-                        debug("  " + func.name() + " Invalid");
+                        debug("  " + func.extension() + " Invalid");
                         debug("    Expected: " + expected);
                         debug("    Actual:   " + actual);
                         return null;
                     }
                 } catch (Exception e) {
-                    error("Failed to calculate " + func.name() + " checksum");
+                    error("Failed to calculate " + func.extension() + " checksum");
                     error(e);
                     return null;
                 }
@@ -369,6 +369,15 @@ public List<Package> getPackages(int version, OS os, Distro distro, Arch arch) {
         return archive;
     }
 
+    private HashFunction findByHash(String checksum) {
+        int len = checksum.length();
+        if (len == 32) return HashFunction.md5();
+        if (len == 40) return HashFunction.sha1();
+        if (len == 64) return HashFunction.sha256();
+        if (len == 128) return HashFunction.sha512();
+        return null;
+    }
+
     private File getExtractedDir(Package pkg) {
         String filename = pkg.filename;
         Archive format = pkg.archive();

src/main/java/net/minecraftforge/java_provisioner/DiscoLocator.java

@@ -8,8 +8,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
-
 import net.minecraftforge.java_provisioner.api.Distro;
 import net.minecraftforge.java_provisioner.api.JavaInstall;
 import net.minecraftforge.java_provisioner.api.JavaProvisioner;

src/main/java/net/minecraftforge/java_provisioner/GradleLocator.java

@@ -8,7 +8,6 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.regex.Pattern;
 
 import net.minecraftforge.java_provisioner.api.JavaInstall;

src/main/java/net/minecraftforge/java_provisioner/JavaVersion.java

@@ -5,8 +5,6 @@
 package net.minecraftforge.java_provisioner;
 
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.UnknownNullability;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -191,4 +189,4 @@ public String toString() {
     public int hashCode() {
         return this.str.hashCode();
     }
-}
+}

src/main/java/net/minecraftforge/java_provisioner/api/JavaProvisionerException.java

@@ -7,6 +7,7 @@
 import java.util.Collections;
 import java.util.List;
 
+@SuppressWarnings("serial")
 public class JavaProvisionerException extends Exception {
     private final List<String> logOutput;