re-format generated code

Author: hauner

build.gradle

@@ -36,6 +36,7 @@ dependencies {
     implementation 'org.codehaus.groovy:groovy:2.5.4'
     implementation 'io.swagger.parser.v3:swagger-parser:2.0.12'
     implementation 'org.yaml:snakeyaml:1.25'
+    implementation 'com.google.googlejavaformat:google-java-format:1.7'
     compileOnly "com.github.hauner.openapi:openapi-generatr-api:$generatrApiVersion"
 
     testImplementation 'net.bytebuddy:byte-buddy:1.9.13'

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original authors
+ * Copyright 2019-2020 the original authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,11 @@ package com.github.hauner.openapi.spring.writer
 
 import com.github.hauner.openapi.spring.converter.ApiOptions
 import com.github.hauner.openapi.spring.model.Api
+import com.github.hauner.openapi.spring.model.Interface
 import com.github.hauner.openapi.spring.model.datatypes.ObjectDataType
 import com.github.hauner.openapi.spring.model.datatypes.StringEnumDataType
+import com.google.googlejavaformat.java.Formatter
+import com.google.googlejavaformat.java.JavaFormatterOptions
 import groovy.util.logging.Slf4j
 
 /**
@@ -38,22 +41,25 @@ class ApiWriter {
     File apiFolder
     File modelFolder
 
-    @Deprecated
-    ApiWriter(ApiOptions options, InterfaceWriter interfaceWriter) {
-        this.options = options
-        this.interfaceWriter = interfaceWriter
-        this.dataTypeWriter = new DataTypeWriter(headerWriter: new HeaderWriter ())
-        this.enumWriter = new StringEnumWriter(headerWriter: new HeaderWriter ())
-    }
+    Formatter formatter
 
-    ApiWriter(ApiOptions options,
-              InterfaceWriter interfaceWriter,
-              DataTypeWriter dataTypeWriter,
-              StringEnumWriter enumWriter) {
+    ApiWriter (ApiOptions options,
+               InterfaceWriter interfaceWriter,
+               DataTypeWriter dataTypeWriter,
+               StringEnumWriter enumWriter,
+                 boolean enableFormatter = true) {
         this.options = options
         this.interfaceWriter = interfaceWriter
         this.dataTypeWriter = dataTypeWriter
         this.enumWriter = enumWriter
+
+        if (enableFormatter) {
+            formatter = new Formatter (
+                JavaFormatterOptions
+                    .builder ()
+                    .style (JavaFormatterOptions.Style.AOSP)
+                    .build ())
+        }
     }
 
     void write(Api api) {
@@ -62,25 +68,60 @@ class ApiWriter {
         api.interfaces.each {
             def target = new File (apiFolder, "${it.interfaceName}.java")
             def writer = new FileWriter(target)
-            interfaceWriter.write (writer, it)
+            writeInterface (writer, it)
             writer.close ()
         }
 
         api.models.objectDataTypes.each {
             def target = new File (modelFolder, "${it.name}.java")
             def writer = new FileWriter(target)
-            dataTypeWriter.write (writer, it as ObjectDataType)
+            writeDataType (writer, it)
             writer.close ()
         }
 
         api.models.enumDataTypes.each {
             def target = new File (modelFolder, "${it.name}.java")
             def writer = new FileWriter(target)
-            enumWriter.write (writer, it as StringEnumDataType)
+            writeEnumDataType (writer, it)
             writer.close ()
         }
     }
 
+    private void writeInterface (Writer writer, Interface itf) {
+        def raw = new StringWriter ()
+        interfaceWriter.write (raw, itf)
+        writer.write (format (raw.toString ()))
+    }
+
+    private void writeDataType (Writer writer, ObjectDataType dataType) {
+        def raw = new StringWriter ()
+        dataTypeWriter.write (raw, dataType)
+        writer.write (format (raw.toString ()))
+    }
+
+    private void writeEnumDataType (Writer writer, StringEnumDataType enumDataType) {
+        def raw = new StringWriter ()
+        enumWriter.write (raw, enumDataType)
+        writer.write (format (raw.toString ()))
+    }
+
+    private String format (String raw) {
+        if (formatter == null) {
+            return raw
+        }
+        correctLineFeed (formatter.formatSource (raw))
+    }
+
+    private String correctLineFeed (String formatted) {
+        int index = formatted.findLastIndexOf (0) {
+            it == '}'
+        }
+
+        new StringBuilder ()
+            .append (formatted.substring (0, index))
+            .append ("\n}\n")
+    }
+
     private void createTargetFolders () {
         def rootPkg = options.packageName.replace ('.', File.separator)
         def apiPkg = [rootPkg, 'api'].join (File.separator)

src/test/groovy/com/github/hauner/openapi/spring/writer/ApiWriterSpec.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original authors
+ * Copyright 2019-2020 the original authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -95,7 +95,8 @@ class ApiWriterSpec extends Specification {
         ])
 
         when:
-        new ApiWriter (opts, interfaceWriter, null, null).write (api)
+        new ApiWriter (opts, interfaceWriter, null, null, false)
+            .write (api)
 
         then:
         def fooSource = new File(getApiPath (opts.targetDir, 'FooApi.java'))
@@ -130,7 +131,8 @@ Bar interface!
         def api = new Api(dt)
 
         when:
-        new ApiWriter (opts, Stub(InterfaceWriter), dataTypeWriter, Stub(StringEnumWriter)).write (api)
+        new ApiWriter (opts, Stub(InterfaceWriter), dataTypeWriter, Stub(StringEnumWriter), false)
+            .write (api)
 
         then:
         def fooSource = new File(getModelPath (opts.targetDir, 'Foo.java'))
@@ -165,7 +167,8 @@ Bar class!
         def api = new Api(dt)
 
         when:
-        new ApiWriter (opts, Stub(InterfaceWriter), Stub(DataTypeWriter), enumWriter).write (api)
+        new ApiWriter (opts, Stub(InterfaceWriter), Stub(DataTypeWriter), enumWriter, false)
+            .write (api)
 
         then:
         def fooSource = new File(getModelPath (opts.targetDir, 'Foo.java'))
@@ -202,18 +205,107 @@ Bar enum!
         def api = new Api(dt)
 
         when:
-        new ApiWriter (opts, Stub(InterfaceWriter), dataTypeWriter, Stub(StringEnumWriter)).write (api)
+        new ApiWriter (opts, Stub(InterfaceWriter), dataTypeWriter, Stub(StringEnumWriter), false)
+            .write (api)
 
         then:
         0 * dataTypeWriter.write (_, dt.find ('simple'))
         0 * dataTypeWriter.write (_, dt.find ('Type'))
     }
 
+    void "re-formats interface sources"() {
+        def interfaceWriter = Stub (InterfaceWriter) {
+            write (_ as Writer, _ as Interface) >> {
+                Writer writer = it.get(0)
+                writer.write ('  interface   Foo   {    }\n')
+            }
+        }
+
+        def opts = new ApiOptions(
+            packageName: 'com.github.hauner.openapi',
+            targetDir: [target.root.toString (), 'java', 'src'].join (File.separator)
+        )
+
+        def api = new Api(interfaces: [
+            new Interface(pkg: "${opts.packageName}.api", name: 'Foo')
+        ])
+
+        when:
+        new ApiWriter (opts, interfaceWriter, null, null)
+            .write (api)
+
+        then:
+        def fooSource = new File(getApiPath (opts.targetDir, 'FooApi.java'))
+        fooSource.text == """\
+interface Foo {
+}
+"""
+    }
+
+    void "re-formats model sources"() {
+        def dataTypeWriter = Stub (DataTypeWriter) {
+            write (_ as Writer, _ as ObjectDataType) >> {
+                Writer writer = it.get(0)
+                writer.write ('      class Foo {  }')
+            }
+        }
+
+        def opts = new ApiOptions(
+            packageName: 'com.github.hauner.openapi',
+            targetDir: [target.root.toString (), 'java', 'src'].join (File.separator)
+        )
+
+        def dt = new DataTypes()
+        dt.add (new ObjectDataType(pkg: "${opts.packageName}.model", type: 'Foo'))
+        def api = new Api(dt)
+
+        when:
+        new ApiWriter (opts, Stub(InterfaceWriter), dataTypeWriter, Stub(StringEnumWriter))
+            .write (api)
+
+        then:
+        def fooSource = new File(getModelPath (opts.targetDir, 'Foo.java'))
+        fooSource.text == """\
+class Foo {
+}
+"""
+    }
+
+    void "re-formats model enum sources"() {
+        def enumWriter = Stub (StringEnumWriter) {
+            write (_ as Writer, _ as StringEnumDataType) >> {
+                Writer writer = it.get(0)
+                writer.write ('    enum   Foo   {   }')
+            }
+        }
+
+        def opts = new ApiOptions(
+            packageName: 'com.github.hauner.openapi',
+            targetDir: [target.root.toString (), 'java', 'src'].join (File.separator)
+        )
+
+        def dt = new DataTypes()
+        dt.add (new StringEnumDataType(pkg: "${opts.packageName}.model", type: 'Foo'))
+        def api = new Api(dt)
+
+        when:
+        new ApiWriter (opts, Stub(InterfaceWriter), Stub(DataTypeWriter), enumWriter)
+            .write (api)
+
+        then:
+        def fooSource = new File(getModelPath (opts.targetDir, 'Foo.java'))
+        fooSource.text == """\
+enum Foo {
+}
+"""
+    }
+
     String getApiPath(String targetFolder, String clazzName) {
         ([targetFolder] + apiPkgPath + [clazzName]).join(File.separator)
     }
 
     String getModelPath(String targetFolder, String clazzName) {
         ([targetFolder] + apiModelPath + [clazzName]).join(File.separator)
     }
+
 }