openapi-processor/openapi-processor-spring#198, update construction

Author: hauner

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

@@ -24,7 +24,7 @@ enum class Access {
 abstract class DataTypeWriterBase(
     protected val apiOptions: ApiOptions,
     protected val generatedWriter: GeneratedWriter,
-    protected val validationAnnotations: BeanValidationFactory = BeanValidationFactory(),
+    protected val validationAnnotations: BeanValidationFactory = BeanValidationFactory(apiOptions),
     protected val javadocWriter: JavaDocWriter = JavaDocWriter()
 ): DataTypeWriter {
     protected val annotationWriter = AnnotationWriter()

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

@@ -19,7 +19,7 @@ import java.io.Writer
 class DataTypeWriterPojo(
     apiOptions: ApiOptions,
     generatedWriter: GeneratedWriter,
-    validationAnnotations: BeanValidationFactory = BeanValidationFactory(),
+    validationAnnotations: BeanValidationFactory = BeanValidationFactory(apiOptions),
     javadocWriter: JavaDocWriter = JavaDocWriter()
 ) : DataTypeWriterBase(apiOptions, generatedWriter, validationAnnotations, javadocWriter) {
 

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

@@ -17,7 +17,7 @@ import java.io.Writer
 class DataTypeWriterRecord(
     apiOptions: ApiOptions,
     generatedWriter: GeneratedWriter,
-    validationAnnotations: BeanValidationFactory = BeanValidationFactory(),
+    validationAnnotations: BeanValidationFactory = BeanValidationFactory(apiOptions),
     javadocWriter: JavaDocWriter = JavaDocWriter()
 ) : DataTypeWriterBase(apiOptions, generatedWriter, validationAnnotations, javadocWriter) {
 

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

@@ -24,7 +24,7 @@ class InterfaceWriter(
     private val generatedWriter: GeneratedWriter,
     private val methodWriter: MethodWriter,
     private val annotations: FrameworkAnnotations,
-    private val validationAnnotations: BeanValidationFactory = BeanValidationFactory(),
+    private val validationAnnotations: BeanValidationFactory = BeanValidationFactory(apiOptions),
     private val importFilter: ImportFilter = DefaultImportFilter()
 ) {
     fun write(target: Writer, itf: Interface) {

openapi-processor-core/src/test/groovy/com/github/hauner/openapi/core/converter/ApiConverterSpec.groovy

@@ -132,7 +132,7 @@ paths:
                 Stub (BeanValidationFactory),
                 Stub (JavaDocWriter)),
             new TestFrameworkAnnotations(),
-            new BeanValidationFactory(),
+            new BeanValidationFactory(opts),
             new DefaultImportFilter())
         def writer = new StringWriter()
         w.write (writer, api.interfaces.get (0))

openapi-processor-core/src/test/groovy/com/github/hauner/openapi/core/writer/java/BeanValidationFactorySpec.groovy

@@ -5,6 +5,7 @@
 
 package com.github.hauner.openapi.core.writer.java
 
+import io.openapiprocessor.core.converter.ApiOptions
 import io.openapiprocessor.core.model.Documentation
 import io.openapiprocessor.core.model.datatypes.MappedCollectionDataType
 import io.openapiprocessor.core.model.datatypes.NoneDataType
@@ -24,7 +25,8 @@ import spock.lang.Unroll
 import static io.openapiprocessor.core.writer.java.AnnotationWriterKt.buildAnnotation
 
 class BeanValidationFactorySpec extends Specification {
-    static def validation = new BeanValidationFactory ()
+    static def options = new ApiOptions()
+    static def validation = new BeanValidationFactory (options)
     static def validations = validation.validations
 
     void "applies @Valid to Object" () {

openapi-processor-core/src/test/groovy/com/github/hauner/openapi/core/writer/java/DataTypeWriterSpec.groovy

@@ -28,7 +28,7 @@ class DataTypeWriterSpec extends Specification {
     def writer = new DataTypeWriterPojo(
         options,
         generatedWriter,
-        new BeanValidationFactory(),
+        new BeanValidationFactory(options),
         new JavaDocWriter())
     def target = new StringWriter ()
 

openapi-processor-core/src/test/groovy/com/github/hauner/openapi/core/writer/java/InterfaceWriterSpec.groovy

@@ -26,7 +26,7 @@ class InterfaceWriterSpec extends Specification {
         generatedWriter,
         methodWriter,
         annotations,
-        new BeanValidationFactory(),
+        new BeanValidationFactory(apiOptions),
         new DefaultImportFilter())
     def target = new StringWriter ()
 

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

@@ -8,12 +8,14 @@ package io.openapiprocessor.core.writer.java
 import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.collections.shouldBeEmpty
 import io.kotest.matchers.shouldBe
+import io.openapiprocessor.core.converter.ApiOptions
 import io.openapiprocessor.core.model.datatypes.*
 import io.openapiprocessor.core.support.datatypes.ObjectDataType
 import io.openapiprocessor.core.support.datatypes.propertyDataTypeString
 
 class BeanValidationMappingSpec: StringSpec({
-    val validation = BeanValidationFactory()
+    val apiOptions = ApiOptions()
+    val validation = BeanValidationFactory(apiOptions)
     val validations = validation.validations
 
     "applies @Valid to mapped object items" {

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

@@ -29,7 +29,7 @@ class DataTypeWriterPojoSpec: StringSpec({
 
     val options = ApiOptions()
     val generatedWriter = SimpleGeneratedWriter(options)
-    var writer = DataTypeWriterPojo(options, generatedWriter, BeanValidationFactory())
+    var writer = DataTypeWriterPojo(options, generatedWriter, BeanValidationFactory(options))
     val target = StringWriter()
 
     "writes @Generated annotation import" {
@@ -112,7 +112,7 @@ class DataTypeWriterPojoSpec: StringSpec({
 
     "writes additional bean validation object annotation import" {
         options.beanValidation = true
-        val validation = object : BeanValidationFactory() {
+        val validation = object : BeanValidationFactory(options) {
             override fun validate(dataType: ModelDataType): BeanValidationInfo {
                 return BeanValidationInfoSimple(dataType, listOf(Annotation("foo.Foo")))
             }
@@ -133,7 +133,7 @@ class DataTypeWriterPojoSpec: StringSpec({
 
     "writes additional bean validation object annotation" {
         options.beanValidation = true
-        val validation = object : BeanValidationFactory() {
+        val validation = object : BeanValidationFactory(options) {
             override fun validate(dataType: ModelDataType): BeanValidationInfo {
                 return BeanValidationInfoSimple(dataType, listOf(Annotation("foo.Foo")))
             }
@@ -211,7 +211,7 @@ class DataTypeWriterPojoSpec: StringSpec({
             AnnotationTypeMapping(
                 "Foo", annotation = MappingAnnotation("foo.Bar")
             ))
-        writer = DataTypeWriterPojo(options, generatedWriter, BeanValidationFactory())
+        writer = DataTypeWriterPojo(options, generatedWriter, BeanValidationFactory(options))
 
         val dataType = ObjectDataType("Foo",
             "pkg", linkedMapOf("foo" to propertyDataTypeString()))
@@ -231,7 +231,7 @@ class DataTypeWriterPojoSpec: StringSpec({
                     "foo.Bar", linkedMapOf("bar" to SimpleParameterValue(""""rab""""))
                 )
             ))
-        writer = DataTypeWriterPojo(options, generatedWriter, BeanValidationFactory())
+        writer = DataTypeWriterPojo(options, generatedWriter, BeanValidationFactory(options))
 
         val dataType = ObjectDataType("Foo",
             "pkg", linkedMapOf("foo" to propertyDataTypeString()))
@@ -254,7 +254,7 @@ class DataTypeWriterPojoSpec: StringSpec({
             AnnotationTypeMapping(
                 "Foo", annotation = MappingAnnotation("foo.Bar")
             ))
-        writer = DataTypeWriterPojo(options, generatedWriter, BeanValidationFactory())
+        writer = DataTypeWriterPojo(options, generatedWriter, BeanValidationFactory(options))
 
         val dataType = ObjectDataType("Object",
             "pkg", linkedMapOf(
@@ -277,7 +277,7 @@ class DataTypeWriterPojoSpec: StringSpec({
                     "foo.Bar", linkedMapOf("bar" to SimpleParameterValue(""""rab""""))
                 )
             ))
-        writer = DataTypeWriterPojo(options, generatedWriter, BeanValidationFactory())
+        writer = DataTypeWriterPojo(options, generatedWriter, BeanValidationFactory(options))
 
         val dataType = ObjectDataType("Object",
             "pkg", linkedMapOf(
@@ -317,7 +317,7 @@ class DataTypeWriterPojoSpec: StringSpec({
                     "foo.Bar", linkedMapOf("bar" to SimpleParameterValue(""""rab""""))
                 )
             ))
-        writer = DataTypeWriterPojo(options, generatedWriter, BeanValidationFactory())
+        writer = DataTypeWriterPojo(options, generatedWriter, BeanValidationFactory(options))
 
         val dataType = ObjectDataType("Object",
             "pkg", linkedMapOf(
@@ -358,7 +358,7 @@ class DataTypeWriterPojoSpec: StringSpec({
             )
         )
 
-        writer = DataTypeWriterPojo(options, generatedWriter, BeanValidationFactory())
+        writer = DataTypeWriterPojo(options, generatedWriter, BeanValidationFactory(options))
 
         val dataType = ObjectDataType("Object",
             "pkg", linkedMapOf(
@@ -397,7 +397,7 @@ class DataTypeWriterPojoSpec: StringSpec({
             )
         )
 
-        writer = DataTypeWriterPojo(options, generatedWriter, BeanValidationFactory())
+        writer = DataTypeWriterPojo(options, generatedWriter, BeanValidationFactory(options))
 
         val dataType = ObjectDataType("Object",
             "pkg", linkedMapOf(

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

@@ -24,7 +24,7 @@ class DataTypeWriterRecordSpec: StringSpec({
 
     val options = ApiOptions()
     val generatedWriter = SimpleGeneratedWriter(options)
-    val writer = DataTypeWriterRecord(options, generatedWriter, BeanValidationFactory())
+    val writer = DataTypeWriterRecord(options, generatedWriter, BeanValidationFactory(options))
     val target = StringWriter()
 
     "writes 'package'" {

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

@@ -30,7 +30,7 @@ class MethodWriterAnnotationSpec: StringSpec ({
         //AnnotationWriter()
         TestMappingAnnotationWriter(),
         TestParameterAnnotationWriter(),
-        BeanValidationFactory())
+        BeanValidationFactory(apiOptions))
 
     val target = StringWriter()
 

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

@@ -26,7 +26,7 @@ class MethodWriterSpec: StringSpec({
         apiOptions,
         TestMappingAnnotationWriter(),
         TestParameterAnnotationWriter(),
-        BeanValidationFactory())
+        BeanValidationFactory(apiOptions))
 
     val target = StringWriter()
 

openapi-processor-core/src/testInt/kotlin/io/openapiprocessor/core/TestProcessor.kt

@@ -46,7 +46,7 @@ class TestProcessor:
             )
 
             val generatedWriter = GeneratedWriterImpl(generatedInfo, options)
-            val beanValidation = BeanValidationFactory(getValidationFormat(options))
+            val beanValidation = BeanValidationFactory(options)
             val javaDocWriter = JavaDocWriter()
 
             val writer = ApiWriter(
@@ -94,14 +94,6 @@ class TestProcessor:
             throw e
         }
     }
-
-    private fun getValidationFormat(options: ApiOptions): BeanValidationFormat {
-        val format = options.beanValidationFormat
-        return if (format != null)
-            BeanValidationFormat.valueOf(format.uppercase())
-        else
-            BeanValidationFormat.JAVAX
-    }
 }
 
 private fun convertOptions(processorOptions: MutableMap<String, *>): ApiOptions {