make task properties non-optional

Author: martinbonnin

gradle-plugin/plugin/src/main/java/com/yelp/codegen/plugin/CodegenPlugin.kt

@@ -10,7 +10,7 @@ class CodegenPlugin : Plugin<Project> {
             "com.yelp.codegen.plugin requires Gradle version 5.4.1 or greater"
         }
 
-        val config = project.extensions.create("generateSwagger", GenerateTaskConfiguration::class.java)
+        val config = project.extensions.create("generateSwagger", GenerateTaskConfiguration::class.java, project)
 
         project.tasks.register("generateSwagger", GenerateTask::class.java) {
             it.platform.set(config.platform)

gradle-plugin/plugin/src/main/java/com/yelp/codegen/plugin/GenerateTask.kt

@@ -1,8 +1,6 @@
 package com.yelp.codegen.plugin
 
 import com.yelp.codegen.main
-import io.swagger.parser.SwaggerParser
-import java.io.File
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
@@ -31,22 +29,18 @@ abstract class GenerateTask : DefaultTask() {
     }
 
     @get:Input
-    @get:Optional
     @get:Option(option = "platform", description = "Configures the platform that is used for generating the code.")
     abstract val platform: Property<String>
 
     @get:Input
-    @get:Optional
     @get:Option(option = "packageName", description = "Configures the package name of the resulting code.")
     abstract val packageName: Property<String>
 
     @get:Input
-    @get:Optional
     @get:Option(option = "specName", description = "Configures the name of the service for the Swagger Spec.")
     abstract val specName: Property<String>
 
     @get:Input
-    @get:Optional
     @get:Option(option = "specVersion", description = "Configures the version of the Swagger Spec.")
     abstract val specVersion: Property<String>
 
@@ -55,7 +49,6 @@ abstract class GenerateTask : DefaultTask() {
     abstract val inputFile: RegularFileProperty
 
     @get:OutputDirectory
-    @get:Optional
     @get:Option(option = "outputDir", description = "Configures path of the Generated code directory.")
     abstract val outputDir: DirectoryProperty
 
@@ -71,12 +64,12 @@ abstract class GenerateTask : DefaultTask() {
 
     @TaskAction
     fun swaggerGenerate() {
-        val platform = platform.getOrElse(DEFAULT_PLATFORM)
-        val specName = specName.getOrElse(DEFAULT_NAME)
-        val packageName = packageName.getOrElse(DEFAULT_PACKAGE)
-        val outputDir = outputDir.getOrElse(project.layout.buildDirectory.dir(DEFAULT_OUTPUT_DIR).get()).asFile
+        val platform = platform.get()
+        val specName = specName.get()
+        val packageName = packageName.get()
+        val outputDir = outputDir.get().asFile
         val inputFile = inputFile.get().asFile
-        val specVersion = specVersion.getOrElse(readVersionFromSpecfile(inputFile))
+        val specVersion = specVersion.get()
 
         val headersToRemove = features?.headersToRemove?.get() ?: emptyList()
 
@@ -123,19 +116,4 @@ abstract class GenerateTask : DefaultTask() {
         val source = extraFiles.orNull?.asFile
         source?.copyRecursively(outputDir, overwrite = true)
     }
-
-    private fun readVersionFromSpecfile(specFile: File): String {
-        val swaggerSpec = SwaggerParser().readWithInfo(specFile.absolutePath, listOf(), false).swagger
-
-        return when (val version = swaggerSpec.info.version) {
-            is String -> {
-                println("Successfully read version from Swagger Spec file: $version")
-                version
-            }
-            else -> {
-                println("Issue in reading version from Swagger Spec file. Falling back to $DEFAULT_VERSION")
-                DEFAULT_VERSION
-            }
-        }
-    }
 }

gradle-plugin/plugin/src/main/java/com/yelp/codegen/plugin/GenerateTaskConfiguration.kt

@@ -1,22 +1,43 @@
 package com.yelp.codegen.plugin
 
+import io.swagger.parser.SwaggerParser
+import java.io.File
 import javax.inject.Inject
 import org.gradle.api.Action
-import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.model.ObjectFactory
-import org.gradle.api.provider.Property
+import org.gradle.api.Project
 
-abstract class GenerateTaskConfiguration @Inject constructor(objectFactory: ObjectFactory) {
-    abstract val platform: Property<String>
-    abstract val packageName: Property<String>
-    abstract val specName: Property<String>
-    abstract val specVersion: Property<String>
-    abstract val inputFile: RegularFileProperty
-    abstract val outputDir: DirectoryProperty
-    abstract val extraFiles: DirectoryProperty
+abstract class GenerateTaskConfiguration @Inject constructor(project: Project) {
+    val objects = project.objects
 
-    val features: FeatureConfiguration = FeatureConfiguration(objectFactory)
+    val platform = objects.property(String::class.java).convention("kotlin")
+    val packageName = objects.property(String::class.java).convention("com.codegen.default")
+    val specName = objects.property(String::class.java).convention("defaultname")
+    val specVersion = objects.property(String::class.java).convention(project.provider {
+        readVersionFromSpecfile(inputFile.get().asFile)
+    })
+    val inputFile = objects.fileProperty()
+    val outputDir = objects.directoryProperty().convention(project.layout.buildDirectory.dir(DEFAULT_OUTPUT_DIR).get())
+
+    val extraFiles = objects.directoryProperty()
+    val features: FeatureConfiguration = FeatureConfiguration(objects)
 
     fun features(action: Action<FeatureConfiguration>) = action.execute(features)
+
+    companion object {
+        private fun readVersionFromSpecfile(specFile: File): String {
+            val swaggerSpec = SwaggerParser().readWithInfo(specFile.absolutePath, listOf(), false).swagger
+
+            return when (val version = swaggerSpec.info.version) {
+                is String -> {
+                    println("Successfully read version from Swagger Spec file: $version")
+                    version
+                }
+                else -> {
+                    val defaultVersion = "0.0.0"
+                    println("Issue in reading version from Swagger Spec file. Falling back to $defaultVersion")
+                    defaultVersion
+                }
+            }
+        }
+    }
 }