detect map mapping removed from core

Author: hauner

src/main/kotlin/io/openapiprocessor/spring/model/parameters/QueryParameter.kt

@@ -8,9 +8,13 @@ package io.openapiprocessor.spring.model.parameters
 import io.openapiprocessor.core.model.datatypes.DataType
 import io.openapiprocessor.core.model.parameters.ParameterBase
 import io.openapiprocessor.core.model.datatypes.MappedDataType
-import io.openapiprocessor.core.model.datatypes.MappedMapDataType
 import io.openapiprocessor.core.model.datatypes.ObjectDataType
 
+val Maps = listOf(
+    Map::class.java.name,
+    "org.springframework.util.MultiValueMap"
+)
+
 /**
  * OpenAPI query parameter.
  */
@@ -28,7 +32,7 @@ class QueryParameter(
     override val withAnnotation: Boolean
         get() {
             // Map should be annotated
-            if (dataType is MappedMapDataType) {
+            if (isMappedMap) {
                 return true
             }
 
@@ -40,7 +44,7 @@ class QueryParameter(
             // Mapped should NOT be annotated if it was object schema
             // Mapped should be annotated if it was a simple schema
             if (dataType is MappedDataType) {
-                return dataType.simpleDataType
+                return false
             }
 
             return true
@@ -52,7 +56,7 @@ class QueryParameter(
     override val withParameters: Boolean
         get() {
             // Map should not have parameters
-            if (dataType is MappedMapDataType) {
+            if (isMappedMap) {
                 return false
             }
 
@@ -64,4 +68,13 @@ class QueryParameter(
             return true
         }
 
+    private val isMappedMap: Boolean
+        get() {
+            if (dataType !is MappedDataType) {
+                return false
+            }
+
+            val type = dataType.getImports().first()
+            return Maps.contains(type)
+        }
 }

src/test/groovy/io/openapiprocessor/spring/writer/java/MethodWriterSpec.groovy

@@ -16,14 +16,16 @@
 
 package io.openapiprocessor.spring.writer.java
 
+import io.openapiprocessor.core.model.Documentation
+import io.openapiprocessor.core.model.datatypes.DataTypeName
+import io.openapiprocessor.core.model.datatypes.MappedDataType
 import io.openapiprocessor.core.writer.java.JavaDocWriter
 import io.openapiprocessor.spring.model.parameters.QueryParameter
 import io.openapiprocessor.spring.processor.SpringFrameworkAnnotations
 import io.openapiprocessor.core.converter.ApiOptions
 import io.openapiprocessor.core.model.EmptyResponse
 import io.openapiprocessor.core.model.Endpoint
 import io.openapiprocessor.core.model.HttpMethod
-import io.openapiprocessor.core.model.datatypes.MappedMapDataType
 import io.openapiprocessor.core.writer.java.BeanValidationFactory
 import io.openapiprocessor.core.writer.java.MethodWriter
 import spock.lang.Specification
@@ -45,7 +47,8 @@ class MethodWriterSpec extends Specification {
             properties.method as HttpMethod ?: HttpMethod.GET,
             properties.operationId as String ?: null,
             properties.deprecated as boolean ?: false,
-            properties.description as String ?: null
+            new Documentation(null, properties.description as String ?: null)
+
         )
         ep.parameters = properties.parameters ?: []
         ep.responses = properties.responses ?: [:]
@@ -54,13 +57,15 @@ class MethodWriterSpec extends Specification {
     }
 
     void "writes map from single query parameter" () {
+        def dataTypeName = new DataTypeName('java.lang.String', 'java.lang.String')
+
         def endpoint = createEndpoint (path: '/foo', method: HttpMethod.GET, responses: [
             '204': [new EmptyResponse()]
         ], parameters: [
-            new QueryParameter('foo', new MappedMapDataType (
+            new QueryParameter('foo', new MappedDataType (
                 'Map',
                 'java.util',
-                ['java.lang.String', 'java.lang.String'],
+                [dataTypeName, dataTypeName],
                 null,
                 false
             ), false, false, null)