without javacc this doesn't need to be java

Author: hauner

build.gradle

@@ -23,7 +23,6 @@ sourceSets {
     main {
         java {
             srcDirs 'build/antlr'
-            srcDirs 'src/main/java'
         }
     }
 }

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

@@ -66,7 +66,7 @@ class MappingConverter(val mapping: MappingV2) {
 
     private fun convertResult (result: String): Mapping {
         val mapping = parseMapping(result)
-        return ResultTypeMapping(resolvePackageVariable(mapping.targetType))
+        return ResultTypeMapping(resolvePackageVariable(mapping.targetType!!))
     }
 
     private fun convertNull(value: String): Mapping {
@@ -84,28 +84,28 @@ class MappingConverter(val mapping: MappingV2) {
 
     private fun convertType (from: String, to: String): Mapping {
         val mapping = parseMapping(to)
-        return TypeMapping(from, resolvePackageVariable(mapping.targetType))
+        return TypeMapping(from, resolvePackageVariable(mapping.targetType!!))
     }
 
     private fun convertType(source: Type): Mapping {
         val mapping = parseMapping(source.type)
 
-        val targetGenericTypes = mapping.targetGenericTypes
+        val targetGenericTypes = mapping.targetGenericTypes.toMutableList()
         if (targetGenericTypes.isEmpty() && source.generics != null) {
             targetGenericTypes.addAll(source.generics)
         }
 
         return if (mapping.kind == ANNOTATE) {
             AnnotationTypeMapping(
-                mapping.sourceType,
+                mapping.sourceType!!,
                 mapping.sourceFormat,
-                Annotation(mapping.annotationType, null, mapping.annotationParameters)
+                Annotation(mapping.annotationType!!, null, mapping.annotationParameters)
             )
         } else {
             TypeMapping(
                 mapping.sourceType,
                 mapping.sourceFormat,
-                resolvePackageVariable(mapping.targetType),
+                resolvePackageVariable(mapping.targetType!!),
                 resolvePackageVariable(targetGenericTypes)
             )
         }
@@ -136,61 +136,61 @@ class MappingConverter(val mapping: MappingV2) {
     private fun createParameterTypeMapping(source: RequestParameter): ParameterTypeMapping {
         val mapping = parseMapping(source.name)
 
-        val targetGenericTypes = mapping.targetGenericTypes
+        val targetGenericTypes = mapping.targetGenericTypes.toMutableList()
         if (targetGenericTypes.isEmpty() && source.generics != null) {
             targetGenericTypes.addAll(source.generics)
         }
 
         val typeMapping = TypeMapping(
             null,
             null,
-            resolvePackageVariable(mapping.targetType),
+            resolvePackageVariable(mapping.targetType!!),
             resolvePackageVariable(targetGenericTypes)
         )
 
-        return ParameterTypeMapping(mapping.sourceType, typeMapping)
+        return ParameterTypeMapping(mapping.sourceType!!, typeMapping)
     }
 
     private fun createAddParameterTypeMapping(source: AdditionalParameter): AddParameterTypeMapping {
         val mapping = parseMapping(source.add)
 
-        val targetGenericTypes = mapping.targetGenericTypes
+        val targetGenericTypes = mapping.targetGenericTypes.toMutableList()
         if (targetGenericTypes.isEmpty() && source.generics != null) {
             targetGenericTypes.addAll(source.generics)
         }
 
         val typeMapping = TypeMapping(
             null,
             null,
-            resolvePackageVariable(mapping.targetType),
+            resolvePackageVariable(mapping.targetType!!),
             resolvePackageVariable(targetGenericTypes)
         )
 
         var annotation: io.openapiprocessor.core.converter.mapping.Annotation? = null
         if(mapping.annotationType != null) {
             annotation = Annotation(
-                mapping.annotationType, null, mapping.annotationParameters)
+                mapping.annotationType!!, null, mapping.annotationParameters)
         }
 
-        return AddParameterTypeMapping(mapping.sourceType, typeMapping, annotation)
+        return AddParameterTypeMapping(mapping.sourceType!!, typeMapping, annotation)
     }
 
     private fun convertResponse(source: Response): Mapping {
         val mapping = parseMapping(source.content)
 
-        val targetGenericTypes = mapping.targetGenericTypes
+        val targetGenericTypes = mapping.targetGenericTypes.toMutableList()
         if (targetGenericTypes.isEmpty() && source.generics != null) {
             targetGenericTypes.addAll(source.generics)
         }
 
         val typeMapping = TypeMapping(
             null,
             null,
-            resolvePackageVariable(mapping.targetType),
+            resolvePackageVariable(mapping.targetType!!),
             resolvePackageVariable(targetGenericTypes)
         )
 
-        return ResponseTypeMapping (mapping.sourceType, typeMapping)
+        return ResponseTypeMapping (mapping.sourceType!!, typeMapping)
     }
 
     private fun convertPath(path: String, source: Path): Mapping {

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

@@ -2,21 +2,18 @@
  * Copyright 2022 https://github.com/openapi-processor/openapi-processor-core
  * PDX-License-Identifier: Apache-2.0
  */
+package io.openapiprocessor.core.processor.mapping.v2.parser
 
-package io.openapiprocessor.core.processor.mapping.v2.parser;
-
-import java.util.*;
-
-public interface Mapping {
-    enum Kind {
+interface Mapping {
+    enum class Kind {
         TYPE, MAP, ANNOTATE
     }
 
-    Mapping.Kind getKind();
-    String getSourceType();
-    String getSourceFormat();
-    String getTargetType();
-    List<String> getTargetGenericTypes();
-    String getAnnotationType();
-    LinkedHashMap<String, String> getAnnotationParameters();  // preserves order
+    val kind: Kind?
+    val sourceType: String?
+    val sourceFormat: String?
+    val targetType: String?
+    val targetGenericTypes: List<String>
+    val annotationType: String?
+    val annotationParameters: LinkedHashMap<String, String>  // preserves order
 }

src/main/kotlin/io/openapiprocessor/core/processor/mapping/v2/parser/antlr/MappingExtractor.kt

@@ -9,41 +9,13 @@ import io.openapiprocessor.core.processor.mapping.v2.parser.Mapping
 
 
 class MappingExtractor: MappingBaseListener(), Mapping {
-    private var kind: Mapping.Kind? = null
-    private var sourceType: String? = null
-    private var sourceFormat: String? = null
-    private var annotationType: String? = null
-    private var annotationParameters = LinkedHashMap<String, String>()
-    private var targetType: String? = null
-    private var targetGenericTypes: MutableList<String> = mutableListOf()
-
-    override fun getKind(): Mapping.Kind? {
-        return kind
-    }
-
-    override fun getSourceType(): String? {
-        return sourceType
-    }
-
-    override fun getSourceFormat(): String? {
-        return sourceFormat
-    }
-
-    override fun getTargetType(): String? {
-        return targetType
-    }
-
-    override fun getTargetGenericTypes(): List<String> {
-        return targetGenericTypes
-    }
-
-    override fun getAnnotationType(): String? {
-        return annotationType
-    }
-
-    override fun getAnnotationParameters(): LinkedHashMap<String, String> {
-        return annotationParameters
-    }
+    override var kind: Mapping.Kind? = null
+    override var sourceType: String? = null
+    override var sourceFormat: String? = null
+    override var annotationType: String? = null
+    override var annotationParameters = LinkedHashMap<String, String>()
+    override var targetType: String? = null
+    override var targetGenericTypes: MutableList<String> = mutableListOf()
 
     override fun enterType(ctx: MappingParser.TypeContext) {
         kind = Mapping.Kind.TYPE