Fix warnings after KT-48899

All API ToolingModelBuilder is marked as NonNullApi
https://github.com/gradle/gradle/commit/f93bf949486e73655810ab49ad316100b1c2804c#diff-76e89b92025ccef4e2763c5ee8d30bde939c4a9db26bfc913eac88069cbf5d36

libraries/tools/kotlin-allopen/src/main/kotlin/org/jetbrains/kotlin/allopen/gradle/AllOpenSubplugin.kt

@@ -79,7 +79,7 @@ class AllOpenGradleSubplugin @Inject internal constructor(private val registry:
     //region Stub implementation for legacy API, KT-39809
     internal constructor(): this(object : ToolingModelBuilderRegistry {
         override fun register(p0: ToolingModelBuilder) = Unit
-        override fun getBuilder(p0: String): ToolingModelBuilder? = null
+        override fun getBuilder(p0: String): ToolingModelBuilder = error("Method should not be called")
     })
 
     override fun isApplicable(project: Project, task: AbstractCompile): Boolean = true
@@ -92,4 +92,4 @@ class AllOpenGradleSubplugin @Inject internal constructor(private val registry:
                 "Please use an older version of kotlin-allopen or upgrade the Kotlin Gradle plugin version to make them match."
     )
     //endregion
-}
+}

libraries/tools/kotlin-allopen/src/main/kotlin/org/jetbrains/kotlin/allopen/gradle/model/builder/AllOpenModelBuilder.kt

@@ -21,11 +21,9 @@ class AllOpenModelBuilder : ToolingModelBuilder {
         return modelName == AllOpen::class.java.name
     }
 
-    override fun buildAll(modelName: String, project: Project): Any? {
+    override fun buildAll(modelName: String, project: Project): Any {
-        if (modelName == AllOpen::class.java.name) {
+        require(canBuild(modelName)) { "buildAll(\"$modelName\") has been called while canBeBuild is false" }
-            val extension = project.extensions.getByType(AllOpenExtension::class.java)
+        val extension = project.extensions.getByType(AllOpenExtension::class.java)
-            return AllOpenImpl(project.name, extension.myAnnotations, extension.myPresets)
+        return AllOpenImpl(project.name, extension.myAnnotations, extension.myPresets)
-        }
-        return null
     }
-}
+}

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/builder/KaptModelBuilder.kt

@@ -23,12 +23,10 @@ class KaptModelBuilder : ToolingModelBuilder {
         return modelName == Kapt::class.java.name
     }
 
-    override fun buildAll(modelName: String, project: Project): Any? {
+    override fun buildAll(modelName: String, project: Project): Any {
-        if (modelName == Kapt::class.java.name) {
+        require(canBuild(modelName)) { "buildAll(\"$modelName\") has been called while canBeBuild is false" }
-            val kaptTasks = project.tasks.withType(KaptTask::class.java)
+        val kaptTasks = project.tasks.withType(KaptTask::class.java)
-            return KaptImpl(project.name, kaptTasks.map { it.createKaptSourceSet() })
+        return KaptImpl(project.name, kaptTasks.map { it.createKaptSourceSet() })
-        }
-        return null
     }
 
     companion object {
@@ -47,4 +45,4 @@ class KaptModelBuilder : ToolingModelBuilder {
             )
         }
     }
-}
+}

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/builder/KotlinAndroidExtensionModelBuilder.kt

@@ -21,11 +21,9 @@ class KotlinAndroidExtensionModelBuilder : ToolingModelBuilder {
         return modelName == KotlinAndroidExtension::class.java.name
     }
 
-    override fun buildAll(modelName: String, project: Project): Any? {
+    override fun buildAll(modelName: String, project: Project): Any {
-        if (modelName == KotlinAndroidExtension::class.java.name) {
+        require(canBuild(modelName)) { "buildAll(\"$modelName\") has been called while canBeBuild is false" }
-            val extension = project.extensions.getByType(AndroidExtensionsExtension::class.java)
+        val extension = project.extensions.getByType(AndroidExtensionsExtension::class.java)
-            return KotlinAndroidExtensionImpl(project.name, extension.isExperimental, extension.defaultCacheImplementation.optionName)
+        return KotlinAndroidExtensionImpl(project.name, extension.isExperimental, extension.defaultCacheImplementation.optionName)
-        }
-        return null
     }
-}
+}

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/model/builder/KotlinModelBuilder.kt

@@ -36,22 +36,20 @@ class KotlinModelBuilder(private val kotlinPluginVersion: String, private val an
         return modelName == KotlinProject::class.java.name
     }
 
