Merge pull request #39 from edee111/fix/multiple-fork-properties

FIX: Cannot use multiple forkProperties

Author: bnasslahsen

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

@@ -36,7 +36,10 @@ open class OpenApiGradlePlugin : Plugin<Project> {
                     if (extension.forkProperties.isPresent) {
                         val element = extension.forkProperties.get()
                         if (element is String) {
-                            command.add(element)
+                            val elements = element
+                                .split("-D")
+                                .map { "-D${it.trim()}" }
+                            command.addAll(elements)
                         } else if (element is Properties) {
                             element.toMap().map { r -> "-D${r.key}=${r.value}" }.forEach { p -> command.add(p) }
                         } else {

src/test/kotlin/org/springdoc/openapi/gradle/plugin/OpenApiGradlePluginTest.kt

@@ -126,7 +126,7 @@ class OpenApiGradlePluginTest {
     fun `using forked properties`() {
         buildFile.writeText("""$baseBuildGradle
             openApi{
-                forkProperties = "-Dspring.profiles.active=multiple-endpoints"
+                forkProperties = "-Dspring.profiles.active=multiple-endpoints -Dsome.second.property=someValue"
             }
         """.trimMargin())
 
@@ -139,7 +139,7 @@ class OpenApiGradlePluginTest {
         assertEquals(TaskOutcome.SUCCESS, getTaskByName(result, "generateOpenApiDocs")?.outcome)
 
         val openApiJsonFile = File(projectBuildDir, DEFAULT_OPEN_API_FILE_NAME)
-        assertOpenApiJsonFileIsAsExpected(openApiJsonFile, 2)
+        assertOpenApiJsonFileIsAsExpected(openApiJsonFile, 3)
     }
 
     @Test

src/test/resources/acceptance-project/src/main/java/com/example/demo/endpoints/ConditionalController.java

@@ -0,0 +1,15 @@
+package com.example.demo.endpoints;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+
+@ConditionalOnProperty(value = {"some.second.property"}, havingValue = "someValue")
+@RestController("/conditional")
+public class ConditionalController {
+
+    @GetMapping("/conditional")
+    public String conditional(){
+        return "conditional";
+    }
+}