Skip to content

Commit d2b964e

Browse files
committed
update to changes of core api
1 parent dee67ba commit d2b964e

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,17 @@ class SpringProcessor {
3737
val annotations = SpringFrameworkAnnotations()
3838

3939
val options = convertOptions(processorOptions)
40-
val cv = ApiConverter(options, framework)
40+
val identifier = JavaIdentifier(IdentifierOptions(options.identifierWordBreakFromDigitToLetter))
41+
val cv = ApiConverter(options, identifier, framework)
4142
val api = cv.convert(openapi)
4243

4344
val writerFactory = SpringWriterFactory(options)
4445
val generatedInfo = createGeneratedInfo(options)
4546
val generatedWriter = GeneratedWriterImpl(generatedInfo, options)
4647
val validationWriter = ValidationWriter(options)
4748
val beanValidations = BeanValidationFactory(options)
48-
val javaDocWriter = JavaDocWriter()
49+
val javaDocWriter = JavaDocWriter(identifier)
50+
val formatter = GoogleFormatter()
4951

5052
val writer = ApiWriter(
5153
options,
@@ -56,6 +58,7 @@ class SpringProcessor {
5658
generatedWriter,
5759
MethodWriter(
5860
options,
61+
identifier,
5962
MappingAnnotationWriter(annotations),
6063
ParameterAnnotationWriter(annotations),
6164
beanValidations,
@@ -68,18 +71,20 @@ class SpringProcessor {
6871
when (options.modelType) {
6972
"record" -> DataTypeWriterRecord(
7073
options,
74+
identifier,
7175
generatedWriter,
7276
beanValidations,
7377
javaDocWriter
7478
)
7579
else -> DataTypeWriterPojo(
7680
options,
81+
identifier,
7782
generatedWriter,
7883
beanValidations,
7984
javaDocWriter
8085
)
8186
},
82-
StringEnumWriter (options, generatedWriter),
87+
StringEnumWriter (options, identifier, generatedWriter),
8388
InterfaceDataTypeWriter(
8489
options,
8590
generatedWriter,

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import io.openapiprocessor.core.model.datatypes.DataTypeName
2121
import io.openapiprocessor.core.model.datatypes.GenericDataType
2222
import io.openapiprocessor.core.model.datatypes.MappedDataType
2323
import io.openapiprocessor.core.writer.java.JavaDocWriter
24+
import io.openapiprocessor.core.writer.java.JavaIdentifier
2425
import io.openapiprocessor.spring.model.parameters.QueryParameter
2526
import io.openapiprocessor.spring.processor.SpringFrameworkAnnotations
2627
import io.openapiprocessor.core.converter.ApiOptions
@@ -33,12 +34,15 @@ import spock.lang.Specification
3334

3435
class MethodWriterSpec extends Specification {
3536
def apiOptions = new ApiOptions()
37+
def identifier = new JavaIdentifier()
38+
3639
def writer = new MethodWriter (
3740
apiOptions,
41+
identifier,
3842
new MappingAnnotationWriter(new SpringFrameworkAnnotations()),
3943
new ParameterAnnotationWriter(new SpringFrameworkAnnotations()),
4044
new BeanValidationFactory (apiOptions),
41-
new JavaDocWriter())
45+
new JavaDocWriter(identifier))
4246
def target = new StringWriter ()
4347

4448
@Deprecated

0 commit comments

Comments
 (0)