create package from location (#115)

Author: hauner

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

@@ -22,6 +22,7 @@ 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 org.slf4j.Logger
 import org.slf4j.LoggerFactory
@@ -124,16 +125,19 @@ class  ApiConverter(
             return itf
         }
 
-        itf = Interface(
-            targetInterfaceName,
-            listOf(options.packageName, "api").joinToString("."),
-            pathPrefix,
-            identifier)
-
+        itf = Interface(targetInterfaceName, getPackageName(operation), pathPrefix, identifier)
         interfaces[targetInterfaceName] = itf
         return itf
     }
 
+    private fun getPackageName(operation: Operation): String {
+        if (options.packageNameFromPath) {
+            return toPackageName(operation.getDocumentUri(), options.packageName)
+        } else {
+            return listOf(options.packageName, "api").joinToString(".")
+        }
+    }
+
     private fun createEndpoint(path: String, operation: Operation, dataTypes: DataTypes, resolver: RefResolver): Endpoint? {
         return try {
             val ctx = ApiConverterContext(

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

@@ -5,13 +5,16 @@
 
 package io.openapiprocessor.core.converter
 
-import io.openapiprocessor.core.converter.mapping.*
+import io.openapiprocessor.core.converter.mapping.TargetType
+import io.openapiprocessor.core.converter.mapping.TypeMapping
+import io.openapiprocessor.core.converter.mapping.UnknownDataTypeException
 import io.openapiprocessor.core.converter.wrapper.NullDataTypeWrapper
 import io.openapiprocessor.core.model.DataTypeCollector
 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 java.util.*
 
@@ -273,14 +276,22 @@ class DataTypeConverter(
 
         return ObjectDataType(
             DataTypeName(schemaInfo.getName(), getTypeNameWithSuffix(schemaInfo.getName())),
-            listOf(options.packageName, "model").joinToString("."),
+            getPackageName(schemaInfo),
             properties = properties,
             constraints = constraints,
             deprecated = schemaInfo.getDeprecated(),
             documentation = Documentation(description = schemaInfo.description)
         )
     }
 
+    private fun getPackageName(schemaInfo: SchemaInfo): String {
+        if (options.packageNameFromPath) {
+            return toPackageName(schemaInfo.getDocumentUri(), options.packageName)
+        } else {
+            return listOf(options.packageName, "model").joinToString(".")
+        }
+    }
+
     private fun createSimpleDataType(schemaInfo: SchemaInfo, dataTypes: DataTypes): DataType {
         val dataType = createSimpleDataTypeX(schemaInfo, dataTypes)
 

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/DefaultWriterFactory.kt

@@ -29,7 +29,7 @@ open class DefaultWriterFactory(val options: ApiOptions): WriterFactory, InitWri
     private lateinit var resourcesPath: Path
 
     override fun createWriter(packageName: String, className: String): Writer {
-        if (packagePaths[packageName] == null) {
+        if (options.packageNameFromPath && packagePaths[packageName] == null) {
             val pkg = packageName.substring(options.packageName.length + 1)
             val (name, path) = initTargetPackage(pkg)
             packagePaths[name] = path

openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/DefaultWriterFactorySpec.kt

@@ -257,6 +257,7 @@ class DefaultWriterFactorySpec : StringSpec({
     "lazy initialize additional package folders" {
         options.targetDir = listOf(target.toString()).joinToString(File.separator)
         options.targetDirOptions.layout = TargetDirLayout.CLASSIC
+        options.packageNameFromPath = true
 
         val writerFactory = DefaultWriterFactory(options)
         writerFactory.init()