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

# Conflicts:
#	gradle/libs.versions.toml

Author: hauner

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())
         }
     }
 

…/mapping/AnnotationNameMappingDefault.kt …ping/AnnotationNameTypeMappingDefault.ktopenapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/AnnotationNameMappingDefault.kt renamed to openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/AnnotationNameTypeMappingDefault.kt openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/AnnotationNameMappingDefault.kt renamed to 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.
      */

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

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.
      *

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? {

…atcher/AnnotationParameterNameMatcher.kt …er/AnnotationParameterNameTypeMatcher.ktopenapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/matcher/AnnotationParameterNameMatcher.kt renamed to openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/matcher/AnnotationParameterNameTypeMatcher.kt openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/matcher/AnnotationParameterNameMatcher.kt renamed to 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 {

…r/mapping/matcher/ResponseTypeMatcher.kt …er/mapping/matcher/ContentTypeMatcher.ktopenapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/matcher/ResponseTypeMatcher.kt renamed to openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/matcher/ContentTypeMatcher.kt openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/mapping/matcher/ResponseTypeMatcher.kt renamed to 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 {

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"
 )

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))
     }

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()
         ))