From f9ba7f6880fb63a30a78e6f95efba6ab7a417aba Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 21 Sep 2015 16:26:38 +0300
Subject: [PATCH] Minor, inline ClassData#read & PackageData#read to single
 usage

---
 .../serialization/jvm/JvmProtoBufUtil.kt      | 23 +++++++++++++++----
 .../kotlin/serialization/ClassData.java       | 18 ---------------
 .../kotlin/serialization/PackageData.java     | 18 ---------------
 3 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.kt
index 0fdcbf9ba82..e545aa5bf3f 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.kt
@@ -19,6 +19,9 @@ package org.jetbrains.kotlin.serialization.jvm
 import com.google.protobuf.ExtensionRegistryLite
 import org.jetbrains.kotlin.serialization.ClassData
 import org.jetbrains.kotlin.serialization.PackageData
+import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
+import java.io.ByteArrayInputStream
 
 public object JvmProtoBufUtil {
     public val EXTENSION_REGISTRY: ExtensionRegistryLite = run {
@@ -28,14 +31,26 @@ public object JvmProtoBufUtil {
     }
 
     @JvmStatic
-    public fun readClassDataFrom(encodedData: Array<String>): ClassData = readClassDataFrom(BitEncoding.decodeBytes(encodedData))
+    public fun readClassDataFrom(data: Array<String>): ClassData =
+            readClassDataFrom(BitEncoding.decodeBytes(data))
 
     @JvmStatic
-    public fun readClassDataFrom(data: ByteArray): ClassData = ClassData.read(data, EXTENSION_REGISTRY)
+    public fun readClassDataFrom(bytes: ByteArray): ClassData {
+        val input = ByteArrayInputStream(bytes)
+        val nameResolver = NameResolver.read(input)
+        val classProto = ProtoBuf.Class.parseFrom(input, EXTENSION_REGISTRY)
+        return ClassData(nameResolver, classProto)
+    }
 
     @JvmStatic
-    public fun readPackageDataFrom(encodedData: Array<String>): PackageData = readPackageDataFrom(BitEncoding.decodeBytes(encodedData))
+    public fun readPackageDataFrom(data: Array<String>): PackageData =
+            readPackageDataFrom(BitEncoding.decodeBytes(data))
 
     @JvmStatic
-    public fun readPackageDataFrom(data: ByteArray): PackageData = PackageData.read(data, EXTENSION_REGISTRY)
+    public fun readPackageDataFrom(bytes: ByteArray): PackageData {
+        val input = ByteArrayInputStream(bytes)
+        val nameResolver = NameResolver.read(input)
+        val packageProto = ProtoBuf.Package.parseFrom(input, EXTENSION_REGISTRY)
+        return PackageData(nameResolver, packageProto)
+    }
 }
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/ClassData.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/ClassData.java
index 4b1cb45d891..af133042917 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/ClassData.java
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/ClassData.java
@@ -16,28 +16,10 @@
 
 package org.jetbrains.kotlin.serialization;
 
-import com.google.protobuf.ExtensionRegistryLite;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.serialization.deserialization.NameResolver;
-import org.jetbrains.kotlin.utils.UtilsPackage;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
 
 public final class ClassData {
-    @NotNull
-    public static ClassData read(@NotNull byte[] bytes, @NotNull ExtensionRegistryLite registry) {
-        try {
-            ByteArrayInputStream in = new ByteArrayInputStream(bytes);
-            NameResolver nameResolver = NameResolver.read(in);
-            ProtoBuf.Class classProto = ProtoBuf.Class.parseFrom(in, registry);
-            return new ClassData(nameResolver, classProto);
-        }
-        catch (IOException e) {
-            throw UtilsPackage.rethrow(e);
-        }
-    }
-
     private final NameResolver nameResolver;
     private final ProtoBuf.Class classProto;
 
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/PackageData.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/PackageData.java
index 2d1cf45a97c..3d109be7961 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/PackageData.java
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/PackageData.java
@@ -16,28 +16,10 @@
 
 package org.jetbrains.kotlin.serialization;
 
-import com.google.protobuf.ExtensionRegistryLite;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.serialization.deserialization.NameResolver;
-import org.jetbrains.kotlin.utils.UtilsPackage;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
 
 public final class PackageData {
-    @NotNull
-    public static PackageData read(@NotNull byte[] bytes, @NotNull ExtensionRegistryLite registry) {
-        try {
-            ByteArrayInputStream in = new ByteArrayInputStream(bytes);
-            NameResolver nameResolver = NameResolver.read(in);
-            ProtoBuf.Package packageProto = ProtoBuf.Package.parseFrom(in, registry);
-            return new PackageData(nameResolver, packageProto);
-        }
-        catch (IOException e) {
-            throw UtilsPackage.rethrow(e);
-        }
-    }
-
     private final NameResolver nameResolver;
     private final ProtoBuf.Package packageProto;