Replace map + filterNotNull -> mapNotNull in project

core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt

@@ -120,7 +120,7 @@ internal class KClassImpl<T : Any>(override val jClass: Class<T>) : KDeclaration
         }
 
     override val nestedClasses: Collection<KClass<*>>
-        get() = descriptor.unsubstitutedInnerClassesScope.getContributedDescriptors().filterNot(DescriptorUtils::isEnumEntry).map {
+        get() = descriptor.unsubstitutedInnerClassesScope.getContributedDescriptors().filterNot(DescriptorUtils::isEnumEntry).mapNotNull {
             nestedClass ->
             val source = (nestedClass as DeclarationDescriptorWithSource).source
             when (source) {
@@ -139,7 +139,7 @@ internal class KClassImpl<T : Any>(override val jClass: Class<T>) : KDeclaration
                 }
                 else -> throw KotlinReflectionInternalError("Unsupported class: $nestedClass (source = $source)")
             }
-        }.filterNotNull().map { KClassImpl(it) }
+        }.map { KClassImpl(it) }
 
     @Suppress("UNCHECKED_CAST")
     private val objectInstance_ = ReflectProperties.lazy {

core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt

@@ -75,10 +75,9 @@ internal abstract class KDeclarationContainerImpl : ClassBasedDeclarationContain
                 .filter { descriptor ->
                     descriptor !is MemberDescriptor || descriptor.visibility != Visibilities.INVISIBLE_FAKE
                 }
-                .map { descriptor ->
+                .mapNotNull { descriptor ->
                     descriptor.accept(visitor, Unit)
                 }
-                .filterNotNull()
     }
 
     private fun createProperty(descriptor: PropertyDescriptor): KPropertyImpl<*> {