Merge pull request #25 from openapi-processor/mapping-to-primitive

Mapping to primitive, resolves #22

Author: hauner

src/main/kotlin/io/openapiprocessor/core/converter/mapping/MappingFinder.kt

@@ -284,13 +284,21 @@ class IoMatcher(schema: MappingSchema): BaseVisitor(schema) {
 class TypeMatcher(schema: MappingSchema): BaseVisitor(schema) {
 
     override fun match(mapping: TypeMapping): Boolean {
-        return if(schema.isPrimitive()) {
-            mapping.sourceTypeName == schema.getType()
-            && mapping.sourceTypeFormat == schema.getFormat()
-        } else if(schema.isArray()) {
-            mapping.sourceTypeName == "array"
-        } else {
-            mapping.sourceTypeName == schema.getName()
+        if (mapping.sourceTypeName == schema.getName()) {
+            return true
+        }
+
+        return when {
+            schema.isPrimitive() -> {
+                mapping.sourceTypeName == schema.getType()
+             && mapping.sourceTypeFormat == schema.getFormat()
+            }
+            schema.isArray() -> {
+                mapping.sourceTypeName == "array"
+            }
+            else -> {
+                false
+            }
         }
     }
 

src/main/kotlin/io/openapiprocessor/core/parser/swagger/OpenApi.kt

@@ -42,7 +42,7 @@ class OpenApi(private val result: SwaggerParseResult): ParserOpenApi {
         return paths
     }
 
-    override fun getRefResolver(): ParserRefResolver = RefResolver (result.openAPI.components)
+    override fun getRefResolver(): ParserRefResolver = RefResolver (result.openAPI)
 
     override fun printWarnings() {
         print (result.messages)

src/main/kotlin/io/openapiprocessor/core/parser/swagger/RefResolver.kt

@@ -18,20 +18,20 @@ package io.openapiprocessor.core.parser.swagger
 
 import io.openapiprocessor.core.parser.RefResolver as ParserRefResolver
 import io.openapiprocessor.core.parser.Schema as ParserSchema
-import io.swagger.v3.oas.models.Components as SwaggerComponents
 import io.swagger.v3.oas.models.media.Schema as SwaggerSchema
+import io.swagger.v3.oas.models.OpenAPI
 
 /**
  * Swagger $ref resolver.
  *
  * @author Martin Hauner
  */
-class RefResolver(private val components: SwaggerComponents?): ParserRefResolver {
+class RefResolver(private val openapi: OpenAPI): ParserRefResolver {
 
     override fun resolve(ref: ParserSchema): ParserSchema {
         val refName = getRefName(ref.getRef()!!)
 
-        val schema: SwaggerSchema<*>? = components?.schemas?.get(refName)
+        val schema: SwaggerSchema<*>? = openapi.components?.schemas?.get(refName)
         if (schema == null) {
             throw Exception("failed to resolve ${ref.getRef()}")
         }

src/test/groovy/com/github/hauner/openapi/core/converter/DataTypeConverterPrimitiveTypeMappingSpec.groovy

@@ -25,6 +25,7 @@ import io.openapiprocessor.core.converter.mapping.TypeMapping
 import io.openapiprocessor.core.framework.Framework
 import io.openapiprocessor.core.framework.FrameworkBase
 import io.openapiprocessor.core.model.Api
+import io.openapiprocessor.core.parser.ParserType
 import spock.lang.Specification
 import spock.lang.Unroll
 
@@ -75,6 +76,54 @@ paths:
         parameter.dataType.name == 'ZonedDateTime'
     }
 
+    void "converts named primitive type to java type via global type mapping" () {
+        def openApi = parse ("""\
+openapi: 3.0.2
+info:
+  title: API
+  version: 1.0.0
+
+paths:
+  /uuid:
+    get:
+      parameters:
+        - in: query
+          name:  uuid
+          schema:
+            \$ref: '#/components/schemas/UUID'
+      responses:
+        '204':
+          description: none
+
+components:
+  schemas:          
+    UUID:
+      type: string
+""", parser)
+
+        when:
+        def options = new ApiOptions(
+            packageName: 'pkg',
+            typeMappings: [
+                new TypeMapping (
+                    'UUID',
+                    'java.util.UUID')
+            ])
+
+        Api api = new ApiConverter (options, new FrameworkBase ())
+            .convert (openApi)
+
+        then:
+        def itf = api.interfaces.first ()
+        def ep = itf.endpoints.first ()
+        def parameter = ep.parameters.first ()
+        parameter.dataType.packageName == 'java.util'
+        parameter.dataType.name == 'UUID'
+
+        where:
+        parser << [ParserType.SWAGGER, ParserType.OPENAPI4J]
+    }
+
     void "throws when there are multiple global mappings for a simple type" () {
         def openApi = parse ("""\
 openapi: 3.0.2

src/testInt/groovy/com/github/hauner/openapi/processor/core/ProcessorPendingTest.groovy

@@ -32,8 +32,8 @@ class ProcessorPendingTest extends ProcessorTestBase {
     @Parameterized.Parameters(name = "{0}")
     static Collection<TestSet> sources () {
         return [
-            new TestSet(name: 'ref-parameter', processor: new TestProcessor(), parser: ParserType.OPENAPI4J),
-            new TestSet(name: 'ref-parameter', processor: new TestProcessor(), parser: ParserType.SWAGGER)
+            new TestSet(name: 'ref-parameter-with-primitive-mapping', processor: new TestProcessor(), parser: ParserType.SWAGGER),
+            new TestSet(name: 'ref-parameter-with-primitive-mapping', processor: new TestProcessor(), parser: ParserType.OPENAPI4J)
         ]
     }
 

src/testInt/resources/tests/ref-parameter-with-primitive-mapping/generated.yaml

@@ -0,0 +1,2 @@
+items:
+  - generated/api/Api.java

src/testInt/resources/tests/ref-parameter-with-primitive-mapping/generated/api/Api.java

@@ -0,0 +1,17 @@
+/*
+ * This class is auto generated by https://github.com/hauner/openapi-processor-core.
+ * TEST ONLY.
+ */
+
+package generated.api;
+
+import annotation.Mapping;
+import annotation.Parameter;
+import java.util.UUID;
+
+public interface Api {
+
+    @Mapping("/uuid")
+    void getUuid(@Parameter UUID uuid, @Parameter UUID uuidex);
+
+}

src/testInt/resources/tests/ref-parameter-with-primitive-mapping/inputs.yaml

@@ -0,0 +1,4 @@
+items:
+  - inputs/openapi.yaml
+  - inputs/primitive.yaml
+  - inputs/mapping.yaml

src/testInt/resources/tests/ref-parameter-with-primitive-mapping/inputs/mapping.yaml

@@ -0,0 +1,9 @@
+openapi-processor-spring: v2
+
+options:
+  package-name: generated
+
+map:
+  types:
+    - type: UUID => java.util.UUID
+    - type: UUID_EX => java.util.UUID

src/testInt/resources/tests/ref-parameter-with-primitive-mapping/inputs/openapi.yaml

@@ -0,0 +1,25 @@
+openapi: 3.0.2
+info:
+  title: API
+  version: 1.0.0
+
+paths:
+  /uuid:
+    get:
+      parameters:
+        - in: query
+          name:  uuid
+          schema:
+            $ref: '#/components/schemas/UUID'
+        - in: query
+          name:  uuidex
+          schema:
+            $ref: 'primitive.yaml#/UUID_EX'
+      responses:
+        '204':
+          description: none
+
+components:
+  schemas:
+    UUID:
+      type: string