Getting rid of Computable and Function in lazy values and memoized functions

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

@@ -58,7 +58,7 @@ public abstract class AbstractDescriptorFinder implements DescriptorFinder {
     @Nullable
     @Override
     public ClassDescriptor findClass(@NotNull ClassId classId) {
-        return findClass.fun(classId);
+        return findClass.invoke(classId);
     }
 
     @Nullable

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

@@ -136,7 +136,7 @@ public class TypeDeserializer {
     private TypeConstructor typeConstructor(@NotNull ProtoBuf.Type.Constructor proto) {
         switch (proto.getKind()) {
             case CLASS:
-                ClassDescriptor classDescriptor = classDescriptors.fun(proto.getId());
+                ClassDescriptor classDescriptor = classDescriptors.invoke(proto.getId());
                 if (classDescriptor == null) return null;
 
                 return classDescriptor.getTypeConstructor();
@@ -227,7 +227,7 @@ public class TypeDeserializer {
         @NotNull
         @Override
         public TypeConstructor getConstructor() {
-            return constructor.compute();
+            return constructor.invoke();
         }
 
         @NotNull
@@ -254,7 +254,7 @@ public class TypeDeserializer {
         @NotNull
         @Override
         public JetScope getMemberScope() {
-            return memberScope.compute();
+            return memberScope.invoke();
         }
 
         @Override

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

@@ -151,7 +151,7 @@ public class DeserializedClassDescriptor extends AbstractClassDescriptor impleme
     @NotNull
     @Override
     public DeclarationDescriptor getContainingDeclaration() {
-        return containingDeclaration.compute();
+        return containingDeclaration.invoke();
     }
 
     @NotNull
@@ -201,7 +201,7 @@ public class DeserializedClassDescriptor extends AbstractClassDescriptor impleme
 
     @Override
     public List<AnnotationDescriptor> getAnnotations() {
-        return annotations.compute();
+        return annotations.invoke();
     }
 
     @Override
@@ -226,7 +226,7 @@ public class DeserializedClassDescriptor extends AbstractClassDescriptor impleme
     @Nullable
     @Override
     public ConstructorDescriptor getUnsubstitutedPrimaryConstructor() {
-        return primaryConstructor.compute();
+        return primaryConstructor.invoke();
     }
 
     @NotNull
@@ -306,7 +306,7 @@ public class DeserializedClassDescriptor extends AbstractClassDescriptor impleme
     @Nullable
     @Override
     public ClassDescriptor getClassObjectDescriptor() {
-        return classObjectDescriptor.compute();
+        return classObjectDescriptor.invoke();
     }
 
     @NotNull
@@ -463,7 +463,7 @@ public class DeserializedClassDescriptor extends AbstractClassDescriptor impleme
         @Nullable
         @Override
         protected ClassifierDescriptor getClassDescriptor(@NotNull Name name) {
-            return classDescriptor.nestedClasses.findClass.fun(name);
+            return classDescriptor.nestedClasses.findClass.invoke(name);
         }
 
         @Override
@@ -474,7 +474,7 @@ public class DeserializedClassDescriptor extends AbstractClassDescriptor impleme
         @Nullable
         @Override
         public ClassDescriptor getObjectDescriptor(@NotNull Name name) {
-            return classDescriptor.nestedObjects.findClass.fun(name);
+            return classDescriptor.nestedObjects.findClass.invoke(name);
         }
 
         @NotNull
@@ -504,7 +504,7 @@ public class DeserializedClassDescriptor extends AbstractClassDescriptor impleme
         public Collection<ClassDescriptor> getAllDescriptors() {
             Collection<ClassDescriptor> result = new ArrayList<ClassDescriptor>(declaredNames.size());
             for (Name name : declaredNames) {
-                ClassDescriptor descriptor = findClass.fun(name);
+                ClassDescriptor descriptor = findClass.invoke(name);
                 if (descriptor != null) {
                     result.add(descriptor);
                 }

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

@@ -143,7 +143,7 @@ public abstract class DeserializedMemberScope implements JetScope {
     @NotNull
     @Override
     public final Collection<FunctionDescriptor> getFunctions(@NotNull Name name) {
-        return functions.fun(name);
+        return functions.invoke(name);
     }
 
     @NotNull
@@ -160,7 +160,7 @@ public abstract class DeserializedMemberScope implements JetScope {
     @NotNull
     @Override
     public Collection<VariableDescriptor> getProperties(@NotNull Name name) {
-        return properties.fun(name);
+        return properties.invoke(name);
     }
 
     @Nullable
@@ -184,7 +184,7 @@ public abstract class DeserializedMemberScope implements JetScope {
     @NotNull
     @Override
     public Collection<ClassDescriptor> getObjectDescriptors() {
-        return objectDescriptors.compute();
+        return objectDescriptors.invoke();
     }
 
     @Nullable
@@ -231,7 +231,7 @@ public abstract class DeserializedMemberScope implements JetScope {
     @NotNull
     @Override
     public final Collection<DeclarationDescriptor> getAllDescriptors() {
-        return allDescriptors.compute();
+        return allDescriptors.invoke();
     }
 
     @NotNull