write additional annotation

Author: hauner

src/main/groovy/com/github/hauner/openapi/core/converter/ApiConverter.groovy

@@ -21,6 +21,7 @@ import com.github.hauner.openapi.core.converter.wrapper.MultiDataTypeWrapper
 import com.github.hauner.openapi.core.converter.wrapper.ResultDataTypeWrapper
 import com.github.hauner.openapi.core.converter.wrapper.SingleDataTypeWrapper
 import com.github.hauner.openapi.core.framework.Framework
+import com.github.hauner.openapi.core.model.datatypes.AnnotationDataType
 import com.github.hauner.openapi.core.model.parameters.Parameter as ModelParameter
 import com.github.hauner.openapi.core.converter.mapping.AddParameterTypeMapping
 import com.github.hauner.openapi.core.converter.mapping.Mapping
@@ -240,6 +241,17 @@ class  ApiConverter {
             genericTypes: tt.genericNames
         )
 
+        def annotationType = null
+        if (mapping.annotation) {
+            def at = new TargetType(mapping.annotation.type, [])
+
+            annotationType = new AnnotationDataType(
+                type: at.name,
+                pkg: at.pkg,
+                parameters: mapping.annotation.parameters
+            )
+        }
+
         def parameter = new Parameter () {
 
             String getIn () {
@@ -263,7 +275,7 @@ class  ApiConverter {
             }
         }
 
-        framework.createAdditionalParameter (parameter, addType)
+        framework.createAdditionalParameter (parameter, addType, annotationType)
     }
 
     private ModelRequestBody createRequestBody (String contentType, SchemaInfo info, boolean required, DataTypes dataTypes) {

src/main/groovy/com/github/hauner/openapi/core/framework/Framework.groovy

@@ -17,6 +17,7 @@
 package com.github.hauner.openapi.core.framework
 
 import com.github.hauner.openapi.core.model.RequestBody
+import com.github.hauner.openapi.core.model.datatypes.AnnotationDataType
 import com.github.hauner.openapi.core.model.parameters.Parameter
 import com.github.hauner.openapi.core.model.datatypes.DataType
 import com.github.hauner.openapi.core.parser.Parameter as ParserParameter
@@ -78,7 +79,8 @@ interface Framework {
      * @param dataType data type of the parameter
      * @return an additional {@link Parameter}
      */
-    Parameter createAdditionalParameter(ParserParameter parameter, DataType dataType)
+    Parameter createAdditionalParameter(ParserParameter parameter, DataType dataType,
+        AnnotationDataType annotationDataType)
 
     /**
      * create a model request body.

src/main/groovy/com/github/hauner/openapi/core/framework/FrameworkBase.groovy

@@ -17,6 +17,7 @@
 package com.github.hauner.openapi.core.framework
 
 import com.github.hauner.openapi.core.model.RequestBody
+import com.github.hauner.openapi.core.model.datatypes.AnnotationDataType
 import com.github.hauner.openapi.core.model.parameters.AdditionalParameter
 import com.github.hauner.openapi.core.model.parameters.CookieParameter
 import com.github.hauner.openapi.core.model.parameters.HeaderParameter
@@ -82,11 +83,14 @@ class FrameworkBase implements Framework {
     }
 
     @Override
-    Parameter createAdditionalParameter (ParserParameter parameter, DataType dataType) {
+    Parameter createAdditionalParameter (ParserParameter parameter, DataType dataType,
+        AnnotationDataType annotationDataType = null) {
+
         new AdditionalParameter (
             name: parameter.name,
             required: parameter.required,
-            dataType: dataType)
+            dataType: dataType,
+            annotationDataType: annotationDataType)
     }
 
     @Override

src/main/groovy/com/github/hauner/openapi/core/model/datatypes/AnnotationDataType.groovy

@@ -29,7 +29,7 @@ class AnnotationDataType implements DataType {
 
     @Override
     String getName () {
-        "@$type"
+        type
     }
 
     @Override

src/main/groovy/com/github/hauner/openapi/core/writer/java/MethodWriter.groovy

@@ -113,7 +113,7 @@ class MethodWriter {
         parameterAnnotationWriter.write (annotation, parameter)
 
         if (parameter instanceof AdditionalParameter && parameter.hasAdditionalAnnotation ()) {
-            annotation.write (" ${parameter.annotationDataType.name}${parameter.annotationDataType.parameters}")
+            annotation.write (" @${parameter.annotationDataType.name}${parameter.annotationDataType.parameters}")
         }
 
         annotation.toString ()

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

@@ -20,6 +20,8 @@ import com.github.hauner.openapi.core.converter.mapping.AddParameterTypeMapping
 import com.github.hauner.openapi.core.converter.mapping.EndpointTypeMapping
 import com.github.hauner.openapi.core.converter.mapping.TypeMapping
 import com.github.hauner.openapi.core.framework.FrameworkBase
+import com.github.hauner.openapi.core.model.parameters.AdditionalParameter
+import io.openapiprocessor.core.converter.mapping.Annotation
 import io.openapiprocessor.core.converter.mapping.UnknownParameterTypeException
 import spock.lang.Ignore
 import spock.lang.Specification
@@ -236,6 +238,50 @@ paths:
         !request.withAnnotation ()
     }
 
+    void "adds additional request parameter with annotation from endpoint mapping" () {
+        def openApi = parse (
+"""\
+openapi: 3.0.2
+info:
+  title: test additional parameter annotation
+  version: 1.0.0
+
+paths:
+  /foo:
+    get:
+      responses:
+        '204':
+          description: empty
+"""
+        )
+
+        def options = new ApiOptions(packageName: 'pkg', typeMappings: [
+            new EndpointTypeMapping('/foo', [
+                new AddParameterTypeMapping (
+                    'foo', new TypeMapping (
+                        null,
+                        'java.lang.String'),
+                    new Annotation("bar.Bar", "(anything)"))
+            ])
+        ])
+
+        when:
+        def api = new ApiConverter (options, new FrameworkBase ())
+            .convert (openApi)
+
+        then:
+        def itf = api.interfaces.first ()
+        def ep = itf.endpoints.first ()
+        def foo = ep.parameters[0] as AdditionalParameter
+
+        foo.name == 'foo'
+        foo.dataType.name == 'String'
+        foo.dataType.packageName == 'java.lang'
+        foo.annotationDataType?.name == 'Bar'
+        foo.annotationDataType?.packageName == 'bar'
+        foo.annotationDataType?.parameters == '(anything)'
+    }
+
     @Ignore("the openapi parser ignores parameters with unknown types")
     void "throws on unknown parameter"() {
         def openApi = parse (
@@ -263,7 +309,8 @@ paths:
 """)
 
         when:
-        new ApiConverter ().convert (openApi)
+        new ApiConverter (new ApiOptions(), new FrameworkBase ())
+            .convert (openApi)
 
         then:
         def e = thrown (UnknownParameterTypeException)