Skip to content

Commit dcb146f

Browse files
committed
#198, update to api changes
1 parent f96e0bc commit dcb146f

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import io.openapiprocessor.core.converter.ApiConverter
99
import io.openapiprocessor.core.converter.ApiOptions
1010
import io.openapiprocessor.core.converter.OptionsConverter
1111
import io.openapiprocessor.core.parser.OpenApiParser
12-
import io.openapiprocessor.core.writer.WriterFactory
1312
import io.openapiprocessor.core.writer.java.*
1413
import io.openapiprocessor.spring.Version
14+
import io.openapiprocessor.spring.writer.java.*
1515
import io.openapiprocessor.spring.writer.java.MappingAnnotationWriter
1616
import io.openapiprocessor.spring.writer.java.ParameterAnnotationWriter
1717
import org.slf4j.Logger
@@ -21,7 +21,7 @@ import java.time.OffsetDateTime
2121
/**
2222
* openapi-processor-spring.
2323
*/
24-
class SpringProcessor(private val writerFactory: WriterFactory) {
24+
class SpringProcessor {
2525
private val log: Logger = LoggerFactory.getLogger(this.javaClass.name)
2626
private var testMode = false
2727

@@ -40,6 +40,7 @@ class SpringProcessor(private val writerFactory: WriterFactory) {
4040
val cv = ApiConverter(options, framework)
4141
val api = cv.convert(openapi)
4242

43+
val writerFactory = SpringWriterFactory(options)
4344
val generatedInfo = createGeneratedInfo(options)
4445
val generatedWriter = GeneratedWriterImpl(generatedInfo, options)
4546
val beanValidations = BeanValidationFactory(getValidationFormat(options))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class SpringService(private val testMode: Boolean = false):
2323

2424
override fun run(processorOptions: MutableMap<String, *>) {
2525
try {
26-
val processor = SpringProcessor(DefaultWriterFactory())
26+
val processor = SpringProcessor()
2727
if (testMode) {
2828
processor.enableTestMode()
2929
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ package io.openapiprocessor.spring.processor
1010
import io.openapiprocessor.api.v2.Version
1111
import io.openapiprocessor.core.version.GitHubVersionException
1212
import io.openapiprocessor.core.version.GitHubVersionProvider
13-
import io.openapiprocessor.core.writer.DefaultWriterFactory
1413
import org.slf4j.Logger
1514
import org.slf4j.LoggerFactory
1615

@@ -35,7 +34,7 @@ class SpringServiceV2(
3534

3635
override fun run(processorOptions: MutableMap<String, *>) {
3736
try {
38-
val processor = SpringProcessor(DefaultWriterFactory())
37+
val processor = SpringProcessor()
3938
if (testMode) {
4039
processor.enableTestMode()
4140
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class MethodWriterSpec extends Specification {
3737
apiOptions,
3838
new MappingAnnotationWriter(new SpringFrameworkAnnotations()),
3939
new ParameterAnnotationWriter(new SpringFrameworkAnnotations()),
40-
new BeanValidationFactory (),
40+
new BeanValidationFactory (apiOptions),
4141
new JavaDocWriter())
4242
def target = new StringWriter ()
4343

0 commit comments

Comments
 (0)