Add more hash functions & fix build

DRSchlaubi · Jun 4, 2022 · feaba2a · feaba2a
1 parent 2914613
commit feaba2a
Show file tree

Hide file tree

Showing 7 changed files with 108 additions and 33 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/core/api/stdx-core.api b/core/api/stdx-core.api
@@ -7,13 +7,15 @@ public final class dev/schlaubi/stdx/core/CollectionUtilKt {
 	public static final fun onEach (Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;)V
 }
 
-public final class dev/schlaubi/stdx/core/PathUtilKt {
-	public static final fun parent (Ljava/nio/file/Path;I)Ljava/nio/file/Path;
-}
-
-public final class dev/schlaubi/stdx/core/StringUtilJvm {
+public final class dev/schlaubi/stdx/core/HashUtilJvm {
 	public static final fun hash (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+	public static final fun hash ([BLjava/lang/String;)Ljava/lang/String;
 	public static final fun sha256 (Ljava/lang/String;)Ljava/lang/String;
+	public static final fun sha256 ([B)Ljava/lang/String;
+}
+
+public final class dev/schlaubi/stdx/core/PathUtilKt {
+	public static final fun parent (Ljava/nio/file/Path;I)Ljava/nio/file/Path;
 }
 
 public final class dev/schlaubi/stdx/core/StringUtilKt {

diff --git a/core/src/jvmMain/kotlin/dev/schlaubi/stdx/core/HashUtil.kt b/core/src/jvmMain/kotlin/dev/schlaubi/stdx/core/HashUtil.kt
@@ -0,0 +1,44 @@
+@file:JvmName("HashUtilJvm")
+
+package dev.schlaubi.stdx.core
+
+import java.security.MessageDigest
+
+/**
+ * Hashes this [String] using `SHA-256`.
+ *
+ * @see hash
+ */
+public fun String.sha256(): String = hash("SHA-256")
+
+/**
+ * Hashes this [ByteArray] using `SHA-256`.
+ *
+ * @see hash
+ */
+public fun ByteArray.sha256(): String = hash("SHA-256")
+
+/**
+ * Hashes this [String] using [algorithm].
+ *
+ * @param algorithm the algorithm according to
+ * [the Java spec](https://docs.oracle.com/en/java/javase/18/docs/specs/security/standard-names.html#messagedigest-algorithms)
+ *
+ * @see MessageDigest.digest
+ */
+public fun String.hash(algorithm: String): String = toByteArray().hash(algorithm)
+
+/**
+ * Hashes this [ByteArray] using [algorithm].
+ *
+ * @param algorithm the algorithm according to
+ * [the Java spec](https://docs.oracle.com/en/java/javase/18/docs/specs/security/standard-names.html#messagedigest-algorithms)
+ *
+ * @see MessageDigest.digest
+ */
+public fun ByteArray.hash(algorithm: String): String {
+    return MessageDigest
+        .getInstance(algorithm)
+        .digest(this)
+        .fold("") { str, it -> str + "%02x".format(it) }
+}
diff --git a/core/src/jvmMain/kotlin/dev/schlaubi/stdx/core/StringUtil.kt b/core/src/jvmMain/kotlin/dev/schlaubi/stdx/core/StringUtil.kt
diff --git a/logging/build.gradle.kts b/logging/build.gradle.kts
@@ -22,7 +22,7 @@ kotlin {
                 api("io.github.microutils", "kotlin-logging", "2.1.21")
             }
         }
-        jvmTest {
+        findByName("jvmTest")?.apply {
             dependencies {
                 implementation("org.slf4j", "slf4j-simple", "1.7.36")
             }