adjusted generated code to google-java-format

hauner · hauner · commit e03f74af89dc · 2020-01-05T18:12:08.000+01:00
diff --git a/src/main/groovy/com/github/hauner/openapi/spring/writer/StringEnumWriter.groovy b/src/main/groovy/com/github/hauner/openapi/spring/writer/StringEnumWriter.groovy
@@ -41,7 +41,7 @@ class StringEnumWriter {
             target.write ("\n")
         }
 
-        target.write ("public enum ${dataType.type} {\n\n")
+        target.write ("public enum ${dataType.type} {\n")
 
         def values = []
         dataType.values.each {
@@ -68,7 +68,7 @@ class StringEnumWriter {
         target.write("""\
     @JsonCreator
     public static ${dataType.type} fromValue(String value) {
-        for (${dataType.type} val: ${dataType.type}.values()) {
+        for (${dataType.type} val : ${dataType.type}.values()) {
             if (val.value.equals(value)) {
                 return val;
             }
diff --git a/src/test/groovy/com/github/hauner/openapi/spring/writer/StringEnumWriterSpec.groovy b/src/test/groovy/com/github/hauner/openapi/spring/writer/StringEnumWriterSpec.groovy
@@ -75,7 +75,6 @@ public enum Foo {
         then:
         target.toString ().contains ("""\
 public enum Foo {
-
     FOO("foo"),
     FOO_2("_foo-2"),
     FOO_FOO("foo-foo");
@@ -144,7 +143,7 @@ public enum Foo {
 
     @JsonCreator
     public static Foo fromValue(String value) {
-        for (Foo val: Foo.values()) {
+        for (Foo val : Foo.values()) {
             if (val.value.equals(value)) {
                 return val;
             }
diff --git a/src/testInt/resources/params-enum/generated/api/EnumApi.java b/src/testInt/resources/params-enum/generated/api/EnumApi.java
@@ -14,6 +14,7 @@
 public interface EnumApi {
 
     @GetMapping(path = "/endpoint")
-    ResponseEntity<Void> getEndpoint(@RequestParam(name = "foo") Foo foo, @RequestParam(name = "bar") Bar bar);
+    ResponseEntity<Void> getEndpoint(
+            @RequestParam(name = "foo") Foo foo, @RequestParam(name = "bar") Bar bar);
 
 }
diff --git a/src/testInt/resources/params-enum/generated/model/Bar.java b/src/testInt/resources/params-enum/generated/model/Bar.java
@@ -9,7 +9,6 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 
 public enum Bar {
-
     BAR("bar"),
     BAR_2("bar-2"),
     BAR_BAR("bar-bar");
@@ -27,7 +26,7 @@ public String getValue() {
 
     @JsonCreator
     public static Bar fromValue(String value) {
-        for (Bar val: Bar.values()) {
+        for (Bar val : Bar.values()) {
             if (val.value.equals(value)) {
                 return val;
             }
diff --git a/src/testInt/resources/params-enum/generated/model/Foo.java b/src/testInt/resources/params-enum/generated/model/Foo.java
@@ -9,7 +9,6 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 
 public enum Foo {
-
     FOO("foo"),
     FOO_2("foo-2"),
     FOO_FOO("foo-foo");
@@ -27,7 +26,7 @@ public String getValue() {
 
     @JsonCreator
     public static Foo fromValue(String value) {
-        for (Foo val: Foo.values()) {
+        for (Foo val : Foo.values()) {
             if (val.value.equals(value)) {
                 return val;
             }
diff --git a/src/testInt/resources/params-path-simple-data-types/generated/api/EndpointApi.java b/src/testInt/resources/params-path-simple-data-types/generated/api/EndpointApi.java
@@ -15,6 +15,7 @@ public interface EndpointApi {
     ResponseEntity<Void> getEndpointFoo(@PathVariable(name = "foo") String foo);
 
     @GetMapping(path = "/endpoint-optional/{foo}")
-    ResponseEntity<Void> getEndpointOptionalFoo(@PathVariable(name = "foo", required = false) String foo);
+    ResponseEntity<Void> getEndpointOptionalFoo(
+            @PathVariable(name = "foo", required = false) String foo);
 
 }
diff --git a/src/testInt/resources/params-request-body-multipart-form-data/generated/api/Api.java b/src/testInt/resources/params-request-body-multipart-form-data/generated/api/Api.java
@@ -13,9 +13,13 @@
 public interface Api {
 
     @PostMapping(path = "/multipart/single-file")
-    ResponseEntity<Void> postMultipartSingleFile(@RequestParam(name = "file") MultipartFile file, @RequestParam(name = "other") String other);
+    ResponseEntity<Void> postMultipartSingleFile(
+            @RequestParam(name = "file") MultipartFile file,
+            @RequestParam(name = "other") String other);
 
     @PostMapping(path = "/multipart/multiple-files")
-    ResponseEntity<Void> postMultipartMultipleFiles(@RequestParam(name = "files") MultipartFile[] files, @RequestParam(name = "other") String other);
+    ResponseEntity<Void> postMultipartMultipleFiles(
+            @RequestParam(name = "files") MultipartFile[] files,
+            @RequestParam(name = "other") String other);
 
 }
diff --git a/src/testInt/resources/params-request-body/generated/api/Api.java b/src/testInt/resources/params-request-body/generated/api/Api.java
@@ -12,7 +12,10 @@
 
 public interface Api {
 
-    @PostMapping(path = "/book", consumes = {"application/json"}, produces = {"application/json"})
+    @PostMapping(
+            path = "/book",
+            consumes = {"application/json"},
+            produces = {"application/json"})
     ResponseEntity<Book> postBook(@RequestBody Book body);
 
 }
diff --git a/src/testInt/resources/params-simple-data-types/generated/api/EndpointApi.java b/src/testInt/resources/params-simple-data-types/generated/api/EndpointApi.java
@@ -15,6 +15,7 @@ public interface EndpointApi {
     ResponseEntity<Void> getEndpoint(@RequestParam(name = "foo") String foo);
 
     @GetMapping(path = "/endpoint-optional")
-    ResponseEntity<Void> getEndpointOptional(@RequestParam(name = "foo", required = false, defaultValue = "bar") String foo);
+    ResponseEntity<Void> getEndpointOptional(
+            @RequestParam(name = "foo", required = false, defaultValue = "bar") String foo);
 
 }
diff --git a/src/testInt/resources/params-spring-pageable-mapping/generated/api/Api.java b/src/testInt/resources/params-spring-pageable-mapping/generated/api/Api.java
@@ -12,10 +12,14 @@
 
 public interface Api {
 
-    @GetMapping(path = "/page", produces = {"application/json"})
+    @GetMapping(
+            path = "/page",
+            produces = {"application/json"})
     ResponseEntity<Page<String>> getPage(Pageable pageable);
 
-    @GetMapping(path = "/page-inline", produces = {"application/json"})
+    @GetMapping(
+            path = "/page-inline",
+            produces = {"application/json"})
     ResponseEntity<Page<String>> getPageInline(Pageable pageable);
 
 }
diff --git a/src/testInt/resources/ref-into-another-file/generated/api/Api.java b/src/testInt/resources/ref-into-another-file/generated/api/Api.java
@@ -11,7 +11,9 @@
 
 public interface Api {
 
-    @GetMapping(path = "/book", produces = {"application/json"})
+    @GetMapping(
+            path = "/book",
+            produces = {"application/json"})
     ResponseEntity<Book> getBook();
 
 }
diff --git a/src/testInt/resources/response-array-data-type-mapping/generated/api/Api.java b/src/testInt/resources/response-array-data-type-mapping/generated/api/Api.java
@@ -13,13 +13,19 @@
 
 public interface Api {
 
-    @GetMapping(path = "/array-global", produces = {"application/vnd.any"})
+    @GetMapping(
+            path = "/array-global",
+            produces = {"application/vnd.any"})
     ResponseEntity<Collection<String>> getArrayGlobal();
 
-    @GetMapping(path = "/array-global-response", produces = {"application/vnd.global-response"})
+    @GetMapping(
+            path = "/array-global-response",
+            produces = {"application/vnd.global-response"})
     ResponseEntity<List<String>> getArrayGlobalResponse();
 
-    @GetMapping(path = "/array-endpoint-response", produces = {"application/vnd.any"})
+    @GetMapping(
+            path = "/array-endpoint-response",
+            produces = {"application/vnd.any"})
     ResponseEntity<Set<String>> getArrayEndpointResponse();
 
 }
diff --git a/src/testInt/resources/response-complex-data-types/generated/api/Api.java b/src/testInt/resources/response-complex-data-types/generated/api/Api.java
@@ -13,13 +13,19 @@
 
 public interface Api {
 
-    @GetMapping(path = "/book-inline", produces = {"application/json"})
+    @GetMapping(
+            path = "/book-inline",
+            produces = {"application/json"})
     ResponseEntity<BookInlineResponse200> getBookInline();
 
-    @GetMapping(path = "/book", produces = {"application/json"})
+    @GetMapping(
+            path = "/book",
+            produces = {"application/json"})
     ResponseEntity<Book> getBook();
 
-    @GetMapping(path = "/book-nested", produces = {"application/json"})
+    @GetMapping(
+            path = "/book-nested",
+            produces = {"application/json"})
     ResponseEntity<BookNested> getBookNested();
 
 }
diff --git a/src/testInt/resources/response-simple-data-types/generated/api/Api.java b/src/testInt/resources/response-simple-data-types/generated/api/Api.java
@@ -10,25 +10,39 @@
 
 public interface Api {
 
-    @GetMapping(path = "/string", produces = {"text/plain"})
+    @GetMapping(
+            path = "/string",
+            produces = {"text/plain"})
     ResponseEntity<String> getString();
 
-    @GetMapping(path = "/integer", produces = {"application/vnd.integer"})
+    @GetMapping(
+            path = "/integer",
+            produces = {"application/vnd.integer"})
     ResponseEntity<Integer> getInteger();
 
-    @GetMapping(path = "/long", produces = {"application/vnd.long"})
+    @GetMapping(
+            path = "/long",
+            produces = {"application/vnd.long"})
     ResponseEntity<Long> getLong();
 
-    @GetMapping(path = "/float", produces = {"application/vnd.float"})
+    @GetMapping(
+            path = "/float",
+            produces = {"application/vnd.float"})
     ResponseEntity<Float> getFloat();
 
-    @GetMapping(path = "/double", produces = {"application/vnd.double"})
+    @GetMapping(
+            path = "/double",
+            produces = {"application/vnd.double"})
     ResponseEntity<Double> getDouble();
 
-    @GetMapping(path = "/boolean", produces = {"application/vnd.boolean"})
+    @GetMapping(
+            path = "/boolean",
+            produces = {"application/vnd.boolean"})
     ResponseEntity<Boolean> getBoolean();
 
-    @GetMapping(path = "/array-string", produces = {"application/vnd.array"})
+    @GetMapping(
+            path = "/array-string",
+            produces = {"application/vnd.array"})
     ResponseEntity<String[]> getArrayString();
 
 }

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`public interface EnumApi {`
`15`	`15`
`16`	`16`	`@GetMapping(path = "/endpoint")`
`17`		`- ResponseEntity<Void> getEndpoint(@RequestParam(name = "foo") Foo foo, @RequestParam(name = "bar") Bar bar);`
	`17`	`+ ResponseEntity<Void> getEndpoint(`
	`18`	`+ @RequestParam(name = "foo") Foo foo, @RequestParam(name = "bar") Bar bar);`
`18`	`19`
`19`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ public interface EndpointApi {`
`15`	`15`	`ResponseEntity<Void> getEndpointFoo(@PathVariable(name = "foo") String foo);`
`16`	`16`
`17`	`17`	`@GetMapping(path = "/endpoint-optional/{foo}")`
`18`		`- ResponseEntity<Void> getEndpointOptionalFoo(@PathVariable(name = "foo", required = false) String foo);`
	`18`	`+ ResponseEntity<Void> getEndpointOptionalFoo(`
	`19`	`+ @PathVariable(name = "foo", required = false) String foo);`
`19`	`20`
`20`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,10 @@`
`12`	`12`
`13`	`13`	`public interface Api {`
`14`	`14`
`15`		`- @PostMapping(path = "/book", consumes = {"application/json"}, produces = {"application/json"})`
	`15`	`+ @PostMapping(`
	`16`	`+ path = "/book",`
	`17`	`+ consumes = {"application/json"},`
	`18`	`+ produces = {"application/json"})`
`16`	`19`	`ResponseEntity<Book> postBook(@RequestBody Book body);`
`17`	`20`
`18`	`21`	`}`