-    override fun buildAll(modelName: String, project: Project): Any? {
+    override fun buildAll(modelName: String, project: Project): Any {
-        if (modelName == KotlinProject::class.java.name) {
+        require(canBuild(modelName)) { "buildAll(\"$modelName\") has been called while canBeBuild is false" }
-            val kotlinCompileTasks = project.tasks.withType(AbstractKotlinCompile::class.java).toList()
+        val kotlinCompileTasks = project.tasks.withType(AbstractKotlinCompile::class.java).toList()
-            val projectType = getProjectType(project)
+        val projectType = getProjectType(project)
-            return KotlinProjectImpl(
+        return KotlinProjectImpl(
-                project.name,
+            project.name,
-                kotlinPluginVersion,
+            kotlinPluginVersion,
-                projectType,
+            projectType,
-                kotlinCompileTasks.mapNotNull {
+            kotlinCompileTasks.mapNotNull {
-                    if (androidTarget != null) it.createAndroidSourceSet(androidTarget) else it.createSourceSet(project, projectType)
+                if (androidTarget != null) it.createAndroidSourceSet(androidTarget) else it.createSourceSet(project, projectType)
-                },
+            },
-                getExpectedByDependencies(project),
+            getExpectedByDependencies(project),
-                kotlinCompileTasks.first()!!.createExperimentalFeatures()
+            kotlinCompileTasks.first()!!.createExperimentalFeatures()
-            )
+        )
-        }
-        return null
     }
 
     companion object {
@@ -137,4 +135,4 @@ class KotlinModelBuilder(private val kotlinPluginVersion: String, private val an
             return ExperimentalFeaturesImpl(coroutines.get().name)
         }
     }
-}
+}

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/HierarchyAttributeContainer.kt

@@ -40,16 +40,16 @@ class HierarchyAttributeContainer(
         attributesMap.contains(key) || getFilteredParentAttribute(key) != null
 
     @Suppress("UNCHECKED_CAST")
-    override fun <T : Any?> getAttribute(key: Attribute<T>?): T? =
+    override fun <T : Any> getAttribute(key: Attribute<T>): T? =
         attributesMap.get(key as Attribute<*>) as T? ?: getFilteredParentAttribute(key) as T?
 
     override fun isEmpty(): Boolean = attributesMap.isEmpty() && (parent?.keySet().orEmpty().filter(filterParentAttributes).isEmpty())
 
     override fun keySet(): Set<Attribute<*>> = attributesMap.keys + parent?.keySet().orEmpty().filter(filterParentAttributes)
 
-    override fun <T : Any?> attribute(key: Attribute<T>?, value: T): AttributeContainer {
+    override fun <T : Any> attribute(key: Attribute<T>, value: T): AttributeContainer {
         val checkedValue = requireNotNull(value as Any?) { "null values for attributes are not supported" }
-        attributesMap[key as Attribute<*>] = checkedValue
+        attributesMap[key] = checkedValue
         return this
     }
 

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinTargets.kt

@@ -137,7 +137,8 @@ abstract class AbstractKotlinTarget(
             adhocVariant as SoftwareComponent
 
             object : ComponentWithVariants, ComponentWithCoordinates, SoftwareComponentInternal {
-                override fun getCoordinates() = (kotlinVariant as? ComponentWithCoordinates)?.coordinates
+                override fun getCoordinates() =
+                    (kotlinVariant as? ComponentWithCoordinates)?.coordinates ?: error("kotlinVariant is not ComponentWithCoordinates")
 
                 override fun getVariants(): Set<SoftwareComponent> =
                     (kotlinVariant as? KotlinVariantWithMetadataVariant)?.variants.orEmpty()

libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/kapt/incremental/ClasspathAnalyzerTest.kt

@@ -171,9 +171,8 @@ class StructureTransformTestAction(val input: File, val projectDir: File) : Stru
 
     override val inputArtifact: Provider<FileSystemLocation> = project.provider { project.objects.fileProperty().fileValue(input).get() }
 
-    override fun getParameters(): TransformParameters.None? {
+    override fun getParameters(): TransformParameters.None {
-        //no need for StructureTransformAction and so for test
+        error("Should not be called")
-        return null
     }
 }
 
@@ -192,4 +191,4 @@ class TransformOutputsMock(val outputDir: File) : TransformOutputs {
         return newDir
     }
 
-}
+}

libraries/tools/kotlin-lombok/src/main/kotlin/org/jetbrains/kotlin/lombok/gradle/model/builder/LombokModelBuilder.kt

@@ -15,11 +15,9 @@ class LombokModelBuilder : ToolingModelBuilder {
 
     override fun canBuild(modelName: String): Boolean = modelName == Lombok::class.java.name
 
-    override fun buildAll(modelName: String, project: Project): Any? =
+    override fun buildAll(modelName: String, project: Project): Any {
-        if (canBuild(modelName)) {
+        require(canBuild(modelName)) { "buildAll(\"$modelName\") has been called while canBeBuild is false" }
-            val extension = project.extensions.getByType(LombokExtension::class.java)
+        val extension = project.extensions.getByType(LombokExtension::class.java)
-            LombokImpl(project.name, extension.configurationFile)
+        return LombokImpl(project.name, extension.configurationFile)
-        } else {
+    }
-            null
-        }
 }

libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgSubplugin.kt

@@ -83,7 +83,7 @@ class NoArgGradleSubplugin @Inject internal constructor(private val registry: To
     //region Stub implementation for legacy API, KT-39809
     internal constructor(): this(object : ToolingModelBuilderRegistry {
         override fun register(p0: ToolingModelBuilder) = Unit
-        override fun getBuilder(p0: String): ToolingModelBuilder? = null
+        override fun getBuilder(p0: String): ToolingModelBuilder = error("Method should not be called")
     })
 
     override fun isApplicable(project: Project, task: AbstractCompile): Boolean = true
@@ -96,4 +96,4 @@ class NoArgGradleSubplugin @Inject internal constructor(private val registry: To
                 "Please use an older version of kotlin-noarg or upgrade the Kotlin Gradle plugin version to make them match."
     )
     //endregion
-}
+}

libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/model/builder/NoArgModelBuilder.kt

@@ -21,11 +21,9 @@ class NoArgModelBuilder : ToolingModelBuilder {
         return modelName == NoArg::class.java.name
     }
 
-    override fun buildAll(modelName: String, project: Project): Any? {
+    override fun buildAll(modelName: String, project: Project): Any {
-        if (modelName == NoArg::class.java.name) {
+        require(canBuild(modelName)) { "buildAll(\"$modelName\") has been called while canBeBuild is false" }
-            val extension = project.extensions.getByType(NoArgExtension::class.java)
+        val extension = project.extensions.getByType(NoArgExtension::class.java)
-            return NoArgImpl(project.name, extension.myAnnotations, extension.myPresets, extension.invokeInitializers)
+        return NoArgImpl(project.name, extension.myAnnotations, extension.myPresets, extension.invokeInitializers)
-        }
-        return null
     }
-}
+}

