Merge branch 'refs/heads/main' into 2024.6.x

hauner · hauner · commit dcc8b644a41f · 2024-10-02T23:41:57.000+02:00
# Conflicts:
#	gradle/libs.versions.toml
diff --git a/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/OptionsConverter.kt b/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/OptionsConverter.kt
@@ -74,7 +74,7 @@ class OptionsConverter(private val checkObsoleteProcessorOptions: Boolean = fals
                     val (enablePathPrefix, pathPrefixServerIndex) = checkServerUrl(mapping.options)
                     options.basePathOptions.enabled = enablePathPrefix
                     options.basePathOptions.serverUrl = pathPrefixServerIndex
-                    options.basePathOptions.propertiesName = mapping.options.basePath.profileName
+                    options.basePathOptions.propertiesName = mapping.options.basePath.propertiesName
                     // 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")
@@ -122,7 +122,7 @@ class OptionsConverter(private val checkObsoleteProcessorOptions: Boolean = fals
         return when (options.basePath.serverUrl) {
             "false" -> Pair(false, null)
             "true" -> Pair(true, 0)
-            else -> Pair(true, options.basePath.serverUrl?.toInt())
+            else -> Pair(true, options.basePath.serverUrl.toInt())
         }
     }
 
diff --git a/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/AnnotationNameTypeMappingDefault.kt b/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/AnnotationNameTypeMappingDefault.kt
@@ -5,7 +5,7 @@
 
 package io.openapiprocessor.core.converter.mapping
 
-open class AnnotationNameMappingDefault(
+open class AnnotationNameTypeMappingDefault(
     /**
      * The parameter name of this mapping. Must match 1:1 with what is written in the api.
      */
diff --git a/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/EndpointMappings.kt b/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/EndpointMappings.kt
@@ -175,13 +175,13 @@ class EndpointMappings(
     fun findAnnotationParameterNameTypeMapping(query: MappingQuery): List<AnnotationNameMapping> {
         val httpMethodMappings = methodMappings[query.method]
         val methodMappings = httpMethodMappings?.findAnnotationParameterNameTypeMapping(
-            AnnotationParameterNameMatcher(query))
+            AnnotationParameterNameTypeMatcher(query))
         if (!methodMappings.isNullOrEmpty()) {
             log.trace("found endpoint method annotation parameter name type mappings ({} {})", query.path, query.method)
             return methodMappings
         }
 
-        val mappings = mappings.findAnnotationParameterNameTypeMapping(AnnotationParameterNameMatcher(query))
+        val mappings = mappings.findAnnotationParameterNameTypeMapping(AnnotationParameterNameTypeMatcher(query))
         log.trace("found endpoint annotation parameter name type mapping ({})", query.path)
         return mappings
     }
@@ -201,13 +201,13 @@ class EndpointMappings(
 
     fun findContentTypeMapping(query: MappingQuery): ContentTypeMapping? {
         val httpMethodMappings = methodMappings[query.method]
-        val methodMapping = httpMethodMappings?.findContentTypeMapping(ResponseTypeMatcher(query))
+        val methodMapping = httpMethodMappings?.findContentTypeMapping(ContentTypeMatcher(query))
         if (methodMapping != null) {
             log.trace("found endpoint method content type mapping ({} {})", query.path, query.method)
             return methodMapping
         }
 
-        val mapping = mappings.findContentTypeMapping(ResponseTypeMatcher(query))
+        val mapping = mappings.findContentTypeMapping(ContentTypeMatcher(query))
         if (mapping != null) {
             log.trace("found endpoint content type mapping ({})", query.path)
             return mapping
diff --git a/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/MappingBucket.kt b/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/MappingBucket.kt
@@ -5,7 +5,7 @@
 
 package io.openapiprocessor.core.converter.mapping
 
-interface MappingBucket {
+fun interface MappingBucket {
     /**
      * filter the mapping(s) by the given filter.
      *
diff --git a/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/MappingRepository.kt b/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/MappingRepository.kt
@@ -54,15 +54,15 @@ class MappingRepository(
     }
 
     fun findGlobalAnnotationParameterNameTypeMapping(query: MappingQuery): List<AnnotationNameMapping> {
-        return globalMappings.findAnnotationParameterNameTypeMapping(AnnotationParameterNameMatcher(query))
+        return globalMappings.findAnnotationParameterNameTypeMapping(AnnotationParameterNameTypeMatcher(query))
     }
 
     fun findGlobalAddParameterTypeMappings(): List<AddParameterTypeMapping>  {
         return globalMappings.findAddParameterTypeMappings(AddParameterTypeMatcher())
     }
 
     fun findGlobalContentTypeMapping(query: MappingQuery): ContentTypeMapping? {
-        return globalMappings.findContentTypeMapping(ResponseTypeMatcher(query))
+        return globalMappings.findContentTypeMapping(ContentTypeMatcher(query))
     }
 
     fun getEndpointResultTypeMapping(query: MappingQuery): ResultTypeMapping? {
diff --git a/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/matcher/AnnotationParameterNameTypeMatcher.kt b/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/matcher/AnnotationParameterNameTypeMatcher.kt
@@ -9,8 +9,7 @@ import io.openapiprocessor.core.converter.mapping.*
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
-// todo AnnotationParameterNameTypeMatcher
-class AnnotationParameterNameMatcher(private val query: MappingQuery): MappingMatcher {
+class AnnotationParameterNameTypeMatcher(private val query: MappingQuery): MappingMatcher {
     val log: Logger = LoggerFactory.getLogger(this.javaClass.name)
 
     override fun match(mapping: Mapping): Boolean {
diff --git a/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/matcher/ContentTypeMatcher.kt b/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/matcher/ContentTypeMatcher.kt
@@ -9,8 +9,7 @@ import io.openapiprocessor.core.converter.mapping.*
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
-// todo ContentTypeMatcher
-class ResponseTypeMatcher(private val query: MappingQuery): MappingMatcher, (ContentTypeMapping) -> Boolean {
+class ContentTypeMatcher(private val query: MappingQuery): MappingMatcher, (ContentTypeMapping) -> Boolean {
     val log: Logger = LoggerFactory.getLogger(this.javaClass.name)
 
     override fun match(mapping: Mapping): Boolean {
diff --git a/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/processor/mapping/v2/BasePath.kt b/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/processor/mapping/v2/BasePath.kt
@@ -14,5 +14,5 @@ data class BasePath(
     /**
      * profile name for base path.
      */
-    val profileName: String = "api.properties"
+    val propertiesName: String = "api.properties"
 )
diff --git a/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/processor/mapping/v2/MappingConverter.kt b/openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/processor/mapping/v2/MappingConverter.kt
@@ -218,7 +218,7 @@ class MappingConverter(val mapping: MappingV2) {
         val (mapping, genericTypes) = parseMapping(source.name, source.generics)
 
         return if (mapping.kind == ANNOTATE) {
-            AnnotationNameMappingDefault(mapping.sourceType!!, Annotation(
+            AnnotationNameTypeMappingDefault(mapping.sourceType!!, Annotation(
                 mapping.annotationType!!,
                 mapping.annotationParameters)
                 )
@@ -425,7 +425,7 @@ class MappingConverter(val mapping: MappingV2) {
             throw BadMappingException(source.type)
         }
 
-        return AnnotationNameMappingDefault(mapping.sourceType!!, Annotation(
+        return AnnotationNameTypeMappingDefault(mapping.sourceType!!, Annotation(
                         mapping.annotationType!!,
                         mapping.annotationParameters))
     }
diff --git a/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/converter/OptionsConverterSpec.kt b/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/converter/OptionsConverterSpec.kt
@@ -114,7 +114,7 @@ class OptionsConverterSpec: StringSpec({
                   format-code: false
                   base-path:
                     server-url: 0
-                    profile-name: openapi.properties
+                    properties-name: openapi.properties
                 compatibility:
                   bean-validation-valid-on-reactive: false
                   identifier-word-break-from-digit-to-letter: false
@@ -200,7 +200,7 @@ class OptionsConverterSpec: StringSpec({
                       package-name: no.warning
                       base-path:
                         server-url: ${su.source}
-                        profile-name: openapi.properties
+                        properties-name: openapi.properties
                 """.trimIndent()
             ))
 
@@ -221,7 +221,7 @@ class OptionsConverterSpec: StringSpec({
                   package-name: pkg
                   base-path:
                     server-url: true
-                    profile-name: openapi.properties
+                    properties-name: openapi.properties
             """.trimIndent()
         ))
 
diff --git a/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/processor/mapping/v2/MappingConverterGenericsSpec.kt b/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/processor/mapping/v2/MappingConverterGenericsSpec.kt
@@ -12,7 +12,7 @@ import io.kotest.matchers.nulls.shouldBeNull
 import io.kotest.matchers.shouldBe
 import io.openapiprocessor.core.converter.mapping.matcher.AddParameterTypeMatcher
 import io.openapiprocessor.core.converter.mapping.matcher.ParameterNameTypeMatcher
-import io.openapiprocessor.core.converter.mapping.matcher.ResponseTypeMatcher
+import io.openapiprocessor.core.converter.mapping.matcher.ContentTypeMatcher
 import io.openapiprocessor.core.converter.mapping.matcher.TypeMatcher
 import io.openapiprocessor.core.processor.MappingConverter
 import io.openapiprocessor.core.processor.MappingReader
@@ -246,7 +246,7 @@ class MappingConverterGenericsSpec: StringSpec({
                    """.trimMargin()
 
         val mappingData = converter.convert(reader.read(yaml))
-        val type = mappingData.globalMappings.findContentTypeMapping(ResponseTypeMatcher(query(contentType = "foo/bar")))!!
+        val type = mappingData.globalMappings.findContentTypeMapping(ContentTypeMatcher(query(contentType = "foo/bar")))!!
 
         type.contentType shouldBe "foo/bar"
         val tm = type.mapping
diff --git a/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/processor/mapping/v2/MappingReaderSpec.kt b/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/processor/mapping/v2/MappingReaderSpec.kt
@@ -257,13 +257,13 @@ class MappingReaderSpec: StringSpec ({
                 |  package-name: no.warning
                 |  base-path:
                 |   server-url: $server
-                |   profile-name: base-path.properties
+                |   properties-name: base-path.properties
                 """.trimMargin()
 
             val mapping = MappingReader().read(yaml) as Mapping
 
             mapping.options.basePath.serverUrl shouldBe "$server"
-            mapping.options.basePath.profileName shouldBe "base-path.properties"
+            mapping.options.basePath.propertiesName shouldBe "base-path.properties"
         }
     }
 })
diff --git a/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/support/Mappings.kt b/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/support/Mappings.kt
@@ -113,7 +113,7 @@ class AnnotationNameTypeMappingBuilder(val sourceTypeName: String) {
     lateinit var type: String
 
     fun annotation(): Mapping {
-        return AnnotationNameMappingDefault(
+        return AnnotationNameTypeMappingDefault(
             sourceTypeName,
             Annotation(type, linkedMapOf()))
     }
diff --git a/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/support/Matcher.kt b/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/support/Matcher.kt
@@ -86,8 +86,8 @@ fun annotationParameterNameTypeMatcher(
     contentType: String? = null,
     primitive: Boolean = false,
     array: Boolean = false
-): AnnotationParameterNameMatcher {
-    return AnnotationParameterNameMatcher(MappingFinderQuery(
+): AnnotationParameterNameTypeMatcher {
+    return AnnotationParameterNameTypeMatcher(MappingFinderQuery(
         path,
         method,
         name,
@@ -108,8 +108,8 @@ fun responseTypeMatcher(
     contentType: String? = null,
     primitive: Boolean = false,
     array: Boolean = false
-): ResponseTypeMatcher {
-    return ResponseTypeMatcher(MappingFinderQuery(
+): ContentTypeMatcher {
+    return ContentTypeMatcher(MappingFinderQuery(
         path,
         method,
         name,
diff --git a/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/DataTypeWriterPojoSpec.kt b/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/DataTypeWriterPojoSpec.kt
@@ -489,18 +489,18 @@ class DataTypeWriterPojoSpec: StringSpec({
         options.extensionMappings = mapOf(
             "x-foo" to ExtensionMappings(
                 mapOf("ext" to listOf(
-                    AnnotationNameMappingDefault(
+                    AnnotationNameTypeMappingDefault(
                         "ext", annotation = MappingAnnotation("annotation.Extension", linkedMapOf())
                     )))),
 
             "x-bar" to ExtensionMappings(
                 mapOf(
                     "barA" to listOf(
-                        AnnotationNameMappingDefault(
+                        AnnotationNameTypeMappingDefault(
                             "barA", annotation = MappingAnnotation("annotation.BarA", linkedMapOf())
                         )),
                     "barB" to listOf(
-                        AnnotationNameMappingDefault(
+                        AnnotationNameTypeMappingDefault(
                             "barB", annotation = MappingAnnotation("annotation.BarB", linkedMapOf())
                         ))
                     ))
diff --git a/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/DataTypeWriterRecordSpec.kt b/openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/DataTypeWriterRecordSpec.kt
@@ -15,7 +15,7 @@ import io.kotest.matchers.string.shouldStartWith
 import io.openapiprocessor.core.converter.ApiOptions
 import io.openapiprocessor.core.converter.JsonPropertyAnnotationMode
 import io.openapiprocessor.core.converter.mapping.Annotation
-import io.openapiprocessor.core.converter.mapping.AnnotationNameMappingDefault
+import io.openapiprocessor.core.converter.mapping.AnnotationNameTypeMappingDefault
 import io.openapiprocessor.core.converter.mapping.ExtensionMappings
 import io.openapiprocessor.core.extractImports
 import io.openapiprocessor.core.model.datatypes.*
@@ -313,18 +313,18 @@ class DataTypeWriterRecordSpec: StringSpec({
         options.extensionMappings = mapOf(
             "x-foo" to ExtensionMappings(
                 mapOf("ext" to listOf(
-                    AnnotationNameMappingDefault(
+                    AnnotationNameTypeMappingDefault(
                         "ext", annotation = Annotation("annotation.Extension", linkedMapOf())
                     )))),
 
             "x-bar" to ExtensionMappings(
                 mapOf(
                     "barA" to listOf(
-                        AnnotationNameMappingDefault(
+                        AnnotationNameTypeMappingDefault(
                             "barA", annotation = Annotation("annotation.BarA", linkedMapOf())
                         )),
                     "barB" to listOf(
-                        AnnotationNameMappingDefault(
+                        AnnotationNameTypeMappingDefault(
                             "barB", annotation = Annotation("annotation.BarB", linkedMapOf())
                         ))
                     ))
diff --git a/openapi-processor-core/src/testInt/resources/tests/server-url/inputs/mapping.yaml b/openapi-processor-core/src/testInt/resources/tests/server-url/inputs/mapping.yaml
@@ -7,4 +7,4 @@ options:
     layout: standard
   base-path:
     server-url: 0
-    profile-name: api.properties
+    properties-name: api.properties
diff --git a/openapi-processor-core/src/testInt/resources/tests/server-url/inputs/openapi30.yaml b/openapi-processor-core/src/testInt/resources/tests/server-url/inputs/openapi30.yaml
@@ -4,23 +4,10 @@ info:
   version: 1.0.0
 
 servers:
-  - url: "{schema}://{host}:{port}/{path1}/{path2}/v{version}"
+  - url: "https://openapprocessor.io/{path}"
     variables:
-      schema:
-        default: https
-        enum:
-          - https
-          - http
-      host:
-        default: openapiprocessor.io
-      port:
-        default: "443"
-      path1:
-        default: foo
-      path2:
-        default: bar
-      version:
-        default: "1"
+      path:
+        default: api
 
 paths:
   /foo:
diff --git a/openapi-processor-core/src/testInt/resources/tests/server-url/inputs/openapi31.yaml b/openapi-processor-core/src/testInt/resources/tests/server-url/inputs/openapi31.yaml
@@ -4,23 +4,10 @@ info:
   version: 1.0.0
 
 servers:
-  - url: "{schema}://{host}:{port}/{path1}/{path2}/v{version}"
+  - url: "https://openapprocessor.io/{path}"
     variables:
-      schema:
-        default: https
-        enum:
-          - https
-          - http
-      host:
-        default: openapiprocessor.io
-      port:
-        default: "443"
-      path1:
-        default: foo
-      path2:
-        default: bar
-      version:
-        default: "1"
+      path:
+        default: api
 
 paths:
   /foo:
diff --git a/openapi-processor-core/src/testInt/resources/tests/server-url/outputs/resources/api.properties b/openapi-processor-core/src/testInt/resources/tests/server-url/outputs/resources/api.properties
@@ -1 +1 @@
-openapi.base.path = /foo/bar/v1
+openapi.base.path = /api

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`package io.openapiprocessor.core.converter.mapping`
`7`	`7`
`8`		`-interface MappingBucket {`
	`8`	`+fun interface MappingBucket {`
`9`	`9`	`/**`
`10`	`10`	`* filter the mapping(s) by the given filter.`
`11`	`11`	`*`
Original file line number	Diff line number	Diff line change
`@@ -54,15 +54,15 @@ class MappingRepository(`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`fun findGlobalAnnotationParameterNameTypeMapping(query: MappingQuery): List<AnnotationNameMapping> {`
`57`		`- return globalMappings.findAnnotationParameterNameTypeMapping(AnnotationParameterNameMatcher(query))`
	`57`	`+ return globalMappings.findAnnotationParameterNameTypeMapping(AnnotationParameterNameTypeMatcher(query))`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`fun findGlobalAddParameterTypeMappings(): List<AddParameterTypeMapping> {`
`61`	`61`	`return globalMappings.findAddParameterTypeMappings(AddParameterTypeMatcher())`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`fun findGlobalContentTypeMapping(query: MappingQuery): ContentTypeMapping? {`
`65`		`- return globalMappings.findContentTypeMapping(ResponseTypeMatcher(query))`
	`65`	`+ return globalMappings.findContentTypeMapping(ContentTypeMatcher(query))`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`fun getEndpointResultTypeMapping(query: MappingQuery): ResultTypeMapping? {`
Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,5 @@ data class BasePath(`
`14`	`14`	`/**`
`15`	`15`	`* profile name for base path.`
`16`	`16`	`*/`
`17`		`- val profileName: String = "api.properties"`
	`17`	`+ val propertiesName: String = "api.properties"`
`18`	`18`	`)`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ class MappingConverter(val mapping: MappingV2) {`
`218`	`218`	`val (mapping, genericTypes) = parseMapping(source.name, source.generics)`
`219`	`219`
`220`	`220`	`return if (mapping.kind == ANNOTATE) {`
`221`		`- AnnotationNameMappingDefault(mapping.sourceType!!, Annotation(`
	`221`	`+ AnnotationNameTypeMappingDefault(mapping.sourceType!!, Annotation(`
`222`	`222`	`mapping.annotationType!!,`
`223`	`223`	`mapping.annotationParameters)`
`224`	`224`	`)`
`@@ -425,7 +425,7 @@ class MappingConverter(val mapping: MappingV2) {`
`425`	`425`	`throw BadMappingException(source.type)`
`426`	`426`	`}`
`427`	`427`
`428`		`- return AnnotationNameMappingDefault(mapping.sourceType!!, Annotation(`
	`428`	`+ return AnnotationNameTypeMappingDefault(mapping.sourceType!!, Annotation(`
`429`	`429`	`mapping.annotationType!!,`
`430`	`430`	`mapping.annotationParameters))`
`431`	`431`	`}`