Cleanup in compiler modules

compiler/container/src/org/jetbrains/kotlin/container/Cache.kt

@@ -63,7 +63,7 @@ private fun getSetterInfos(c: Class<*>): List<SetterInfo> {
     val setterInfos = ArrayList<SetterInfo>()
     for (method in c.getMethods()) {
         for (annotation in method.getDeclaredAnnotations()) {
-            if (annotation.annotationType().getName().endsWith(".Inject")) {
+            if (annotation.annotationClass.java.getName().endsWith(".Inject")) {
                 setterInfos.add(SetterInfo(method, method.getGenericParameterTypes().toList()))
             }
         }
@@ -114,6 +114,6 @@ private fun getRegistrations(klass: Class<*>): List<Type> {
     val interfaces = LinkedHashSet<Type>()
     superClasses.forEach { collectInterfacesRecursive(it, interfaces) }
     registrations.addAll(interfaces)
-    registrations.remove(javaClass<Any>())
+    registrations.remove(Any::class.java)
     return registrations
 }

compiler/container/src/org/jetbrains/kotlin/container/Container.kt

@@ -70,14 +70,14 @@ public class StorageComponentContainer(id: String) : ComponentContainer, Compone
     private fun resolveIterable(request: Type, context: ValueResolveContext): ValueDescriptor? {
         if (request !is ParameterizedType) return null
         val rawType = request.getRawType()
-        if (rawType != javaClass<Iterable<*>>()) return null
+        if (rawType != Iterable::class.java) return null
         val typeArguments = request.getActualTypeArguments()
-        if (typeArguments.size() != 1) return null
+        if (typeArguments.size != 1) return null
         val iterableTypeArgument = typeArguments[0]
         val iterableType = when (iterableTypeArgument) {
             is WildcardType -> {
                 val upperBounds = iterableTypeArgument.getUpperBounds()
-                if (upperBounds.size() != 1) return null
+                if (upperBounds.size != 1) return null
                 upperBounds[0]
             }
             is Class<*> -> iterableTypeArgument
@@ -112,9 +112,9 @@ public fun StorageComponentContainer.registerInstance(instance: Any): StorageCom
 }
 
 public inline fun <reified T : Any> StorageComponentContainer.resolve(context: ValueResolveContext = unknownContext): ValueDescriptor? {
-    return resolve(javaClass<T>(), context)
+    return resolve(T::class.java, context)
 }
 
 public inline fun <reified T : Any> StorageComponentContainer.resolveMultiple(context: ValueResolveContext = unknownContext): Iterable<ValueDescriptor> {
-    return resolveMultiple(javaClass<T>(), context)
+    return resolveMultiple(T::class.java, context)
 }

compiler/container/src/org/jetbrains/kotlin/container/Resolve.kt

@@ -58,7 +58,7 @@ fun Method.bindToMethod(context: ValueResolveContext): MethodBinding {
 }
 
 private fun Member.bindArguments(parameters: List<Type>, context: ValueResolveContext): List<ValueDescriptor> {
-    val bound = ArrayList<ValueDescriptor>(parameters.size())
+    val bound = ArrayList<ValueDescriptor>(parameters.size)
     var unsatisfied: MutableList<Type>? = null
 
     for (parameter in parameters) {

compiler/container/src/org/jetbrains/kotlin/container/Storage.kt

@@ -49,7 +49,7 @@ public class ComponentStorage(val myId: String) : ValueResolver {
         if (entry.isNotEmpty()) {
             registerDependency(request, context)
 
-            if (entry.size() > 1)
+            if (entry.size > 1)
                 throw InvalidCardinalityException("Request $request cannot be satisfied because there is more than one type registered", entry)
             return entry.singleOrNull()
         }
@@ -68,7 +68,7 @@ public class ComponentStorage(val myId: String) : ValueResolver {
     public fun dump(printer: PrintStream): Unit = with (printer) {
         val heading = "Container: $myId"
         println(heading)
-        println("=".repeat(heading.length()))
+        println("=".repeat(heading.length))
         println()
         getDescriptorsInDisposeOrder().forEach { descriptor ->
             println(descriptor)