From 94954657caec4ebf95c36e60f15e715f61ee7f52 Mon Sep 17 00:00:00 2001
From: Moritz Zwerger <bixilon@bixilon.de>
Date: Fri, 12 Jan 2024 14:39:55 +0100
Subject: [PATCH] deprecate some input stream methods

Ported to kutil 1.26
---
 src/main/java/de/bixilon/minosoft/assets/util/FileUtil.kt  | 1 +
 .../de/bixilon/minosoft/assets/util/InputStreamUtil.kt     | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/bixilon/minosoft/assets/util/FileUtil.kt b/src/main/java/de/bixilon/minosoft/assets/util/FileUtil.kt
index dabb3d67d..4a0e3a671 100644
--- a/src/main/java/de/bixilon/minosoft/assets/util/FileUtil.kt
+++ b/src/main/java/de/bixilon/minosoft/assets/util/FileUtil.kt
@@ -72,6 +72,7 @@ object FileUtil {
         throw IOException("Can not find temporary file after ${AssetsOptions.MAX_FILE_CHECKING} tries!")
     }
 
+    @Deprecated("kutil 1.26")
     fun InputStream.copy(vararg output: OutputStream, digest: MessageDigest?) {
         val buffer = ByteArray(BufferDefinition.DEFAULT_BUFFER_SIZE)
 
diff --git a/src/main/java/de/bixilon/minosoft/assets/util/InputStreamUtil.kt b/src/main/java/de/bixilon/minosoft/assets/util/InputStreamUtil.kt
index 69335cd6c..e00b5d48a 100644
--- a/src/main/java/de/bixilon/minosoft/assets/util/InputStreamUtil.kt
+++ b/src/main/java/de/bixilon/minosoft/assets/util/InputStreamUtil.kt
@@ -18,6 +18,7 @@ import com.fasterxml.jackson.databind.ObjectReader
 import com.fasterxml.jackson.module.kotlin.readValue
 import de.bixilon.kutil.buffer.BufferDefinition
 import de.bixilon.kutil.cast.CastUtil.unsafeCast
+import de.bixilon.kutil.exception.ExceptionUtil.ignoreAll
 import de.bixilon.kutil.json.JsonObject
 import de.bixilon.mbf.MBFBinaryReader
 import de.bixilon.minosoft.util.json.Jackson
@@ -27,6 +28,7 @@ import java.util.zip.ZipInputStream
 
 object InputStreamUtil {
 
+    @Deprecated("kutil 1.26")
     fun InputStream.readAsString(close: Boolean = true): String {
         val builder = StringBuilder()
 
@@ -89,7 +91,7 @@ object InputStreamUtil {
             content[entry.name] = stream.readAll()
         }
         // TODO: handle exception
-        if (close) close()
+        if (close) ignoreAll { close() }
         return content
     }
 
@@ -101,7 +103,7 @@ object InputStreamUtil {
             content[entry.name] = stream.readAll()
         }
         // TODO: handle exception
-        if (close) close()
+        if (close) ignoreAll { close() }
         return content
     }
 
@@ -109,6 +111,7 @@ object InputStreamUtil {
         return this.use { MBFBinaryReader(this).readMBF().data.unsafeCast() }
     }
 
+    @Deprecated("kutil 1.26")
     fun InputStream.readAll(close: Boolean = true): ByteArray {
         if (close) {
             return use { readAllBytes() }