Cleanup

Author: dennisameling

modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/OpenApiGeneratorPlugin.kt

@@ -61,7 +61,7 @@ class OpenApiGeneratorPlugin : Plugin<Project> {
                 project
             )
 
-            generate.outputDir.convention(project.layout.buildDirectory.map { it.asFile.resolve("generate-resources/main").absolutePath })
+            generate.outputDir.set(project.layout.buildDirectory.map { it.asFile.resolve("generate-resources/main").absolutePath })
 
             tasks.apply {
                 register("openApiGenerators", GeneratorsTask::class.java).configure {

modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/extensions/OpenApiGeneratorGenerateExtension.kt

@@ -154,7 +154,6 @@ open class OpenApiGeneratorGenerateExtension(project: Project) {
     /**
      * Sets additional properties that can be referenced by the mustache templates.
      */
-    @Suppress("UNCHECKED_CAST")
     val additionalProperties = project.objects.mapProperty<String, Any>()
 
     /**
@@ -414,22 +413,22 @@ open class OpenApiGeneratorGenerateExtension(project: Project) {
 
     @Suppress("MemberVisibilityCanBePrivate")
     fun applyDefaults() {
-        releaseNote.convention("Minor update")
-        inputSpecRootDirectorySkipMerge.convention(false)
-        modelNamePrefix.convention("")
-        modelNameSuffix.convention("")
-        apiNameSuffix.convention("")
-        generateModelTests.convention(true)
-        generateModelDocumentation.convention(true)
-        generateApiTests.convention(true)
-        generateApiDocumentation.convention(true)
-        configOptions.convention(mapOf())
-        validateSpec.convention(true)
-        logToStderr.convention(false)
-        enablePostProcessFile.convention(false)
-        skipValidateSpec.convention(false)
-        generateAliasAsModel.convention(false)
-        cleanupOutput.convention(false)
-        dryRun.convention(false)
+        releaseNote.set("Minor update")
+        inputSpecRootDirectorySkipMerge.set(false)
+        modelNamePrefix.set("")
+        modelNameSuffix.set("")
+        apiNameSuffix.set("")
+        generateModelTests.set(true)
+        generateModelDocumentation.set(true)
+        generateApiTests.set(true)
+        generateApiDocumentation.set(true)
+        configOptions.set(mapOf())
+        validateSpec.set(true)
+        logToStderr.set(false)
+        enablePostProcessFile.set(false)
+        skipValidateSpec.set(false)
+        generateAliasAsModel.set(false)
+        cleanupOutput.set(false)
+        dryRun.set(false)
     }
 }

modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/extensions/OpenApiGeneratorGeneratorsExtension.kt

@@ -37,5 +37,5 @@ open class OpenApiGeneratorGeneratorsExtension(project: Project) {
 
     @Suppress("MemberVisibilityCanBePrivate")
     fun applyDefaults() =
-        include.convention(Stability.values().map { it.value() }.filterNot { it == Stability.DEPRECATED.value() })
+        include.set(Stability.values().map { it.value() }.filterNot { it == Stability.DEPRECATED.value() })
 }

modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/extensions/OpenApiGeneratorMetaExtension.kt

@@ -41,8 +41,8 @@ open class OpenApiGeneratorMetaExtension(project: Project) {
     val outputFolder = project.objects.property<String>()
 
     init {
-        generatorName.convention("default")
-        packageName.convention("org.openapitools.codegen")
-        outputFolder.convention("")
+        generatorName.set("default")
+        packageName.set("org.openapitools.codegen")
+        outputFolder.set("")
     }
 }

modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt

@@ -124,21 +124,21 @@ open class GenerateTask @Inject constructor(private val objectFactory: ObjectFac
     @get:Optional
     @get:InputDirectory
     @get:PathSensitive(PathSensitivity.RELATIVE)
-    val inputSpecRootDirectory = project.objects.property<String>()
+    val inputSpecRootDirectory = project.objects.property<String>();
 
     /**
      * Skip bundling all spec files into a merged spec file, if true.
      */
     @get:Input
     @get:Optional
-    val inputSpecRootDirectorySkipMerge = project.objects.property<Boolean>()
+    val inputSpecRootDirectorySkipMerge = project.objects.property<Boolean>();
 
     /**
      * Name of the file that will contain all merged specs
      */
     @get:Input
     @get:Optional
-    val mergedFileName = project.objects.property<String>()
+    val mergedFileName = project.objects.property<String>();
 
     /**
      * The remote Open API 2.0/3.x specification URL location.
@@ -256,7 +256,6 @@ open class GenerateTask @Inject constructor(private val objectFactory: ObjectFac
      */
     @get:Optional
     @get:Input
-    @Suppress("UNCHECKED_CAST")
     val additionalProperties = project.objects.mapProperty<String, Any>()
 
     /**

modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GeneratorsTask.kt

@@ -19,9 +19,9 @@ package org.openapitools.generator.gradle.plugin.tasks
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
-import org.gradle.kotlin.dsl.listProperty
 import org.gradle.internal.logging.text.StyledTextOutput
 import org.gradle.internal.logging.text.StyledTextOutputFactory
+import org.gradle.kotlin.dsl.listProperty
 import org.gradle.work.DisableCachingByDefault
 import org.openapitools.codegen.CodegenConfigLoader
 import org.openapitools.codegen.CodegenType

modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/MetaTask.kt

@@ -23,9 +23,9 @@ import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
-import org.gradle.kotlin.dsl.property
 import org.gradle.internal.logging.text.StyledTextOutput
 import org.gradle.internal.logging.text.StyledTextOutputFactory
+import org.gradle.kotlin.dsl.property
 import org.openapitools.codegen.CodegenConfig
 import org.openapitools.codegen.CodegenConstants
 import org.openapitools.codegen.SupportingFile

modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/ValidateTask.kt

@@ -30,9 +30,9 @@ import org.gradle.api.tasks.PathSensitive
 import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.options.Option
-import org.gradle.kotlin.dsl.property
 import org.gradle.internal.logging.text.StyledTextOutput
 import org.gradle.internal.logging.text.StyledTextOutputFactory
+import org.gradle.kotlin.dsl.property
 import org.openapitools.codegen.validations.oas.OpenApiEvaluator
 import org.openapitools.codegen.validations.oas.RuleConfiguration