Skip to content

Commit 37be156

Browse files
author
Bastian Wilhelm
committed
#34 move beanValidation outside of withAnnotation
1 parent 8d79100 commit 37be156

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/main/groovy/com/github/hauner/openapi/spring/writer/InterfaceWriter.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ class InterfaceWriter {
6161
imports.add (ep.method.classNameWithPackage)
6262

6363
ep.parameters.each { p ->
64+
if (apiOptions.beanValidation) {
65+
imports.addAll(beanValidationWriter.collectImports (p.dataType))
66+
}
67+
6468
if (p.withAnnotation()) {
6569
imports.add (p.annotationWithPackage)
66-
67-
if (apiOptions.beanValidation) {
68-
imports.addAll(beanValidationWriter.collectImports (p.dataType))
69-
}
7070
}
7171

7272
imports.addAll (p.dataTypeImports)

src/main/groovy/com/github/hauner/openapi/spring/writer/MethodWriter.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,11 @@ class MethodWriter {
107107

108108
def methodDefinition = ''
109109

110-
if (it.withAnnotation ()) {
111-
if(apiOptions.beanValidation){
112-
methodDefinition += " ${beanValidationWriter.createAnnotations(it.dataType)}"
113-
}
110+
if(apiOptions.beanValidation){
111+
methodDefinition += " ${beanValidationWriter.createAnnotations(it.dataType)}"
112+
}
114113

114+
if (it.withAnnotation ()) {
115115
methodDefinition += " ${createParameterAnnotation (it)}"
116116
}
117117

0 commit comments

Comments
 (0)