Code cleanup: several inspections applied

compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/KotlinClassifiersCache.kt

@@ -80,7 +80,7 @@ class MockKotlinClassifier(override val fqName: FqName,
 
     override val supertypes: Collection<JavaClassifierType>
         get() = classOrObject.superTypeListEntries
-                .mapNotNull { superTypeListEntry ->
+                .map { superTypeListEntry ->
                     val userType = superTypeListEntry.typeAsUserType
                     arrayListOf<String>().apply {
                         userType?.referencedName?.let { add(it) }

compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/wrappers/trees/TreeBasedTypeParameter.kt

@@ -45,12 +45,12 @@ class TreeBasedTypeParameter(
         get() = false
 
     override val upperBounds: Collection<JavaClassifierType>
-        get() = tree.bounds.map {
+        get() = tree.bounds.mapNotNull {
             when (it) {
                 is JCTree.JCTypeApply -> TreeBasedGenericClassifierType(it, TreePath(treePath, it), javac)
                 is JCTree.JCIdent -> TreeBasedNonGenericClassifierType(it, TreePath(treePath, it), javac)
                 else -> null
             }
-        }.filterNotNull()
+        }
 
 }