platform bytes class

extensions/protokt-jvm-extensions-simple/src/main/kotlin/protokt/v1/UuidBytesConverter.kt

@@ -16,7 +16,6 @@
 package protokt.v1
 
 import com.google.auto.service.AutoService
-import protokt.v1.JvmBytes.asReadOnlyBuffer
 import protokt.v1.SizeCodecs.sizeOf
 import java.nio.ByteBuffer
 import java.util.UUID

protokt-runtime/api/protokt-runtime.api

@@ -452,6 +452,16 @@ public final class com/toasttab/protokt/rt/VarintVal : com/toasttab/protokt/rt/U
 	public fun toString ()Ljava/lang/String;
 }
 
+public abstract class protokt/v1/AbstractBytes {
+	public final fun equals (Ljava/lang/Object;)Z
+	public final fun getBytes ()[B
+	public final fun hashCode ()I
+	public final fun isEmpty ()Z
+	public final fun isNotEmpty ()Z
+	public final fun toBytesSlice ()Lprotokt/v1/BytesSlice;
+	public final fun toString ()Ljava/lang/String;
+}
+
 public abstract class protokt/v1/AbstractKtDeserializer : protokt/v1/KtDeserializer {
 	public fun <init> ()V
 	public synthetic fun deserialize (Lcom/google/protobuf/CodedInputStream;)Lcom/toasttab/protokt/rt/KtMessage;
@@ -483,22 +493,19 @@ public abstract class protokt/v1/AbstractKtMessage : protokt/v1/KtMessage {
 	public fun serialize (Ljava/io/OutputStream;)V
 }
 
-public final class protokt/v1/Bytes {
+public final class protokt/v1/Bytes : protokt/v1/AbstractBytes {
 	public static final field Companion Lprotokt/v1/Bytes$Companion;
+	public final fun asReadOnlyBuffer ()Ljava/nio/ByteBuffer;
 	public static final fun empty ()Lprotokt/v1/Bytes;
-	public fun equals (Ljava/lang/Object;)Z
+	public static final fun from (Ljava/io/InputStream;)Lprotokt/v1/Bytes;
 	public static final fun from (Lprotokt/v1/KtMessage;)Lprotokt/v1/Bytes;
 	public static final fun from ([B)Lprotokt/v1/Bytes;
-	public final fun getBytes ()[B
-	public fun hashCode ()I
-	public final fun isEmpty ()Z
-	public final fun isNotEmpty ()Z
-	public final fun toBytesSlice ()Lprotokt/v1/BytesSlice;
-	public fun toString ()Ljava/lang/String;
+	public final fun inputStream ()Ljava/io/InputStream;
 }
 
 public final class protokt/v1/Bytes$Companion {
 	public final fun empty ()Lprotokt/v1/Bytes;
+	public final fun from (Ljava/io/InputStream;)Lprotokt/v1/Bytes;
 	public final fun from (Lprotokt/v1/KtMessage;)Lprotokt/v1/Bytes;
 	public final fun from ([B)Lprotokt/v1/Bytes;
 }
@@ -561,13 +568,6 @@ public final class protokt/v1/Fixed64Val : protokt/v1/UnknownValue {
 	public final synthetic fun unbox-impl ()J
 }
 
-public final class protokt/v1/JvmBytes {
-	public static final field INSTANCE Lprotokt/v1/JvmBytes;
-	public static final fun asReadOnlyBuffer (Lprotokt/v1/Bytes;)Ljava/nio/ByteBuffer;
-	public static final fun from (Lprotokt/v1/Bytes$Companion;Ljava/io/InputStream;)Lprotokt/v1/Bytes;
-	public static final fun inputStream (Lprotokt/v1/Bytes;)Ljava/io/InputStream;
-}
-
 public abstract interface annotation class protokt/v1/KtBuilderDsl : java/lang/annotation/Annotation {
 }
 

protokt-runtime/src/commonMain/kotlin/protokt/v1/AbstractBytes.kt

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2023 Toast, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package protokt.v1
+
+abstract class AbstractBytes internal constructor(
+    internal val value: ByteArray
+) {
+    val bytes
+        get() = clone(value)
+
+    fun isNotEmpty() =
+        value.isNotEmpty()
+
+    fun isEmpty() =
+        value.isEmpty()
+
+    fun toBytesSlice() =
+        BytesSlice(value)
+
+    final override fun equals(other: Any?) =
+        other is Bytes && value.contentEquals(other.value)
+
+    final override fun hashCode() =
+        value.contentHashCode()
+
+    final override fun toString() =
+        value.contentToString()
+
+    internal companion object {
+        private val EMPTY = Bytes(ByteArray(0))
+
+        fun empty() =
+            EMPTY
+
+        fun from(bytes: ByteArray) =
+            Bytes(clone(bytes))
+
+        fun from(message: KtMessage) =
+            Bytes(message.serialize())
+    }
+}

protokt-runtime/src/commonMain/kotlin/protokt/v1/Bytes.kt

@@ -17,44 +17,18 @@ package protokt.v1
 
 import kotlin.jvm.JvmStatic
 
-class Bytes internal constructor(
-    internal val value: ByteArray
-) {
-    val bytes
-        get() = clone(value)
-
-    fun isNotEmpty() =
-        value.isNotEmpty()
-
-    fun isEmpty() =
-        value.isEmpty()
-
-    fun toBytesSlice() =
-        BytesSlice(value)
-
-    override fun equals(other: Any?) =
-        other is Bytes && value.contentEquals(other.value)
-
-    override fun hashCode() =
-        value.contentHashCode()
-
-    override fun toString() =
-        value.contentToString()
-
+expect class Bytes internal constructor(
+    value: ByteArray
+) : AbstractBytes {
     companion object {
-        private val EMPTY = Bytes(ByteArray(0))
-
         @JvmStatic
-        fun empty() =
-            EMPTY
+        fun empty(): Bytes
 
         @JvmStatic
-        fun from(bytes: ByteArray) =
-            Bytes(clone(bytes))
+        fun from(bytes: ByteArray): Bytes
 
         @JvmStatic
-        fun from(message: KtMessage) =
-            Bytes(message.serialize())
+        fun from(message: KtMessage): Bytes
     }
 }
 

protokt-runtime/src/jsMain/kotlin/protokt/v1/JsBytes.kt → protokt-runtime/src/jsMain/kotlin/protokt/v1/Bytes.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Toast, Inc.
+ * Copyright (c) 2023 Toast, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,5 +15,18 @@
 
 package protokt.v1
 
+actual class Bytes internal actual constructor(value: ByteArray) : AbstractBytes(value) {
+    actual companion object {
+        actual fun empty() =
+            AbstractBytes.empty()
+
+        actual fun from(bytes: ByteArray) =
+            AbstractBytes.from(bytes)
+
+        actual fun from(message: KtMessage) =
+            AbstractBytes.from(message)
+    }
+}
+
 internal actual fun clone(bytes: ByteArray) =
     bytes.copyOf()

protokt-runtime/src/jvmMain/kotlin/protokt/v1/JvmBytes.kt → protokt-runtime/src/jvmMain/kotlin/protokt/v1/Bytes.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Toast, Inc.
+ * Copyright (c) 2023 Toast, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,20 +17,33 @@ package protokt.v1
 
 import java.io.InputStream
 import java.nio.ByteBuffer
+import kotlin.jvm.JvmStatic
 
-internal actual fun clone(bytes: ByteArray) =
-    bytes.clone()
-
-object JvmBytes {
-    @JvmStatic
-    fun Bytes.asReadOnlyBuffer(): ByteBuffer =
+actual class Bytes internal actual constructor(value: ByteArray) : AbstractBytes(value) {
+    fun asReadOnlyBuffer(): ByteBuffer =
         ByteBuffer.wrap(value).asReadOnlyBuffer()
 
-    @JvmStatic
-    fun Bytes.inputStream(): InputStream =
+    fun inputStream(): InputStream =
         value.inputStream()
 
-    @JvmStatic
-    fun Bytes.Companion.from(stream: InputStream) =
-        Bytes(stream.readBytes())
+    actual companion object {
+        @JvmStatic
+        actual fun empty() =
+            AbstractBytes.empty()
+
+        @JvmStatic
+        actual fun from(bytes: ByteArray) =
+            AbstractBytes.from(bytes)
+
+        @JvmStatic
+        actual fun from(message: KtMessage) =
+            AbstractBytes.from(message)
+
+        @JvmStatic
+        fun from(stream: InputStream) =
+            AbstractBytes.from(stream.readBytes())
+    }
 }
+
+internal actual fun clone(bytes: ByteArray) =
+    bytes.clone()

testing/options-api/src/main/kotlin/protokt/v1/testing/Id.kt

@@ -18,7 +18,6 @@ package protokt.v1.testing
 import com.google.auto.service.AutoService
 import protokt.v1.Bytes
 import protokt.v1.Converter
-import protokt.v1.JvmBytes.from
 
 data class Id(val value: String)