Merge pull request #147 from openapi-processor/generated

Author: hauner

src/main/kotlin/io/openapiprocessor/spring/processor/SpringProcessor.kt

@@ -13,17 +13,19 @@ import io.openapiprocessor.core.converter.ApiOptions
 import io.openapiprocessor.core.converter.OptionsConverter
 import io.openapiprocessor.core.parser.Parser
 import io.openapiprocessor.core.writer.java.*
-import io.openapiprocessor.spring.writer.java.HeaderWriter
+import io.openapiprocessor.spring.Version
 import io.openapiprocessor.spring.writer.java.MappingAnnotationWriter
 import io.openapiprocessor.spring.writer.java.ParameterAnnotationWriter
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import java.time.OffsetDateTime
 
 /**
  *  Entry point of openapi-processor-spring.
  */
 class SpringProcessor: OpenApiProcessor, io.openapiprocessor.api.v1.OpenApiProcessor {
     private val log: Logger = LoggerFactory.getLogger(this.javaClass.name)
+    private var testMode = false
 
     override fun getName(): String {
         return "spring"
@@ -44,15 +46,17 @@ class SpringProcessor: OpenApiProcessor, io.openapiprocessor.api.v1.OpenApiProce
             val cv = ApiConverter(options, framework)
             val api = cv.convert(openapi)
 
-            val headerWriter = HeaderWriter()
+            val generatedInfo = createGeneratedInfo(options)
+            val generatedWriter = GeneratedWriterImpl(generatedInfo, options)
             val beanValidationFactory = BeanValidationFactory()
             val javaDocWriter = JavaDocWriter()
 
             val writer = ApiWriter(
                 options,
+                generatedWriter,
                 InterfaceWriter(
                     options,
-                    headerWriter,
+                    generatedWriter,
                     MethodWriter(
                         options,
                         MappingAnnotationWriter(),
@@ -66,12 +70,12 @@ class SpringProcessor: OpenApiProcessor, io.openapiprocessor.api.v1.OpenApiProce
                 ),
                 DataTypeWriter(
                     options,
-                    headerWriter,
+                    generatedWriter,
                     beanValidationFactory),
-                StringEnumWriter (headerWriter),
+                StringEnumWriter (generatedWriter),
                 InterfaceDataTypeWriter(
                     options,
-                    headerWriter,
+                    generatedWriter,
                     javaDocWriter
                 )
             )
@@ -83,6 +87,30 @@ class SpringProcessor: OpenApiProcessor, io.openapiprocessor.api.v1.OpenApiProce
         }
     }
 
+    private fun createGeneratedInfo(options: ApiOptions): GeneratedInfo {
+        var version = Version.version
+        var date: String? = OffsetDateTime.now().toString()
+
+        if (!options.generatedDate)
+            date = null
+
+        if (testMode) {
+            version = "test"
+            date = null
+        }
+
+        return GeneratedInfo(
+            "openapi-processor-spring",
+            version,
+            date
+            //"https://openapiprocessor.io"
+        )
+    }
+
+    fun enableTestMode () {
+        testMode = true
+    }
+
     @Suppress("UNCHECKED_CAST")
     private fun convertOptions(processorOptions: Map<String, *>): ApiOptions {
         val options = OptionsConverter().convertOptions (processorOptions as Map<String, Any>)

src/main/kotlin/io/openapiprocessor/spring/writer/java/HeaderWriter.kt

@@ -34,8 +34,6 @@ class ProcessorEndToEndJimfsSpec: StringSpec({
 })
 
 private fun sources(): Collection<TestSet> {
-    setTestHeader()
-
     // the swagger parser does not work with a custom FileSystem
 
     val openapi4j = ALL_30.map {

src/test/groovy/io/openapiprocessor/spring/writer/java/HeaderWriterSpec.groovy

@@ -35,8 +35,6 @@ class ProcessorEndToEndSpec: StringSpec({
 })
 
 private fun sources(): Collection<TestSet> {
-    setTestHeader()
-
     val swagger = ALL_30.map {
         testSet(it.name, ParserType.SWAGGER, it.openapi)
     }

src/testInt/kotlin/io/openapiprocessor/spring/ProcessorEndToEndJimfsSpec.kt

@@ -34,8 +34,6 @@ class ProcessorPendingSpec: StringSpec({
 })
 
 private fun sources(): Collection<TestSet> {
-    setTestHeader()
-
     return listOf(
         testSet("params-request-body-multipart-mapping", INTERNAL, API_30),
         testSet("params-request-body-multipart-mapping", INTERNAL, API_31)

src/testInt/kotlin/io/openapiprocessor/spring/ProcessorEndToEndSpec.kt

@@ -7,7 +7,6 @@ package io.openapiprocessor.spring
 
 import io.openapiprocessor.core.parser.ParserType
 import io.openapiprocessor.spring.processor.SpringProcessor
-import io.openapiprocessor.spring.writer.java.HEADER
 import io.openapiprocessor.test.TestSet
 
 
@@ -23,28 +22,15 @@ fun testSet(
     inputs: String = "inputs.yaml",
     generated: String = "generated.yaml"): TestSet {
 
+    val processor = SpringProcessor()
+    processor.enableTestMode()
+
     val testSet = TestSet()
     testSet.name = name
-    testSet.processor = SpringProcessor()
+    testSet.processor = processor
     testSet.parser = parser.name
     testSet.openapi = openapi
     testSet.inputs = inputs
     testSet.generated = generated
     return testSet
 }
-
-
-fun setTestHeader() {
-    HEADER = TEST_HEADER
-}
-
-private const val TEST_HEADER: String = """
-/*
- * DO NOT MODIFY - this class was auto generated by openapi-processor-spring
- *
- * test
- * time
- * https://docs.openapiprocessor.io/spring 
- */
-
-"""

src/testInt/kotlin/io/openapiprocessor/spring/ProcessorPendingSpec.kt

@@ -1,18 +1,12 @@
-/*
- * DO NOT MODIFY - this class was auto generated by openapi-processor-spring
- *
- * test
- * time
- * https://docs.openapiprocessor.io/spring
- */
-
 package generated.api;
 
+import generated.support.Generated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 
+@Generated(value = "openapi-processor-spring", version = "test")
 public interface EndpointApi {
 
     @GetMapping(path = "/endpoint")

src/testInt/kotlin/io/openapiprocessor/spring/ProcessorTestSetsSupport.kt

@@ -1,18 +1,12 @@
-/*
- * DO NOT MODIFY - this class was auto generated by openapi-processor-spring
- *
- * test
- * time
- * https://docs.openapiprocessor.io/spring
- */
-
 package generated.api;
 
 import generated.model.Props;
+import generated.support.Generated;
 import java.util.Map;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+@Generated(value = "openapi-processor-spring", version = "test")
 public interface Api {
 
     @GetMapping(path = "/endpoint-object")

src/testInt/resources/tests/endpoint-http-mapping/generated/api/EndpointApi.java

@@ -1,15 +1,9 @@
-/*
- * DO NOT MODIFY - this class was auto generated by openapi-processor-spring
- *
- * test
- * time
- * https://docs.openapiprocessor.io/spring
- */
-
 package generated.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import generated.support.Generated;
 
+@Generated(value = "openapi-processor-spring", version = "test")
 public class Props {
 
     @JsonProperty("prop1")