better name (#176)

Author: hauner

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/OptionsConverter.kt

@@ -74,7 +74,12 @@ class OptionsConverter(private val checkObsoleteProcessorOptions: Boolean = fals
                     val (enablePathPrefix, pathPrefixServerIndex) = checkServerUrl(mapping.options)
                     options.basePathOptions.enabled = enablePathPrefix
                     options.basePathOptions.serverUrl = pathPrefixServerIndex
-                    options.basePathOptions.profileName = mapping.options.basePath.profileName
+                    options.basePathOptions.propertiesName = mapping.options.basePath.profileName
+                    // to write the base path resource we need standard layout
+                    if (options.basePathOptions.enabled && !options.targetDirOptions.standardLayout) {
+                        log.warn("base-path is enabled, forcing target-dir.layout = standard")
+                        options.targetDirOptions.layout = TargetDirLayout.STANDARD
+                    }
 
                     options.javadoc = mapping.options.javadoc
                     options.oneOfInterface = mapping.options.oneOfInterface

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/options/BasePathOptions.kt

@@ -17,7 +17,7 @@ class BasePathOptions {
     var serverUrl: Int? = null
 
     /**
-     * profile name for base path.
+     * properties name for base path.
      */
-    var profileName: String = "api.properties"
+    var propertiesName: String = "api.properties"
 }

openapi-processor-core/src/main/resources/mapping/v9/mapping.yaml.json

@@ -120,8 +120,8 @@
                 "true", "false", "0", "1"
               ]
             },
-            "profile-name": {
-              "description": "name of the resource profile properties file with the base path configuration",
+            "properties-name": {
+              "description": "name of the resource properties file with the base path configuration",
               "default": "api.properties",
               "examples": ["api.properties", "openapi.properties"]
             }

openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/converter/OptionsConverterSpec.kt

@@ -36,7 +36,7 @@ class OptionsConverterSpec: StringSpec({
         options.formatCode.shouldBeFalse()
         options.basePathOptions.enabled shouldBe false
         options.basePathOptions.serverUrl shouldBe null
-        options.basePathOptions.profileName shouldBe "api.properties"
+        options.basePathOptions.propertiesName shouldBe "api.properties"
 
         options.globalMappings.shouldNotBeNull()
         options.endpointMappings.shouldNotBeNull()
@@ -132,7 +132,7 @@ class OptionsConverterSpec: StringSpec({
         options.formatCode.shouldBeFalse()
         options.basePathOptions.enabled shouldBe true
         options.basePathOptions.serverUrl shouldBe 0
-        options.basePathOptions.profileName shouldBe "openapi.properties"
+        options.basePathOptions.propertiesName shouldBe "openapi.properties"
 
         options.beanValidationValidOnReactive.shouldBeFalse()
         options.identifierWordBreakFromDigitToLetter.shouldBeFalse()
@@ -206,7 +206,26 @@ class OptionsConverterSpec: StringSpec({
 
             options.basePathOptions.enabled shouldBe su.enabled
             options.basePathOptions.serverUrl shouldBe su.index
-            options.basePathOptions.profileName shouldBe "openapi.properties"
+            options.basePathOptions.propertiesName shouldBe "openapi.properties"
         }
     }
+
+    "enabling base path resource will automatically enable target-dir layout standard" {
+        val converter = OptionsConverter()
+        converter.log = mockk<Logger>(relaxed = true)
+
+        val options = converter.convertOptions(mapOf(
+            "mapping" to """
+                openapi-processor-mapping: v9
+                options:
+                  package-name: pkg
+                  base-path:
+                    server-url: true
+                    profile-name: openapi.properties
+            """.trimIndent()
+        ))
+
+        options.basePathOptions.enabled shouldBe true
+        options.targetDirOptions.layout.isStandard() shouldBe true
+    }
 })