clean up deprecated

Author: hauner

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

@@ -208,8 +208,7 @@ class  ApiConverter(
             annotationType = AnnotationDataType(
                 at.getName(),
                 at.getPkg(),
-                mapping.annotation.parameters,
-                mapping.annotation.parametersX
+                mapping.annotation.parameters
             )
         }
 

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

@@ -16,14 +16,7 @@ class Annotation(
     val type: String,
 
     /**
-     * all parameters of the annotation (pass through).
-     * todo: remove, replace with parameterX
+     * parameter key/value map.
      */
-    @Deprecated("replace with parameters")
-    val parameters: String? = null,
-
-    /**
-     * parameter key/value map
-     */
-    val parametersX: LinkedHashMap<String, String> = linkedMapOf()
+    val parameters: LinkedHashMap<String, String> = linkedMapOf()
 )

src/main/kotlin/io/openapiprocessor/core/model/datatypes/AnnotationDataType.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 https://github.com/openapi-processor/openapi-processor-core
+ * Copyright 2020 https://github.com/openapi-processor/openapi-processor-core
  * PDX-License-Identifier: Apache-2.0
  */
 
@@ -11,8 +11,7 @@ package io.openapiprocessor.core.model.datatypes
 class AnnotationDataType(
     private val name: String,
     private val pkg: String,
-    private val parameters: String?,
-    private val parametersX: LinkedHashMap<String, String>?
+    private val parameters: LinkedHashMap<String, String>?
 ): DataType {
 
     override fun getName(): String {
@@ -27,11 +26,7 @@ class AnnotationDataType(
         return setOf("${getPackageName()}.${getName()}")
     }
 
-    fun getParameters(): String {
-        return parameters ?: ""
-    }
-
-    fun getParametersX(): LinkedHashMap<String, String>? {
-        return parametersX;
+    fun getParameters(): LinkedHashMap<String, String>? {
+        return parameters;
     }
 }

src/main/kotlin/io/openapiprocessor/core/processor/mapping/v2/MappingConverter.kt

@@ -99,7 +99,7 @@ class MappingConverter(val mapping: MappingV2) {
             AnnotationTypeMapping(
                 mapping.sourceType!!,
                 mapping.sourceFormat,
-                Annotation(mapping.annotationType!!, null, mapping.annotationParameters)
+                Annotation(mapping.annotationType!!, mapping.annotationParameters)
             )
         } else {
             TypeMapping(
@@ -169,7 +169,7 @@ class MappingConverter(val mapping: MappingV2) {
         var annotation: io.openapiprocessor.core.converter.mapping.Annotation? = null
         if(mapping.annotationType != null) {
             annotation = Annotation(
-                mapping.annotationType!!, null, mapping.annotationParameters)
+                mapping.annotationType!!, mapping.annotationParameters)
         }
 
         return AddParameterTypeMapping(mapping.sourceType!!, typeMapping, annotation)

src/main/kotlin/io/openapiprocessor/core/writer/java/DataTypeWriter.kt

@@ -58,7 +58,7 @@ class DataTypeWriter(
             .findTypeAnnotations(dataType.getTypeName())
 
         annotationTypeMappings.forEach {
-            annotationWriter.write(target, Annotation(it.annotation.type, it.annotation.parametersX))
+            annotationWriter.write(target, Annotation(it.annotation.type, it.annotation.parameters))
             target.write("\n")
         }
 

src/main/kotlin/io/openapiprocessor/core/writer/java/MethodWriter.kt

@@ -131,13 +131,13 @@ open class MethodWriter(
 
         annotationTypeMappings.forEach {
             target.write(" ")
-            annotationWriter.write(target, Annotation(it.annotation.type, it.annotation.parametersX))
+            annotationWriter.write(target, Annotation(it.annotation.type, it.annotation.parameters))
         }
 
         if (parameter is AdditionalParameter && parameter.annotationDataType != null) {
             target.write(" @${parameter.annotationDataType.getName()}")
 
-            val parametersX = parameter.annotationDataType.getParametersX()
+            val parametersX = parameter.annotationDataType.getParameters()
             if (parametersX != null) {
                 val parameters = mutableListOf<String>()
 

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

@@ -257,13 +257,17 @@ paths:
 """
         )
 
+
+        def annotationParams = new LinkedHashMap<String, String>()
+        annotationParams.one = "value"
+
         def options = new ApiOptions(packageName: 'pkg', typeMappings: [
             new EndpointTypeMapping('/foo', null, [
                 new AddParameterTypeMapping (
                     'foo', new TypeMapping (
                         null,
                         'java.lang.String'),
-                    new Annotation("bar.Bar", "(anything)", new LinkedHashMap<String, String>()))
+                    new Annotation("bar.Bar", annotationParams))
             ])
         ])
 
@@ -281,7 +285,8 @@ paths:
         foo.dataType.packageName == 'java.lang'
         foo.annotationDataType?.name == 'Bar'
         foo.annotationDataType?.packageName == 'bar'
-        foo.annotationDataType?.parameters == '(anything)'
+        foo.annotationDataType?.parameters?.size () == 1
+        foo.annotationDataType?.parameters?.one == "value"
     }
 
     @Ignore("the openapi parser ignores parameters with unknown types")
@@ -311,7 +316,7 @@ paths:
 """)
 
         when:
-        new ApiConverter ().convert (openApi)
+        new ApiConverter (null, null).convert (openApi)
 
         then:
         def e = thrown (UnknownParameterTypeException)

src/test/groovy/com/github/hauner/openapi/core/processor/MappingConverterV2Spec.groovy

@@ -313,9 +313,8 @@ map:
         parameter.mapping.targetTypeName == 'java.lang.String'
         parameter.mapping.genericTypeNames == []
         parameter.annotation.type == 'io.micronaut.http.annotation.RequestAttribute'
-        parameter.annotation.parameters == null
-        parameter.annotation.parametersX.size () == 1
-        parameter.annotation.parametersX[""] == "ANY"
+        parameter.annotation.parameters.size () == 1
+        parameter.annotation.parameters[""] == "ANY"
     }
 
     void "reads endpoint response type mapping" () {

src/test/groovy/com/github/hauner/openapi/core/writer/java/MethodWriterSpec.groovy

@@ -204,7 +204,7 @@ class MethodWriterSpec extends Specification {
             }
             e.parameters { ps ->
                 ps.add ('foo', new StringDataType()) { a ->
-                    a.annotation = new AnnotationDataType ('Foo', 'oap', null, [:])
+                    a.annotation = new AnnotationDataType ('Foo', 'oap', [:])
                 }
             }
         }
@@ -226,7 +226,7 @@ class MethodWriterSpec extends Specification {
             }
             e.parameters { ps ->
                 ps.add ('foo', new StringDataType()) { a ->
-                    a.annotation = new AnnotationDataType ('Foo', 'oap', null, [
+                    a.annotation = new AnnotationDataType ('Foo', 'oap', [
                         "": '"bar"'
                     ])
                 }
@@ -250,7 +250,7 @@ class MethodWriterSpec extends Specification {
             }
             e.parameters { ps ->
                 ps.add ('foo', new StringDataType()) { a ->
-                    a.annotation = new AnnotationDataType ('Foo', 'oap', null, [
+                    a.annotation = new AnnotationDataType ('Foo', 'oap', [
                         foo: '"bar"',
                         oof: '"rab"'
                     ])

src/test/kotlin/io/openapiprocessor/core/writer/java/DataTypeWriterSpec.kt

@@ -210,7 +210,7 @@ class DataTypeWriterSpec: StringSpec({
         options.typeMappings = listOf(
             AnnotationTypeMapping(
                 "Foo", annotation = MappingAnnotation(
-                    "foo.Bar", parametersX = linkedMapOf("bar" to """"rab"""")
+                    "foo.Bar", linkedMapOf("bar" to """"rab"""")
                 )
             ))
         writer = DataTypeWriter(options, generatedWriter, BeanValidationFactory())