support generic parameters on global type mappings

Author: hauner

src/main/groovy/com/github/hauner/openapi/spring/converter/DataTypeConverter.groovy

@@ -69,6 +69,20 @@ class DataTypeConverter {
         ]
     ]
 
+    private class TargetType {
+        String typeName
+        List<String> genericNames
+
+        String getName () {
+            typeName.substring (typeName.lastIndexOf ('.') + 1)
+        }
+
+        String getPkg () {
+            typeName.substring (0, typeName.lastIndexOf ('.'))
+        }
+
+    }
+
     private ApiOptions options
 
     DataTypeConverter(ApiOptions options) {
@@ -135,11 +149,12 @@ class DataTypeConverter {
     private DataType createObjectDataType (SchemaInfo schemaInfo, DataTypes dataTypes) {
         def objectType
 
-        String targetTypeName = getObjectDataType (schemaInfo)
-        if (targetTypeName) {
+        TargetType targetType = getObjectDataType (schemaInfo)
+        if (targetType) {
             objectType = new MappedDataType (
-                type: targetTypeName.substring (targetTypeName.lastIndexOf ('.') + 1),
-                pkg: targetTypeName.substring (0, targetTypeName.lastIndexOf ('.'))
+                type: targetType.name,
+                pkg: targetType.pkg,
+                genericTypes: targetType.genericNames
             )
 
             dataTypes.add (schemaInfo.name, objectType)
@@ -186,7 +201,7 @@ class DataTypeConverter {
     }
 
 
-    private String getObjectDataType(SchemaInfo schemaInfo) {
+    private TargetType getObjectDataType(SchemaInfo schemaInfo) {
         if (options.typeMappings) {
 
             List<EndpointTypeMapping> endpoints = getEndpointMappings ()
@@ -202,7 +217,10 @@ class DataTypeConverter {
 
                     def response = responses.find { it.contentType == ct && it.sourceTypeName == 'object' }
                     if (response) {
-                        return response.targetTypeName
+                        return new TargetType (
+                            typeName: response.targetTypeName,
+                            genericNames: []
+                        )
                     }
                 }
             }
@@ -221,7 +239,9 @@ class DataTypeConverter {
             }
 
             def mapping = mappings.first ()
-            return mapping.targetTypeName
+            return new TargetType (
+                typeName: mapping.targetTypeName,
+                genericNames: mapping.genericTypeNames ?: [])
         }
 
         null

src/main/groovy/com/github/hauner/openapi/spring/generatr/mapping/TypeMapping.groovy

@@ -37,4 +37,9 @@ class TypeMapping {
      */
     String targetTypeName
 
+    /**
+     * The fully qualified java type names of all generic parameters to {@link #targetTypeName}.
+     */
+    List<String> genericTypeNames = []
+
 }

src/main/groovy/com/github/hauner/openapi/spring/model/datatypes/MappedDataType.groovy

@@ -23,12 +23,17 @@ package com.github.hauner.openapi.spring.model.datatypes
  */
 class MappedDataType implements DataType {
 
-    String type
+    private String type
     String pkg = 'unknown'
+    List<String> genericTypes = []
 
     @Override
     String getName () {
-        type
+        if (genericTypes.empty) {
+            "${type}"
+        } else {
+            "${type}<${getGenericTypeNames().join (', ')}>"
+        }
     }
 
     @Override
@@ -38,12 +43,22 @@ class MappedDataType implements DataType {
 
     @Override
     String getImport () {
-        [packageName, name].join ('.')
+        [packageName, type].join ('.')
     }
 
     @Override
     Set<String> getImports () {
-        []
+         [getImport ()] + genericTypes
+    }
+
+    private List<String> getGenericTypeNames () {
+        genericTypes.collect {
+            getClassName (it)
+        }
+    }
+
+    private String getClassName (String ref) {
+        ref.substring (ref.lastIndexOf ('.') + 1)
     }
 
 }

src/test/groovy/com/github/hauner/openapi/spring/model/datatypes/MappedDataTypeSpec.groovy

@@ -0,0 +1,36 @@
+package com.github.hauner.openapi.spring.model.datatypes
+
+import spock.lang.Specification
+import spock.lang.Unroll
+
+class MappedDataTypeSpec extends Specification {
+
+    @Unroll
+    void "get name of type with (optional) generic parameters" () {
+        def type = new MappedDataType(pkg: 'model', type: 'Foo', genericTypes: generics)
+
+        expect:
+        type.name == typeName
+
+        where:
+        generics                                 | typeName
+        []                                       | 'Foo'
+        ['java.lang.String']                     | 'Foo<String>'
+        ['java.lang.String', 'java.lang.String'] | 'Foo<String, String>'
+    }
+
+    @Unroll
+    void "get imports of type with (optional) generic parameters" () {
+        def type = new MappedDataType(pkg: 'model', type: 'Foo', genericTypes: generics)
+
+        expect:
+        type.imports == imports as Set
+
+        where:
+        generics                                 | imports
+        []                                       | ['model.Foo']
+        ['java.lang.String']                     | ['model.Foo', 'java.lang.String']
+        ['java.lang.String', 'java.lang.String'] | ['model.Foo', 'java.lang.String']
+    }
+
+}

src/testInt/groovy/com/github/hauner/openapi/generatr/GeneratrPendingTest.groovy

@@ -23,7 +23,7 @@ import com.github.hauner.openapi.spring.generatr.mapping.ResponseTypeMapping
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 
-//@Ignore
+@Ignore
 @RunWith(Parameterized)
 class GeneratrPendingTest extends GeneratrTestBase {