small cleanup

Author: hauner

src/main/groovy/com/github/hauner/openapi/spring/generatr/SpringGeneratr.groovy

@@ -63,20 +63,23 @@ class SpringGeneratr implements OpenApiGeneratr {
         def api = cv.convert (result.openAPI)
 
         def headerWriter = new HeaderWriter()
-        def beanValidationWriter = new BeanValidationFactory()
+        def beanValidationFactory = new BeanValidationFactory()
+
         def writer = new ApiWriter (options,
             new InterfaceWriter(
                 headerWriter: headerWriter,
                 methodWriter: new MethodWriter(
-                    apiOptions: options,
-                    beanValidationWriter: beanValidationWriter
+                    beanValidationFactory: beanValidationFactory,
+                    apiOptions: options
                 ),
-                beanValidationWriter: beanValidationWriter,
-                apiOptions: options),
+                beanValidationFactory: beanValidationFactory,
+                apiOptions: options
+            ),
             new DataTypeWriter(
                 headerWriter: headerWriter,
+                beanValidationFactory: beanValidationFactory,
                 apiOptions: options,
-                beanValidationWriter: beanValidationWriter),
+            ),
             new StringEnumWriter(headerWriter: headerWriter)
         )
 

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

@@ -30,7 +30,7 @@ import com.github.hauner.openapi.support.Identifier
 class DataTypeWriter {
     ApiOptions apiOptions
     HeaderWriter headerWriter
-    BeanValidationFactory beanValidationWriter
+    BeanValidationFactory beanValidationFactory
 
     void write (Writer target, ObjectDataType dataType) {
         headerWriter.write (target)
@@ -51,9 +51,7 @@ class DataTypeWriter {
         propertyNames.each {
             def javaPropertyName = Identifier.toCamelCase (it)
             def propDataType = dataType.getObjectProperty (it)
-            target.write ("    @JsonProperty(\"$it\")\n")
-            target.write(getBeanValidations(propDataType))
-            target.write ("    private ${propDataType.name} ${javaPropertyName};\n\n")
+            target.write (getProp (it, javaPropertyName, propDataType))
         }
 
         propertyNames.each {
@@ -66,12 +64,19 @@ class DataTypeWriter {
         target.write ("}\n")
     }
 
-    private String getBeanValidations(DataType propDataType) {
+    private String getProp (String propertyName, String javaPropertyName, DataType propDataType) {
+        String result
+        result = "    @JsonProperty(\"${propertyName}\")\n"
+
         if (apiOptions.beanValidation) {
-            beanValidationWriter.createAnnotations(propDataType)
-        } else {
-            ''
+            def beanValidationAnnotations = beanValidationFactory.createAnnotations (propDataType)
+            if (!beanValidationAnnotations.empty) {
+                result += "    $beanValidationAnnotations\n"
+            }
         }
+
+        result += "    private ${propDataType.name} ${javaPropertyName};\n\n"
+        result
     }
 
     private String getGetter (String propertyName, DataType propDataType) {
@@ -98,9 +103,9 @@ class DataTypeWriter {
 
         imports.addAll (dataType.referencedImports)
 
-        if(apiOptions.beanValidation){
-            for (DataType propDataType  : dataType.properties.values ()) {
-                imports.addAll (beanValidationWriter.collectImports (propDataType))
+        if (apiOptions.beanValidation) {
+            for (DataType propDataType : dataType.properties.values ()) {
+                imports.addAll (beanValidationFactory.collectImports (propDataType))
             }
         }
 

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

@@ -30,7 +30,7 @@ class InterfaceWriter {
     ApiOptions apiOptions
     HeaderWriter headerWriter
     MethodWriter methodWriter
-    BeanValidationFactory beanValidationWriter
+    BeanValidationFactory beanValidationFactory
 
     void write (Writer target, Interface itf) {
         headerWriter.write (target)
@@ -62,7 +62,7 @@ class InterfaceWriter {
 
             ep.parameters.each { p ->
                 if (apiOptions.beanValidation) {
-                    imports.addAll(beanValidationWriter.collectImports (p.dataType))
+                    imports.addAll (beanValidationFactory.collectImports (p.dataType))
                 }
 
                 if (p.withAnnotation()) {
@@ -76,7 +76,7 @@ class InterfaceWriter {
                 imports.add (b.annotationWithPackage)
                 imports.addAll (b.imports)
                 if (apiOptions.beanValidation) {
-                    imports.addAll(beanValidationWriter.collectImports (b.requestBodyType))
+                    imports.addAll (beanValidationFactory.collectImports (b.requestBodyType))
                 }
             }
 

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

@@ -31,7 +31,7 @@ import com.github.hauner.openapi.support.Identifier
 class MethodWriter {
 
     ApiOptions apiOptions
-    BeanValidationFactory beanValidationWriter
+    BeanValidationFactory beanValidationFactory
 
     void write (Writer target, Endpoint endpoint) {
         target.write ("""\
@@ -107,8 +107,8 @@ class MethodWriter {
 
             def methodDefinition = ''
 
-            if(apiOptions.beanValidation){
-                methodDefinition += " ${beanValidationWriter.createAnnotations(it.dataType)}"
+            if (apiOptions.beanValidation) {
+                methodDefinition += " ${beanValidationFactory.createAnnotations (it.dataType)}"
             }
 
             if (it.withAnnotation ()) {
@@ -122,8 +122,8 @@ class MethodWriter {
         if (!endpoint.requestBodies.empty) {
             def body = endpoint.requestBody
             def beanValidationAnnotations = ''
-            if(apiOptions.beanValidation){
-                beanValidationAnnotations += " ${beanValidationWriter.createAnnotations(body.requestBodyType)}"
+            if (apiOptions.beanValidation) {
+                beanValidationAnnotations += " ${beanValidationFactory.createAnnotations (body.requestBodyType)}"
             }
             def param = "${beanValidationAnnotations} ${createRequestBodyAnnotation(body)} ${body.requestBodyType.name} body"
             ps.add (param.trim())