From 17e04b2665580bd0a798bd13d5ad72ad9d9157e0 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Mon, 6 Aug 2018 22:22:53 +0300
Subject: [PATCH] Deprecate readBytes with estimatedSize parameter, add
 overload without parameters

Add a test for readBytes.

#KT-19305 Fixed
---
 .../stdlib/jvm/src/kotlin/io/IOStreams.kt     | 16 +++++++++++++-
 libraries/stdlib/jvm/test/io/IOStreams.kt     | 22 +++++++++++++++++++
 .../kotlin-stdlib-runtime-merged.txt          |  1 +
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/libraries/stdlib/jvm/src/kotlin/io/IOStreams.kt b/libraries/stdlib/jvm/src/kotlin/io/IOStreams.kt
index b69b567cf41..0f642753b0f 100644
--- a/libraries/stdlib/jvm/src/kotlin/io/IOStreams.kt
+++ b/libraries/stdlib/jvm/src/kotlin/io/IOStreams.kt
@@ -117,8 +117,22 @@ public fun InputStream.copyTo(out: OutputStream, bufferSize: Int = DEFAULT_BUFFE
  *
  * **Note**: It is the caller's responsibility to close this stream.
  */
+@Deprecated("Use readBytes() overload without estimatedSize parameter", ReplaceWith("readBytes()"))
+// TODO: Add DeprecatedSince when available
 public fun InputStream.readBytes(estimatedSize: Int = DEFAULT_BUFFER_SIZE): ByteArray {
-    val buffer = ByteArrayOutputStream(Math.max(estimatedSize, this.available()))
+    val buffer = ByteArrayOutputStream(maxOf(estimatedSize, this.available()))
+    copyTo(buffer)
+    return buffer.toByteArray()
+}
+
+/**
+ * Reads this stream completely into a byte array.
+ *
+ * **Note**: It is the caller's responsibility to close this stream.
+ */
+@SinceKotlin("1.3")
+public fun InputStream.readBytes(): ByteArray {
+    val buffer = ByteArrayOutputStream(maxOf(DEFAULT_BUFFER_SIZE, this.available()))
     copyTo(buffer)
     return buffer.toByteArray()
 }
diff --git a/libraries/stdlib/jvm/test/io/IOStreams.kt b/libraries/stdlib/jvm/test/io/IOStreams.kt
index 7fa9b61469c..3dbacab0639 100644
--- a/libraries/stdlib/jvm/test/io/IOStreams.kt
+++ b/libraries/stdlib/jvm/test/io/IOStreams.kt
@@ -8,6 +8,7 @@ package test.io
 import kotlin.test.*
 import java.io.Writer
 import java.io.BufferedReader
+import kotlin.random.Random
 
 class IOStreamsTest {
     @Test fun testGetStreamOfFile() {
@@ -43,4 +44,25 @@ class IOStreamsTest {
 
         assertEquals(x.asList(), result)
     }
+
+    @Test fun readWriteBytes() {
+        val file = createTempFile("temp", Random.nextLong().toString())
+        try {
+            val bytes = Random.nextBytes(256_000)
+
+            file.outputStream().use { outStream ->
+                outStream.write(bytes)
+            }
+
+            val inBytes = file.inputStream().use { inStream ->
+                inStream.readBytes()
+            }
+
+            assertTrue(inBytes contentEquals bytes, "Expected to read the same content back, read bytes of length ${inBytes.size}")
+
+        } finally {
+            file.delete()
+        }
+    }
+
 }
diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt
index 9434ae3739c..03ed489c92a 100644
--- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt
+++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt
@@ -2913,6 +2913,7 @@ public final class kotlin/io/ByteStreamsKt {
 	public static final fun copyTo (Ljava/io/InputStream;Ljava/io/OutputStream;I)J
 	public static synthetic fun copyTo$default (Ljava/io/InputStream;Ljava/io/OutputStream;IILjava/lang/Object;)J
 	public static final fun iterator (Ljava/io/BufferedInputStream;)Lkotlin/collections/ByteIterator;
+	public static final fun readBytes (Ljava/io/InputStream;)[B
 	public static final fun readBytes (Ljava/io/InputStream;I)[B
 	public static synthetic fun readBytes$default (Ljava/io/InputStream;IILjava/lang/Object;)[B
 }