allow to return an empty collection of imports if @generated is disabled (openapi-processor/openapi-processor-spring#269)

Author: hauner

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/DataTypeWriterBase.kt

@@ -214,7 +214,7 @@ abstract class DataTypeWriterBase(
     private fun collectImports(packageName: String, dataType: ModelDataType): List<String> {
         val imports = mutableSetOf<String>()
 
-        imports.add(generatedWriter.getImport())
+        imports.addAll(generatedWriter.getImports())
         imports.addAll(collectDataTypeImports(dataType))
         imports.addAll(collectBeanValidationImports(dataType))
         imports.addAll(collectDataTypePropertiesImports(dataType))

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/GeneratedWriter.kt

@@ -8,7 +8,7 @@ package io.openapiprocessor.core.writer.java
 import java.io.Writer
 
 interface GeneratedWriter {
-    fun getImport():String
+    fun getImports(): Set<String>
     fun writeUse(target: Writer)
     fun writeSource(target: Writer)
 }

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/GeneratedWriterImpl.kt

@@ -12,8 +12,8 @@ import java.io.Writer
 class GeneratedWriterImpl(private val info: GeneratedInfo, private val options: ApiOptions)
     : GeneratedWriter {
 
-    override fun getImport():String {
-        return "${options.packageName}.support.Generated"
+    override fun getImports(): Set<String> {
+        return setOf("${options.packageName}.support.Generated")
     }
 
     override fun writeUse(target: Writer) {

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/InterfaceDataTypeWriter.kt

@@ -36,7 +36,7 @@ class InterfaceDataTypeWriter(
 
     private fun collectImports(): Set<String> {
         val imports = mutableSetOf<String>()
-        imports.add(generatedWriter.getImport())
+        imports.addAll(generatedWriter.getImports())
         return imports
     }
 }

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/InterfaceWriter.kt

@@ -53,7 +53,7 @@ class InterfaceWriter(
     private fun collectImports(packageName: String, endpoints: List<Endpoint>): List<String> {
         val imports: MutableSet<String> = mutableSetOf()
 
-        imports.add(generatedWriter.getImport())
+        imports.addAll(generatedWriter.getImports())
 
         endpoints.forEach { ep ->
             val annotation = annotations.getAnnotation (ep.method)

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/StringEnumWriter.kt

@@ -98,10 +98,10 @@ open class StringEnumWriter(
 
     private fun collectImports(packageName: String, dataType: DataType): List<String> {
         val imports = mutableSetOf<String>()
-        imports.add ("com.fasterxml.jackson.annotation.JsonCreator")
-        imports.add ("com.fasterxml.jackson.annotation.JsonValue")
-        imports.add(generatedWriter.getImport())
-        imports.addAll (dataType.referencedImports)
+        imports.add("com.fasterxml.jackson.annotation.JsonCreator")
+        imports.add("com.fasterxml.jackson.annotation.JsonValue")
+        imports.addAll(generatedWriter.getImports())
+        imports.addAll(dataType.referencedImports)
         if (isSupplier()) {
             imports.add ("java.util.function.Supplier")
         }

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/StringValuesWriter.kt

@@ -14,20 +14,20 @@ class StringValuesWriter(
 ) {
 
     fun writeValues(target: Writer) {
-        val imports = listOf(
-            generatedWriter.getImport(),
+        val imports = mutableListOf(
             "${options.beanValidationFormat}.validation.Constraint",
             "${options.beanValidationFormat}.validation.Payload",
             "java.lang.annotation.*"
-        ).sorted()
+        )
+        imports.addAll(generatedWriter.getImports())
 
         target.write("""
             package ${options.packageName}.validation;
             
         """.trimIndent())
 
         target.write("\n")
-        imports.forEach {
+        imports.sorted().forEach {
             target.write("import ${it};\n")
         }
         target.write("\n")
@@ -55,20 +55,20 @@ class StringValuesWriter(
     }
 
     fun writeValueValidator(target: Writer) {
-        val imports = listOf(
-            generatedWriter.getImport(),
+        val imports = mutableListOf(
             "${options.beanValidationFormat}.validation.ConstraintValidator",
             "${options.beanValidationFormat}.validation.ConstraintValidatorContext",
             "java.util.Arrays"
-        ).sorted()
+        )
+        imports.addAll(generatedWriter.getImports())
 
         target.write("""
             package ${options.packageName}.validation;
             
         """.trimIndent())
 
         target.write("\n")
-        imports.forEach {
+        imports.sorted().forEach {
             target.write("import ${it};\n")
         }
         target.write("\n")

openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/SimpleGeneratedWriter.kt

@@ -10,8 +10,8 @@ import java.io.Writer
 
 class SimpleGeneratedWriter(private val options: ApiOptions) : GeneratedWriter {
 
-    override fun getImport(): String {
-        return "${options.packageName}.support.Generated"
+    override fun getImports(): Set<String> {
+        return setOf("${options.packageName}.support.Generated")
     }
 
     override fun writeUse(target: Writer) {