refactor: Port remaining code to kotlin.io.encoding.Base64

Signed-off-by: Sebastian Schuberth <[email protected]>
oss-review-toolkit · Aug 24, 2024 · c309ada · c309ada
1 parent fe0a41c
commit c309ada
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/plugins/package-managers/bazel/src/main/kotlin/Bazel.kt b/plugins/package-managers/bazel/src/main/kotlin/Bazel.kt
@@ -21,7 +21,8 @@ package org.ossreviewtoolkit.plugins.packagemanagers.bazel
 
 import java.io.File
 import java.net.URI
-import java.util.Base64
+
+import kotlin.io.encoding.Base64
 
 import org.apache.logging.log4j.kotlin.logger
 
@@ -306,7 +307,7 @@ class Bazel(
 
             val hash = archiveOverride.integrity?.let { integrity ->
                 val (algo, b64digest) = integrity.split('-', limit = 2)
-                val digest = Base64.getDecoder().decode(b64digest).toHexString()
+                val digest = Base64.decode(b64digest).toHexString()
                 Hash(
                     value = digest,
                     algorithm = HashAlgorithm.fromString(algo)
@@ -420,7 +421,7 @@ private fun ModuleMetadata.toVcsInfo() =
 
 private fun ModuleSourceInfo.toRemoteArtifact(): RemoteArtifact {
     val (algo, b64digest) = integrity.split("-", limit = 2)
-    val digest = Base64.getDecoder().decode(b64digest).toHexString()
+    val digest = Base64.decode(b64digest).toHexString()
 
     val hash = Hash(
         value = digest,

diff --git a/plugins/reporters/web-app/src/main/kotlin/WebAppReporter.kt b/plugins/reporters/web-app/src/main/kotlin/WebAppReporter.kt
@@ -21,9 +21,11 @@ package org.ossreviewtoolkit.plugins.reporters.webapp
 
 import java.io.File
 import java.io.FileOutputStream
-import java.util.Base64
 import java.util.zip.Deflater
 
+import kotlin.io.encoding.Base64
+import kotlin.io.encoding.encodingWith
+
 import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream
 import org.apache.commons.compress.compressors.gzip.GzipParameters
 
@@ -71,7 +73,7 @@ class WebAppReporter : Reporter {
             outputFile.writeText(prefix)
 
             FileOutputStream(outputFile, /* append = */ true).use { outputStream ->
-                val b64OutputStream = Base64.getEncoder().wrap(outputStream)
+                val b64OutputStream = outputStream.encodingWith(Base64.Mime)
 
                 val gzipParameters = GzipParameters().apply {
                     compressionLevel = Deflater.BEST_COMPRESSION