GH-1902 Save generated checksums as hex (Fix #1902)

dzikoysk · Aug 8, 2023 · 959744d · 959744d
1 parent 40394a7
commit 959744d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/maven/Repository.kt b/reposilite-backend/src/main/kotlin/com/reposilite/maven/Repository.kt
@@ -46,10 +46,10 @@ class Repository internal constructor(
         val sha256 = location.resolveSibling(location.getSimpleName() + ".sha256")
         val sha512 = location.resolveSibling(location.getSimpleName() + ".sha512")
 
-        return storageProvider.putFile(md5, DigestUtils.md5(bytes).inputStream())
-            .flatMap { storageProvider.putFile(sha1, DigestUtils.sha1(bytes).inputStream()) }
-            .flatMap { storageProvider.putFile(sha256, DigestUtils.sha256(bytes).inputStream()) }
-            .flatMap { storageProvider.putFile(sha512, DigestUtils.sha512(bytes).inputStream()) }
+        return storageProvider.putFile(md5, DigestUtils.md5Hex(bytes).byteInputStream())
+            .flatMap { storageProvider.putFile(sha1, DigestUtils.sha1Hex(bytes).byteInputStream()) }
+            .flatMap { storageProvider.putFile(sha256, DigestUtils.sha256Hex(bytes).byteInputStream()) }
+            .flatMap { storageProvider.putFile(sha512, DigestUtils.sha512Hex(bytes).byteInputStream()) }
     }
 
     @Deprecated(message = "Use Repository#storageProvider")

diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/storage/api/Location.kt b/reposilite-backend/src/main/kotlin/com/reposilite/storage/api/Location.kt
@@ -90,7 +90,10 @@ data class Location private constructor(private val uri: String) {
         uri.substringAfterLast(delimiter, defaultValue ?: uri).toLocation()
 
     fun getParent(): Location =
-        uri.substringBeforeLast("/").toLocation()
+        when (uri.contains("/")) {
+            true -> uri.substringBeforeLast("/").toLocation()
+            else -> empty()
+        }
 
     fun getExtension(): String =
         getSimpleName().getExtension()

diff --git a/...-plugins/checksum-plugin/src/main/kotlin/com/reposilite/plugin/checksum/ChecksumPlugin.kt b/...-plugins/checksum-plugin/src/main/kotlin/com/reposilite/plugin/checksum/ChecksumPlugin.kt
@@ -71,14 +71,14 @@ class ChecksumPlugin : ReposilitePlugin() {
 
             val generatedChecksum = data.use {
                 when (checksum) {
-                    MD5 -> DigestUtils.md5(data)
-                    SHA1 -> DigestUtils.sha1(data)
-                    SHA256 -> DigestUtils.sha256(data)
-                    SHA512 -> DigestUtils.sha512(data)
+                    MD5 -> DigestUtils.md5Hex(data)
+                    SHA1 -> DigestUtils.sha1Hex(data)
+                    SHA256 -> DigestUtils.sha256Hex(data)
+                    SHA512 -> DigestUtils.sha512Hex(data)
                 }
             }
 
-            repository.storageProvider.putFile(checksumGav, generatedChecksum.inputStream())
+            repository.storageProvider.putFile(checksumGav, generatedChecksum.byteInputStream())
                 .peek { logger.debug("Checksum | Generated checksum ${checksum.name} for $file") }
                 .onError { logger.debug("Checksum | Cannot generate checksum ${checksum.name} for $file due to $it") }
         }