select base or location package (#115)

hauner · hauner · commit 006ed69ac3a3 · 2025-06-15T18:48:58.000+02:00
diff --git a/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/ApiConverter.kt b/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/ApiConverter.kt
@@ -5,11 +5,7 @@
 
 package io.openapiprocessor.core.converter
 
-import io.openapiprocessor.core.converter.mapping.AddParameterTypeMapping
-import io.openapiprocessor.core.converter.mapping.DropParameterTypeMapping
-import io.openapiprocessor.core.converter.mapping.TargetType
-import io.openapiprocessor.core.converter.mapping.UnknownDataTypeException
-import io.openapiprocessor.core.converter.mapping.UnknownParameterTypeException
+import io.openapiprocessor.core.converter.mapping.*
 import io.openapiprocessor.core.converter.wrapper.MultiDataTypeWrapper
 import io.openapiprocessor.core.converter.wrapper.ResultDataTypeWrapper
 import io.openapiprocessor.core.converter.wrapper.SingleDataTypeWrapper
@@ -18,18 +14,19 @@ import io.openapiprocessor.core.model.*
 import io.openapiprocessor.core.model.datatypes.*
 import io.openapiprocessor.core.parser.*
 import io.openapiprocessor.core.parser.HttpMethod
+import io.openapiprocessor.core.parser.HttpStatus
 import io.openapiprocessor.core.parser.RequestBody
 import io.openapiprocessor.core.parser.Response
 import io.openapiprocessor.core.processor.mapping.v2.ResultStyle
 import io.openapiprocessor.core.support.capitalizeFirstChar
-import io.openapiprocessor.core.support.toPackageName
 import io.openapiprocessor.core.writer.Identifier
+import io.openapiprocessor.core.writer.java.OperationPackage
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import io.openapiprocessor.core.model.ContentType as ModelContentType
+import io.openapiprocessor.core.model.HttpStatus as ModelHttpStatus
 import io.openapiprocessor.core.model.RequestBody as ModelRequestBody
 import io.openapiprocessor.core.model.Response as ModelResponse
-import io.openapiprocessor.core.model.HttpStatus as ModelHttpStatus
-import io.openapiprocessor.core.model.ContentType as ModelContentType
 import io.openapiprocessor.core.model.parameters.Parameter as ModelParameter
 
 const val MULTIPART = "multipart/"
@@ -131,11 +128,7 @@ class  ApiConverter(
     }
 
     private fun getPackageName(operation: Operation): String {
-        if (options.packageNameFromPath) {
-            return toPackageName(operation.getDocumentUri(), options.packageName)
-        } else {
-            return listOf(options.packageName, "api").joinToString(".")
-        }
+        return OperationPackage(options).getPackageName(operation)
     }
 
     private fun createEndpoint(path: String, operation: Operation, dataTypes: DataTypes, resolver: RefResolver): Endpoint? {
diff --git a/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/DataTypeConverter.kt b/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/DataTypeConverter.kt
@@ -14,8 +14,8 @@ import io.openapiprocessor.core.model.DataTypes
 import io.openapiprocessor.core.model.Documentation
 import io.openapiprocessor.core.model.datatypes.*
 import io.openapiprocessor.core.support.capitalizeFirstChar
-import io.openapiprocessor.core.support.toPackageName
 import io.openapiprocessor.core.writer.Identifier
+import io.openapiprocessor.core.writer.java.SchemaPackage
 import java.util.*
 
 /**
@@ -285,11 +285,7 @@ class DataTypeConverter(
     }
 
     private fun getPackageName(schemaInfo: SchemaInfo): String {
-        if (options.packageNameFromPath) {
-            return toPackageName(schemaInfo.getDocumentUri(), options.packageName)
-        } else {
-            return listOf(options.packageName, "model").joinToString(".")
-        }
+        return SchemaPackage(options).getPackageName(schemaInfo)
     }
 
     private fun createSimpleDataType(schemaInfo: SchemaInfo, dataTypes: DataTypes): DataType {
diff --git a/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/support/URI.kt b/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/support/URI.kt
@@ -33,32 +33,3 @@ fun toURI(source: String): URI {
         .toAbsolutePath()
         .toUri()
 }
-
-/**
- * converts a document URI to a corresponding package name within a given root package. If the document
- * URI does not contain the root package path the result is the root package.
- *
- * example:
- * (resource:/tests/packages/inputs/main/kotlin/io/openapiprocessor/foo/foo.yaml, io.openapiprocessor) =>
- * io.openapiprocessor.foo
- *
- * @param documentUri the URI of the document to be converted
- * @param rootPackage the root package name to serve as the base for the resulting package name
- * @return the package name derived from the document URI, based on the specified root package
- *
- *
- */
-fun toPackageName(documentUri: URI, rootPackage: String): String {
-    val parentPath = documentUri
-        .resolve(".").path
-        .replace("/", ".")
-        .dropLast(1)
-
-    val rootIndex = parentPath.indexOf(rootPackage)
-    if (rootIndex == -1) {
-        return rootPackage
-    }
-
-    val pkgName = parentPath.substring(rootIndex)
-    return pkgName
-}
diff --git a/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/DefaultWriterFactory.kt b/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/DefaultWriterFactory.kt
@@ -29,9 +29,8 @@ open class DefaultWriterFactory(val options: ApiOptions): WriterFactory, InitWri
     private lateinit var resourcesPath: Path
 
     override fun createWriter(packageName: String, className: String): Writer {
-        if (options.packageNameFromPath && packagePaths[packageName] == null) {
-            val pkg = packageName.substring(options.packageName.length + 1)
-            val (name, path) = initTargetPackage(pkg)
+        if (packagePaths[packageName] == null) {
+            val (name, path) = initTargetPackage(packageName)
             packagePaths[name] = path
         }
 
@@ -52,21 +51,21 @@ open class DefaultWriterFactory(val options: ApiOptions): WriterFactory, InitWri
             clearTargetDir()
         }
 
-        val (apiName, apiPath) = initTargetPackage("api")
+        val (apiName, apiPath) = initTargetPackage(options.packageApi)
         packagePaths[apiName] = apiPath
         log.debug ("initialized target folder: {}", apiPath.toAbsolutePath ().toString ())
 
         // should be dto or resources
-        val (modelName, modelPath) = initTargetPackage("model")
+        val (modelName, modelPath) = initTargetPackage(options.packageModel)
         packagePaths[modelName] = modelPath
         log.debug ("initialized target folder: {}", modelPath.toAbsolutePath ().toString ())
 
-        val (supportName, supportPath) = initTargetPackage("support")
+        val (supportName, supportPath) = initTargetPackage(options.packageSupport)
         packagePaths[supportName] = supportPath
         log.debug ("initialized target folder: {}", supportPath.toAbsolutePath ().toString ())
 
         if (options.beanValidation) {
-            val (validationName, validationPath) = initTargetPackage("validation")
+            val (validationName, validationPath) = initTargetPackage(options.packageValidation)
             packagePaths[validationName] = validationPath
             log.debug("initialized target folder: {}", validationPath.toAbsolutePath().toString())
         }
@@ -100,15 +99,11 @@ open class DefaultWriterFactory(val options: ApiOptions): WriterFactory, InitWri
         return target
     }
 
-    protected fun initTargetPackage(subPackageName: String): Pair<String, Path> {
-        val rootPackageFolder = options.packageName.replace(".", "/")
-        val subPackageFolder = subPackageName.replace(".", "/")
-
-        val targetPackage = options.packageName.plus(".$subPackageName")
-        val packageFolder = listOf(rootPackageFolder, subPackageFolder).joinToString("/")
+    protected fun initTargetPackage(packageName: String): Pair<String, Path> {
+        val packageFolder = packageName.replace(".", "/")
         val packagePath = createTargetPackage(packageFolder)
 
-        return Pair(targetPackage, packagePath)
+        return Pair(packageName, packagePath)
     }
 
     private fun createTargetPackage(apiPkg: String): Path {
diff --git a/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/ApiWriter.kt b/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/ApiWriter.kt
@@ -50,7 +50,7 @@ class ApiWriter(
     }
 
     private fun writeGenerated () {
-        val writer = getWriter("${options.packageName}.support", "Generated")
+        val writer = getWriter("${options.packageOptions.base}.support", "Generated")
         writeGenerated(writer)
         writer.close()
     }
@@ -92,8 +92,8 @@ class ApiWriter(
     }
 
     private fun writeAdditionalFiles() {
-        additionalWriter.forEach {
-            it(options, { format(it) }, writerFactory)
+        additionalWriter.forEach { add ->
+            add(options, { format(it) }, writerFactory)
         }
     }
 
diff --git a/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/OperationPackage.kt b/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/OperationPackage.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2025 https://github.com/openapi-processor/openapi-processor-base
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+package io.openapiprocessor.core.writer.java
+
+import io.openapiprocessor.core.converter.ApiOptions
+import io.openapiprocessor.core.parser.Operation
+
+private const val SUB_PACKAGE = "api"
+
+class OperationPackage(private val options: ApiOptions) {
+   private val pkg = PackageSelector(options.packageOptions)
+
+    fun getPackageName(operation: Operation): String {
+        return if (options.packageNameFromLocation) {
+            pkg.getPackageName(operation.getDocumentUri(), SUB_PACKAGE)
+        } else {
+            pkg.getPackageName(SUB_PACKAGE)
+        }
+    }
+}
diff --git a/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/SchemaPackage.kt b/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/SchemaPackage.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2025 https://github.com/openapi-processor/openapi-processor-base
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+package io.openapiprocessor.core.writer.java
+
+import io.openapiprocessor.core.converter.ApiOptions
+import io.openapiprocessor.core.converter.SchemaInfo
+
+private const val SUB_PACKAGE = "model"
+
+class SchemaPackage(private val options: ApiOptions)  {
+    private val pkg = PackageSelector(options.packageOptions)
+
+    fun getPackageName(schemaInfo: SchemaInfo): String {
+        return if (options.packageNameFromLocation) {
+            pkg.getPackageName(schemaInfo.getDocumentUri(), SUB_PACKAGE)
+        } else {
+            pkg.getPackageName(SUB_PACKAGE)
+        }
+    }
+}
diff --git a/openapi-processor-core/src/test/groovy/io/openapiprocessor/core/converter/ApiConverterGSpec.groovy b/openapi-processor-core/src/test/groovy/io/openapiprocessor/core/converter/ApiConverterGSpec.groovy
@@ -162,9 +162,9 @@ paths:
           description: no content
 """)
 
-        def options = new ApiOptions(
-            packageName: 'a.package.name'
-        )
+        def options = new ApiOptions()
+        options.packageName = 'a.package.name'
+        options.packageOptions.base = options.packageName
 
         when:
         api = apiConverter (options, Stub(Framework))
diff --git a/openapi-processor-core/src/test/groovy/io/openapiprocessor/core/converter/DataTypeConverterLoopSpec.groovy b/openapi-processor-core/src/test/groovy/io/openapiprocessor/core/converter/DataTypeConverterLoopSpec.groovy
@@ -48,8 +48,11 @@ components:
           \$ref: '#/components/schemas/Self'
 """)
 
+        def options = new ApiOptions()
+        options.packageOptions.base = options.packageName
+
         when:
-        def api = apiConverter (Stub (Framework))
+        def api = apiConverter (options, Stub (Framework))
             .convert (openApi)
 
         then:
diff --git a/openapi-processor-core/src/test/groovy/io/openapiprocessor/core/converter/DataTypeConverterSpec.groovy b/openapi-processor-core/src/test/groovy/io/openapiprocessor/core/converter/DataTypeConverterSpec.groovy
@@ -230,7 +230,9 @@ paths:
                     type: string                
 """)
         when:
-        def options = new ApiOptions(packageName: 'pkg')
+        def options = new ApiOptions()
+        options.packageName = 'pkg'
+        options.packageOptions.base = options.packageName
 
         Api api = apiConverter (options, Stub (Framework))
             .convert (openApi)
@@ -280,7 +282,9 @@ components:
           type: string
 """)
         when:
-        def options = new ApiOptions(packageName: 'pkg')
+        def options = new ApiOptions()
+        options.packageName = 'pkg'
+        options.packageOptions.base = options.packageName
 
         Api api = apiConverter (options, Stub (Framework))
             .convert (openApi)
diff --git a/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/support/UriSpec.kt b/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/support/UriSpec.kt
@@ -11,7 +11,6 @@ import io.kotest.data.row
 import io.kotest.matchers.shouldBe
 import io.openapiprocessor.core.NotWindows
 import io.openapiprocessor.core.Windows
-import java.net.URI
 import java.nio.file.Paths
 
 class UriSpec: StringSpec({
@@ -44,21 +43,4 @@ class UriSpec: StringSpec({
             toURI(source).toString() shouldBe uri
         }
     }
-
-    "extract package name from document location" {
-        forAll(
-            row(
-                "file:///user/folder/project/src/main/api/openapi.yaml",
-                "io.openapiprocessor",
-                "io.openapiprocessor"
-            ),
-            row(
-                "file:///user/folder/project/src/main/kotlin/io/openapiprocessor/foo/foo.yaml",
-                "io.openapiprocessor",
-                "io.openapiprocessor.foo"
-            )
-        ) { docUri, rootPkg, expectedPkg ->
-            toPackageName(URI.create(docUri), rootPkg) shouldBe expectedPkg
-        }
-    }
 })

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ class ApiWriter(`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`private fun writeGenerated () {`
`53`		`- val writer = getWriter("${options.packageName}.support", "Generated")`
	`53`	`+ val writer = getWriter("${options.packageOptions.base}.support", "Generated")`
`54`	`54`	`writeGenerated(writer)`
`55`	`55`	`writer.close()`
`56`	`56`	`}`
`@@ -92,8 +92,8 @@ class ApiWriter(`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`private fun writeAdditionalFiles() {`
`95`		`- additionalWriter.forEach {`
`96`		`- it(options, { format(it) }, writerFactory)`
	`95`	`+ additionalWriter.forEach { add ->`
	`96`	`+ add(options, { format(it) }, writerFactory)`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`