Merge pull request #14 from kpramesh2212/master

Fix: Spring boot application not terminating properly

Author: bnasslahsen

build.gradle.kts

@@ -2,12 +2,12 @@ plugins {
     `java-gradle-plugin`
     id("com.gradle.plugin-publish") version "0.10.1"
     id("org.sonarqube") version "2.8"
-    kotlin("jvm") version "1.3.61"
+    kotlin("jvm") version "1.3.70"
     `maven-publish`
 }
 
 group = "org.springdoc"
-version = "1.0.0"
+version = "1.0.1-SNAPSHOT"
 
 sonarqube {
     properties {

src/main/kotlin/org/springdoc/openapi/gradle/plugin/Constants.kt

@@ -6,6 +6,7 @@ const val OPEN__API_TASK_NAME = "generateOpenApiDocs"
 const val OPEN_API_TASK_DESCRIPTION = "Generates the spring doc openapi file"
 const val SPRING_BOOT_JAR_TASK_NAME = "bootJar"
 const val FORKED_SPRING_BOOT_RUN_TASK_NAME = "forkedSpringBootRun"
+const val FINALIZER_TASK_NAME = "stopForkedSpringBoot"
 
 const val DEFAULT_API_DOCS_URL = "http://localhost:8080/v3/api-docs"
 const val DEFAULT_OPEN_API_FILE_NAME = "openapi.json"

src/main/kotlin/org/springdoc/openapi/gradle/plugin/OpenApiGeneratorTask.kt

@@ -7,6 +7,7 @@ import org.awaitility.Durations
 import org.awaitility.core.ConditionTimeoutException
 import org.awaitility.kotlin.*
 import org.gradle.api.DefaultTask
+import org.gradle.api.GradleException
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
@@ -26,8 +27,6 @@ open class OpenApiGeneratorTask : DefaultTask() {
     @get:OutputDirectory
     val outputDir: DirectoryProperty = project.objects.directoryProperty()
     private val waitTimeInSeconds: Property<Int> = project.objects.property(Int::class.java)
-    @Internal
-    val taskError: Property<String> = project.objects.property(String::class.java)
 
     init {
         description = OPEN_API_TASK_DESCRIPTION
@@ -41,7 +40,6 @@ open class OpenApiGeneratorTask : DefaultTask() {
         val defaultOutputDir = project.objects.directoryProperty()
         defaultOutputDir.set(project.buildDir)
 
-        taskError.set("")
         apiDocsUrl.set(extension.apiDocsUrl.getOrElse(DEFAULT_API_DOCS_URL))
         outputFileName.set(extension.outputFileName.getOrElse(DEFAULT_OPEN_API_FILE_NAME))
         outputDir.set(extension.outputDir.getOrElse(defaultOutputDir.get()))
@@ -67,11 +65,8 @@ open class OpenApiGeneratorTask : DefaultTask() {
             val outputFile = outputDir.file(outputFileName.get()).get().asFile
             outputFile.writeText(gson.toJson(googleJsonObject))
         } catch (e: ConditionTimeoutException) {
-            taskError.set("Timeout occurred while trying to connect to ${apiDocsUrl.get()}")
-            this.logger.error(
-                "Unable to connect to ${apiDocsUrl.get()} waited for ${waitTimeInSeconds.get()} seconds",
-                e
-            )
+            this.logger.error("Unable to connect to ${apiDocsUrl.get()} waited for ${waitTimeInSeconds.get()} seconds", e)
+            throw GradleException("Unable to connect to ${apiDocsUrl.get()} waited for ${waitTimeInSeconds.get()} seconds")
         }
     }
 

src/main/kotlin/org/springdoc/openapi/gradle/plugin/OpenApiGradlePlugin.kt

@@ -7,7 +7,6 @@ import org.gradle.api.Project
 import org.slf4j.LoggerFactory
 
 open class OpenApiGradlePlugin : Plugin<Project> {
-    private val LOGGER = LoggerFactory.getLogger(OpenApiGradlePlugin::class.java)
 
     override fun apply(project: Project) {
         // Run time dependency on the following plugins
@@ -31,16 +30,17 @@ open class OpenApiGradlePlugin : Plugin<Project> {
                 }
             }
 
+            val stopForkedSpringBoot = project.tasks.register(FINALIZER_TASK_NAME) {
+                it.dependsOn(forkedSpringBoot)
+                it.doLast {
+                    forkedSpringBoot.get().processHandle.abort();
+                }
+            }
+
             // This is my task. Before I can run it I have to run the dependent tasks
             project.tasks.register(OPEN__API_TASK_NAME, OpenApiGeneratorTask::class.java) { openApiGenTask ->
                 openApiGenTask.dependsOn(forkedSpringBoot)
-
-                openApiGenTask.doLast {
-                    forkedSpringBoot.get().processHandle.abort()
-                    if (openApiGenTask.taskError.get().isNotBlank()) {
-                        throw GradleException(openApiGenTask.taskError.get())
-                    }
-                }
+                openApiGenTask.finalizedBy(stopForkedSpringBoot)
             }
         }