Merge branch 'mapping-target-parser2'

Author: hauner

build.gradle

@@ -1,4 +1,5 @@
 plugins {
+    id 'antlr'
     id 'jacoco'
     id 'groovy'
     id 'java-library'
@@ -18,7 +19,6 @@ java {
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-
 ext {
     processorApiVersion = '1.1.0'
     jacksonVersion = '2.11.3'
@@ -27,7 +27,6 @@ ext {
     bintrayKey =  project.findProperty ('BINTRAY_KEY') ?: System.getenv ("BINTRAY_KEY") ?: 'n/a'
 }
 
-
 repositories {
     mavenCentral()
     jcenter()
@@ -66,6 +65,19 @@ testSets {
 
 check.dependsOn testInt
 
+sourceSets {
+    main {
+        java {
+            srcDir 'build/antlr'
+        }
+    }
+}
+
+generateGrammarSource {
+    arguments += ['-package', 'io.openapiprocessor.core.processor.mapping.v2.parser']
+    outputDirectory = new File("$buildDir/antlr/io/openapiprocessor/core/processor/mapping/v2/parser".toString())
+}
+
 compileTestGroovy {
     dependsOn 'compileKotlin'
     classpath += files(compileKotlin.destinationDir)
@@ -76,6 +88,8 @@ compileKotlin {
     kotlinOptions.jvmTarget = "1.8"
 }
 
+compileKotlin.dependsOn generateGrammarSource
+
 compileTestKotlin {
     kotlinOptions.jvmTarget = "1.8"
 }
@@ -84,6 +98,8 @@ dependencies {
     components.all(JacksonPlatformRule)
     components.all(KotlinPlatformRule)
 
+    antlr 'org.antlr:antlr4:4.8'
+
     compileOnly "io.openapiprocessor:openapi-processor-api:$processorApiVersion"
     implementation "com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion"
 
@@ -108,6 +124,7 @@ dependencies {
 
     testImplementation 'org.codehaus.groovy:groovy:2.5.12'
     testImplementation 'org.codehaus.groovy:groovy-nio:2.5.12'
+
     testImplementation "io.openapiprocessor:openapi-processor-api:$processorApiVersion"
     testImplementation ('io.openapiprocessor:openapi-processor-test:1.0.1') {
         exclude group: 'com.google.guava'

src/main/antlr/To.g4

@@ -0,0 +1,71 @@
+grammar To;
+
+/*
+ * Parser Rules
+ */
+
+to
+  : annotationType? toType
+  ;
+
+annotationType
+  : type AnnotationAnyArguments?
+  ;
+
+toType
+  : type typeArguments?
+  ;
+
+type
+  : packageName '.' typeName
+  | typeName
+  ;
+
+packageName
+  : Identifier
+  | packageName '.' Identifier
+  ;
+
+typeName
+  : Identifier
+  ;
+
+typeArguments
+  : '<' typeArgumentList '>'
+  ;
+
+typeArgumentList
+  : typeArgument (',' typeArgument)*
+  ;
+
+typeArgument
+  : type
+  | '?'
+  | .*?
+  ;
+
+
+/*
+ * Lexer Rules
+ */
+
+fragment JavaLetter
+  : [a-zA-Z$_]
+  ;
+
+fragment JavaLetterOrDigit
+  : [a-zA-Z0-9$_]
+  ;
+
+AnnotationAnyArguments
+  : '(' .*? ')'
+  ;
+
+Identifier
+  : JavaLetter JavaLetterOrDigit*
+  ;
+
+Whitespace
+  : ' ' -> skip
+  ;
+

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

@@ -16,24 +16,17 @@
 
 package io.openapiprocessor.core.converter
 
-import io.openapiprocessor.core.converter.mapping.MappingFinder
+import io.openapiprocessor.core.converter.mapping.*
 import io.openapiprocessor.core.converter.wrapper.MultiDataTypeWrapper
 import io.openapiprocessor.core.converter.wrapper.ResultDataTypeWrapper
 import io.openapiprocessor.core.converter.wrapper.SingleDataTypeWrapper
 import io.openapiprocessor.core.framework.Framework
 import io.openapiprocessor.core.model.parameters.Parameter as ModelParameter
-import io.openapiprocessor.core.converter.mapping.AddParameterTypeMapping
-import io.openapiprocessor.core.converter.mapping.TypeMapping
 import io.openapiprocessor.core.model.RequestBody as ModelRequestBody
-import io.openapiprocessor.core.model.datatypes.MappedDataType
-import io.openapiprocessor.core.model.datatypes.NoneDataType
-import io.openapiprocessor.core.model.datatypes.ObjectDataType
 import io.openapiprocessor.core.model.Response as ModelResponse
-import io.openapiprocessor.core.model.datatypes.DataType
 import io.openapiprocessor.core.parser.OpenApi
-import io.openapiprocessor.core.converter.mapping.UnknownDataTypeException
-import io.openapiprocessor.core.converter.mapping.UnknownParameterTypeException
 import io.openapiprocessor.core.model.*
+import io.openapiprocessor.core.model.datatypes.*
 import io.openapiprocessor.core.parser.Operation
 import io.openapiprocessor.core.parser.Parameter
 import io.openapiprocessor.core.parser.RefResolver
@@ -216,6 +209,17 @@ class  ApiConverter(
             false
         )
 
+        var annotationType: AnnotationDataType? = null
+        if (mapping.annotation != null) {
+            val at = TargetType(mapping.annotation.type, emptyList())
+
+            annotationType = AnnotationDataType(
+                at.getName(),
+                at.getPkg(),
+                mapping.annotation.parameters
+            )
+        }
+
         val parameter = object: Parameter {
 
             override fun getIn(): String {
@@ -239,7 +243,7 @@ class  ApiConverter(
             }
         }
 
-        return framework.createAdditionalParameter (parameter, addType)
+        return framework.createAdditionalParameter (parameter, addType, annotationType)
     }
 
     private fun createRequestBody(contentType: String, info: SchemaInfo, required: Boolean, dataTypes: DataTypes): ModelRequestBody {

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

@@ -32,7 +32,12 @@ class AddParameterTypeMapping(
     /**
      * additional parameter type mapping.
      */
-    val mapping: TypeMapping
+    val mapping: TypeMapping,
+
+    /**
+     * additional annotation of parameter.
+     */
+    val annotation: Annotation? = null
 
 ): Mapping {
 

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

@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2020 https://github.com/openapi-processor/openapi-processor-core
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+package io.openapiprocessor.core.converter.mapping
+
+/**
+ * (additional) annotation from mapping
+ */
+class Annotation(
+
+    /**
+     * additional annotation of parameter.
+     */
+    val type: String,
+
+    /**
+     * all parameters of the annotation (pass through).
+     */
+    val parameters: String? = null
+
+)

src/main/kotlin/io/openapiprocessor/core/framework/Framework.kt

@@ -17,6 +17,7 @@
 package io.openapiprocessor.core.framework
 
 import io.openapiprocessor.core.model.RequestBody
+import io.openapiprocessor.core.model.datatypes.AnnotationDataType
 import io.openapiprocessor.core.model.parameters.Parameter
 import io.openapiprocessor.core.model.datatypes.DataType
 import io.openapiprocessor.core.parser.Parameter as ParserParameter
@@ -30,7 +31,7 @@ interface Framework {
      * create a model query parameter.
      *
      * @param parameter an OpenAPI query parameter
-     * @param DataType data type of the parameter
+     * @param dataType data type of the parameter
      * @return a query {@link Parameter}
      */
     fun createQueryParameter(parameter: ParserParameter, dataType: DataType): Parameter
@@ -39,7 +40,7 @@ interface Framework {
      * create a model header parameter.
      *
      * @param parameter an OpenAPI header parameter
-     * @param DataType data type of the parameter
+     * @param dataType data type of the parameter
      * @return a header {@link Parameter}
      */
     fun createHeaderParameter(parameter: ParserParameter, dataType: DataType): Parameter
@@ -48,7 +49,7 @@ interface Framework {
      * create a model cookie parameter.
      *
      * @param parameter an OpenAPI cookie parameter
-     * @param DataType data type of the parameter
+     * @param dataType data type of the parameter
      * @return a cookie {@link Parameter}
      */
     fun createCookieParameter(parameter: ParserParameter, dataType: DataType): Parameter
@@ -57,7 +58,7 @@ interface Framework {
      * create a model path parameter.
      *
      * @param parameter an OpenAPI path parameter
-     * @param DataType data type of the parameter
+     * @param dataType data type of the parameter
      * @return a path {@link Parameter}
      */
     fun createPathParameter(parameter: ParserParameter, dataType: DataType): Parameter
@@ -66,7 +67,7 @@ interface Framework {
      * create a model multipart parameter.
      *
      * @param parameter an OpenAPI multipart parameter
-     * @param DataType data type of the parameter
+     * @param dataType data type of the parameter
      * @return a multipart {@link Parameter}
      */
     fun createMultipartParameter(parameter: ParserParameter, dataType: DataType): Parameter
@@ -75,16 +76,19 @@ interface Framework {
      * create a model additional parameter.
      *
      * @param parameter an OpenAPI additional parameter
-     * @param DataType data type of the parameter
+     * @param dataType data type of the parameter
+     * @param annotationDataType additional annotation
      * @return an additional {@link Parameter}
      */
-    fun createAdditionalParameter(parameter: ParserParameter, dataType: DataType): Parameter
+    fun createAdditionalParameter(parameter: ParserParameter, dataType: DataType,
+        annotationDataType: AnnotationDataType? = null): Parameter
 
     /**
      * create a model request body.
      *
-     * @param parameter an OpenAPI additional parameter
-     * @param DataType data type of the parameter
+     * @param contentType an OpenAPI request body content type
+     * @param required the request body is required
+     * @param dataType data type of the request body
      * @return an additional {@link RequestBody}
      */
     fun createRequestBody(contentType: String, required: Boolean, dataType: DataType): RequestBody

src/main/kotlin/io/openapiprocessor/core/framework/FrameworkBase.kt

@@ -17,6 +17,7 @@
 package io.openapiprocessor.core.framework
 
 import io.openapiprocessor.core.model.RequestBody
+import io.openapiprocessor.core.model.datatypes.AnnotationDataType
 import io.openapiprocessor.core.model.parameters.AdditionalParameter
 import io.openapiprocessor.core.model.parameters.CookieParameter
 import io.openapiprocessor.core.model.parameters.HeaderParameter
@@ -61,9 +62,11 @@ open class FrameworkBase: Framework {
             parameter.isRequired(), parameter.isDeprecated())
     }
 
-    override fun createAdditionalParameter(parameter: ParserParameter, dataType: DataType): Parameter {
+    override fun createAdditionalParameter(parameter: ParserParameter, dataType: DataType,
+       annotationDataType: AnnotationDataType?): Parameter {
+
         return AdditionalParameter(parameter.getName(), dataType,
-            parameter.isRequired(), false)
+            annotationDataType, parameter.isRequired(), false)
     }
 
     override fun createRequestBody(contentType: String, required: Boolean, dataType: DataType): RequestBody {

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

@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2020 https://github.com/openapi-processor/openapi-processor-core
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+package io.openapiprocessor.core.model.datatypes
+
+/**
+ * additional annotation type.
+ */
+class AnnotationDataType(
+    private val type: String,
+    private val pkg: String,
+    private val parameters: String?
+): DataTypeBase() {
+
+    override fun getName(): String {
+        return type
+    }
+
+    override fun getPackageName(): String {
+        return pkg
+    }
+
+    fun getParameters(): String {
+        return parameters ?: ""
+    }
+
+}

src/main/kotlin/io/openapiprocessor/core/model/parameters/AdditionalParameter.kt

@@ -16,6 +16,7 @@
 
 package io.openapiprocessor.core.model.parameters
 
+import io.openapiprocessor.core.model.datatypes.AnnotationDataType
 import io.openapiprocessor.core.model.datatypes.DataType
 
 /**
@@ -27,6 +28,7 @@ class AdditionalParameter(
 
     name: String,
     dataType: DataType,
+    val annotationDataType: AnnotationDataType? = null,
     required: Boolean = false,
     deprecated: Boolean = false
 
@@ -35,4 +37,7 @@ class AdditionalParameter(
     override val withAnnotation: Boolean
         get() = false
 
+    val additionalAnnotation: Boolean
+        get() = annotationDataType != null
+
 }