libraries/tools/kotlin-sam-with-receiver/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/SamWithReceiverSubplugin.kt

@@ -76,7 +76,7 @@ class SamWithReceiverGradleSubplugin @Inject internal constructor(private val re
     //region Stub implementation for legacy API, KT-39809
     internal constructor(): this(object : ToolingModelBuilderRegistry {
         override fun register(p0: ToolingModelBuilder) = Unit
-        override fun getBuilder(p0: String): ToolingModelBuilder? = null
+        override fun getBuilder(p0: String): ToolingModelBuilder = error("Method should not be called")
     })
 
     override fun isApplicable(project: Project, task: AbstractCompile): Boolean = true
@@ -89,4 +89,4 @@ class SamWithReceiverGradleSubplugin @Inject internal constructor(private val re
                 "Please use an older version of kotlin-sam-with-receiver or upgrade the Kotlin Gradle plugin version to make them match."
     )
     //endregion
-}
+}

libraries/tools/kotlin-sam-with-receiver/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/model/builder/SamWithReceiverModelBuilder.kt

@@ -21,11 +21,9 @@ class SamWithReceiverModelBuilder : ToolingModelBuilder {
         return modelName == SamWithReceiver::class.java.name
     }
 
-    override fun buildAll(modelName: String, project: Project): Any? {
+    override fun buildAll(modelName: String, project: Project): Any {
-        if (modelName == SamWithReceiver::class.java.name) {
+        require(canBuild(modelName)) { "buildAll(\"$modelName\") has been called while canBeBuild is false" }
-            val extension = project.extensions.getByType(SamWithReceiverExtension::class.java)
+        val extension = project.extensions.getByType(SamWithReceiverExtension::class.java)
-            return SamWithReceiverImpl(project.name, extension.myAnnotations, extension.myPresets)
+        return SamWithReceiverImpl(project.name, extension.myAnnotations, extension.myPresets)
-        }
-        return null
     }
-}
+}