Remove various getClassId methods

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedDescriptorResolver.java

@@ -264,12 +264,6 @@ public final class DeserializedDescriptorResolver {
             return namespaceDescriptor;
         }
 
-        @NotNull
-        @Override
-        protected ClassId getClassId(@NotNull ClassDescriptor classDescriptor) {
-            return ClassSerializationUtil.getClassId(classDescriptor);
-        }
-
         @Nullable
         @Override
         protected ClassDescriptor resolveClassExternally(@NotNull ClassId classId) {

compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractClassResolver.java

@@ -83,9 +83,6 @@ public abstract class AbstractClassResolver implements ClassResolver {
     @NotNull
     protected abstract DeclarationDescriptor getPackage(@NotNull FqName fqName);
 
-    @NotNull
-    protected abstract ClassId getClassId(@NotNull ClassDescriptor classDescriptor);
-
     @Nullable
     protected ClassDescriptor resolveClassExternally(@NotNull ClassId classId) {
         //TODO: decide whether it is ok to provide default implementation

compiler/frontend/src/org/jetbrains/jet/lang/types/lang/BuiltInsSerializationUtil.java

@@ -2,8 +2,6 @@ package org.jetbrains.jet.lang.types.lang;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.descriptors.serialization.ClassId;
-import org.jetbrains.jet.descriptors.serialization.ClassSerializationUtil;
-import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -45,11 +43,6 @@ public class BuiltInsSerializationUtil {
                + "." + CLASS_METADATA_FILE_EXTENSION;
     }
 
-    @NotNull
-    public static ClassId getClassId(@NotNull ClassDescriptor classDescriptor) {
-        return ClassSerializationUtil.getClassId(classDescriptor);
-    }
-
     @NotNull
     public static String getPackageFilePath(@NotNull NamespaceDescriptor packageDescriptor) {
         FqNameUnsafe fqName = DescriptorUtils.getFQName(packageDescriptor);

compiler/frontend/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java

@@ -74,12 +74,6 @@ class BuiltinsNamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl {
                     return BuiltinsNamespaceDescriptorImpl.this;
                 }
 
-                @NotNull
-                @Override
-                protected ClassId getClassId(@NotNull ClassDescriptor classDescriptor) {
-                    return BuiltInsSerializationUtil.getClassId(classDescriptor);
-                }
-
                 @Override
                 protected void classDescriptorCreated(@NotNull ClassDescriptor classDescriptor) {
                     // Do nothing

compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltinsDeserializationTest.java

@@ -89,12 +89,6 @@ public class BuiltinsDeserializationTest extends KotlinTestWithEnvironment {
                 return actualNamespace;
             }
 
-            @NotNull
-            @Override
-            protected ClassId getClassId(@NotNull ClassDescriptor classDescriptor) {
-                return BuiltinsDeserializationTest.getClassId(classDescriptor);
-            }
-
             @Nullable
             @Override
             protected ClassData getClassData(@NotNull ClassId classId) {
@@ -145,7 +139,7 @@ public class BuiltinsDeserializationTest extends KotlinTestWithEnvironment {
             public void writeClass(
                     @NotNull ClassDescriptor classDescriptor, @NotNull ProtoBuf.Class classProto
             ) {
-                classProtos.put(getClassId(classDescriptor), classProto);
+                classProtos.put(ClassSerializationUtil.getClassId(classDescriptor), classProto);
             }
         });
         return classProtos;
@@ -186,8 +180,4 @@ public class BuiltinsDeserializationTest extends KotlinTestWithEnvironment {
             }
         }
     }
-
-    private static ClassId getClassId(ClassDescriptor classDescriptor) {
-        return ClassSerializationUtil.getClassId(classDescriptor);
-    }
 }

compiler/tests/org/jetbrains/jet/descriptors/serialization/WriteSerializedInfoTest.java

@@ -87,12 +87,6 @@ public class WriteSerializedInfoTest extends CodegenTestCase {
             return namespace;
         }
 
-        @NotNull
-        @Override
-        protected ClassId getClassId(@NotNull ClassDescriptor classDescriptor) {
-            return ClassSerializationUtil.getClassId(classDescriptor);
-        }
-
         @Override
         protected void classDescriptorCreated(@NotNull ClassDescriptor classDescriptor) {
         }

generators/org/jetbrains/jet/generators/builtins/BuiltInsSerializer.java

@@ -9,10 +9,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.config.CompilerConfiguration;
-import org.jetbrains.jet.descriptors.serialization.ClassSerializationUtil;
+import org.jetbrains.jet.descriptors.serialization.*;
-import org.jetbrains.jet.descriptors.serialization.DescriptorSerializer;
-import org.jetbrains.jet.descriptors.serialization.NameSerializationUtil;
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
@@ -123,6 +120,6 @@ public class BuiltInsSerializer {
     }
 
     private static String getFileName(ClassDescriptor classDescriptor) {
-        return BuiltInsSerializationUtil.getClassMetadataPath(BuiltInsSerializationUtil.getClassId(classDescriptor));
+        return BuiltInsSerializationUtil.getClassMetadataPath(ClassSerializationUtil.getClassId(classDescriptor));
     }
 }