Drop ClassData and PackageData, rename ClassDataWithSource -> ClassData

Use pairs in JvmProtoBufUtil for simplicity

core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoDatas.kt

@@ -1,36 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * 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 org.jetbrains.kotlin.serialization
-
-import org.jetbrains.kotlin.descriptors.SourceElement
-import org.jetbrains.kotlin.metadata.ProtoBuf
-import org.jetbrains.kotlin.serialization.deserialization.NameResolver
-
-data class ClassData(
-        val nameResolver: NameResolver,
-        val classProto: ProtoBuf.Class
-)
-
-data class ClassDataWithSource(
-        val classData: ClassData,
-        val sourceElement: SourceElement
-)
-
-data class PackageData(
-        val nameResolver: NameResolver,
-        val packageProto: ProtoBuf.Package
-)

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassData.kt

@@ -0,0 +1,15 @@
+/*
+ * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.serialization.deserialization
+
+import org.jetbrains.kotlin.descriptors.SourceElement
+import org.jetbrains.kotlin.metadata.ProtoBuf
+
+data class ClassData(
+    val nameResolver: NameResolver,
+    val classProto: ProtoBuf.Class,
+    val sourceElement: SourceElement
+)

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.java

@@ -19,9 +19,8 @@ package org.jetbrains.kotlin.serialization.deserialization;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.name.ClassId;
-import org.jetbrains.kotlin.serialization.ClassDataWithSource;
 
 public interface ClassDataFinder {
     @Nullable
-    ClassDataWithSource findClassData(@NotNull ClassId classId);
+    ClassData findClassData(@NotNull ClassId classId);
 }

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt

@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.serialization.deserialization
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.serialization.ClassDataWithSource
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.VersionRequirementTable
 
@@ -27,10 +26,10 @@ class ClassDeserializer(private val components: DeserializationComponents) {
     private val classes: (ClassKey) -> ClassDescriptor? =
             components.storageManager.createMemoizedFunctionWithNullableValues { key -> createClass(key) }
 
-    // Additional ClassDataWithSource parameter is needed to avoid calling ClassDataFinder#findClassData()
+    // Additional ClassData parameter is needed to avoid calling ClassDataFinder#findClassData()
     // if it is already computed at the call site
-    fun deserializeClass(classId: ClassId, classDataWithSource: ClassDataWithSource? = null): ClassDescriptor? =
-            classes(ClassKey(classId, classDataWithSource))
+    fun deserializeClass(classId: ClassId, classData: ClassData? = null): ClassDescriptor? =
+        classes(ClassKey(classId, classData))
 
     private fun createClass(key: ClassKey): ClassDescriptor? {
         val classId = key.classId
@@ -39,10 +38,9 @@ class ClassDeserializer(private val components: DeserializationComponents) {
         }
         if (classId in BLACK_LIST) return null
 
-        val (classData, sourceElement) = key.classDataWithSource
-                                         ?: components.classDataFinder.findClassData(classId)
-                                         ?: return null
-        val (nameResolver, classProto) = classData
+        val (nameResolver, classProto, sourceElement) = key.classData
+                ?: components.classDataFinder.findClassData(classId)
+                ?: return null
 
         val outerClassId = classId.outerClassId
         val outerContext = if (outerClassId != null) {
@@ -69,8 +67,8 @@ class ClassDeserializer(private val components: DeserializationComponents) {
         return DeserializedClassDescriptor(outerContext, classProto, nameResolver, sourceElement)
     }
 
-    private class ClassKey(val classId: ClassId, val classDataWithSource: ClassDataWithSource?) {
-        // classDataWithSource *intentionally* not used in equals() / hashCode()
+    private class ClassKey(val classId: ClassId, val classData: ClassData?) {
+        // classData *intentionally* not used in equals() / hashCode()
         override fun equals(other: Any?) = other is ClassKey && classId == other.classId
 
         override fun hashCode() = classId.hashCode()

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedClassDataFinder.kt

@@ -18,10 +18,9 @@ package org.jetbrains.kotlin.serialization.deserialization
 
 import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
 import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.serialization.ClassDataWithSource
 
 class DeserializedClassDataFinder(private val packageFragmentProvider: PackageFragmentProvider) : ClassDataFinder {
-    override fun findClassData(classId: ClassId): ClassDataWithSource? {
+    override fun findClassData(classId: ClassId): ClassData? {
         val packageFragments = packageFragmentProvider.getPackageFragments(classId.packageFqName)
         for (fragment in packageFragments) {
             if (fragment !is DeserializedPackageFragment) continue

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MetadataPackageFragmentProvider.kt

@@ -31,8 +31,6 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.scopes.ChainedMemberScope
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
-import org.jetbrains.kotlin.serialization.ClassData
-import org.jetbrains.kotlin.serialization.ClassDataWithSource
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope
 import org.jetbrains.kotlin.storage.StorageManager
 import java.io.InputStream
@@ -84,7 +82,7 @@ class MetadataPackageFragment(
         message.class_List.firstOrNull { classProto ->
             nameResolver.getClassId(classProto.fqName) == classId
         }?.let { classProto ->
-            ClassDataWithSource(ClassData(nameResolver, classProto), SourceElement.NO_SOURCE)
+            ClassData(nameResolver, classProto, SourceElement.NO_SOURCE)
         }
     }
 

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoBasedClassDataFinder.kt

@@ -19,8 +19,6 @@ package org.jetbrains.kotlin.serialization.deserialization
 import org.jetbrains.kotlin.descriptors.SourceElement
 import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.serialization.ClassData
-import org.jetbrains.kotlin.serialization.ClassDataWithSource
 
 class ProtoBasedClassDataFinder(
         proto: ProtoBuf.PackageFragment,
@@ -34,8 +32,8 @@ class ProtoBasedClassDataFinder(
 
     internal val allClassIds: Collection<ClassId> get() = classIdToProto.keys
 
-    override fun findClassData(classId: ClassId): ClassDataWithSource? {
+    override fun findClassData(classId: ClassId): ClassData? {
         val classProto = classIdToProto[classId] ?: return null
-        return ClassDataWithSource(ClassData(nameResolver, classProto), classSource(classId))
+        return ClassData(nameResolver, classProto, classSource(classId))
     }
 }