fixed missing pojos, #67

Author: hauner

src/main/kotlin/io/openapiprocessor/core/converter/ApiConverter.kt

@@ -134,7 +134,7 @@ class  ApiConverter(
                 resolver)
 
             if (contentType.startsWith(MULTIPART)) {
-                ep.parameters.addAll (createMultipartParameter(info, mediaType.encodings))
+                ep.parameters.addAll (createMultipartParameter(info, mediaType.encodings, dataTypes))
             } else {
                 ep.requestBodies.add (createRequestBody (contentType, info, requestBody.getRequired(), dataTypes))
             }
@@ -243,12 +243,14 @@ class  ApiConverter(
         return framework.createRequestBody(contentType, required, changedType)
     }
 
-    private fun createMultipartParameter(info: SchemaInfo, encodings: Map<String, Encoding>): Collection<ModelParameter> {
-        val dataType = convertDataType(info, DataTypes())
+    private fun createMultipartParameter(info: SchemaInfo, encodings: Map<String, Encoding>,
+        dataTypes: DataTypes): Collection<ModelParameter> {
+        val dataType = convertDataType(info, dataTypes)
         if (dataType !is ObjectDataType) {
             throw MultipartResponseBodyException(info.getPath())
         }
 
+        dataTypes.del(dataType)
         val parameters = mutableListOf<ModelParameter>()
         dataType.forEach { property, propertyDataType ->
             val mpp = MultipartParameter(property, encodings[property]?.contentType)

src/main/kotlin/io/openapiprocessor/core/model/DataTypes.kt

@@ -81,6 +81,15 @@ class DataTypes {
         dataTypeInfos[name] = DataTypeInfo(dataType)
     }
 
+    /**
+     * remove a data type.
+     *
+     * @param dataType the source data type
+     */
+    fun del(dataType: DataType) {
+        dataTypeInfos.remove (dataType.getName())
+    }
+
     /**
      * find data type by name.
      *

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

@@ -266,4 +266,70 @@ paths:
         json.dataType.imports == ['pkg.model.MultipartPostRequestBodyJson'] as Set
     }
 
+    void "add refs request body multipart/* objects" () {
+        def openApi = parse (
+"""\
+openapi: 3.0.2
+info:
+  title: params-request-body-multipart
+  version: 1.0.0
+
+paths:
+  /multipart:
+    post:
+      requestBody:
+        required: true
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              properties:
+                file:
+                  type: string
+                  format: binary
+                json:
+                  type: object
+                  properties:
+                    foo:
+                      \$ref: '#/components/schemas/Foo'
+                    bar:
+                      type: string
+            encoding:
+              file:
+                contentType: application/octet-stream
+              json:
+                contentType: application/json          
+      responses:
+        '204':
+          description: empty
+          
+components:
+  schemas:
+    Foo:
+      type: object
+      properties:
+        foo:
+          type: string
+""", ParserType.OPENAPI4J
+        )
+
+        def options = new ApiOptions(packageName: 'pkg', typeMappings: [
+            new EndpointTypeMapping('/multipart', null, [
+                new TypeMapping (
+                    'string',
+                    'binary',
+                    'multipart.Multipart')
+            ])
+        ])
+
+        when:
+        def api = new ApiConverter (options, new FrameworkBase())
+            .convert (openApi)
+
+        then:
+        def dts = api.dataTypes
+        dts.find ("Foo")
+        dts.find ("MultipartPostRequestBodyJson")
+        dts.find ("MultipartPostRequestBody") == null
+    }
 }