better format

OpenAPITools · Jan 12, 2021 · 05bbacd · 05bbacd
1 parent e6847c5
commit 05bbacd
Show file tree

Hide file tree

Showing 100 changed files with 506 additions and 105 deletions.
diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/beanValidation.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/beanValidation.mustache
@@ -53,4 +53,4 @@
 {{/isInteger}}
 {{^isPrimitiveType}}
 @Valid
-{{/isPrimitiveType}}
+{{/isPrimitiveType}}
diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache
@@ -26,10 +26,16 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   @SerializedName("{{baseName}}")
   {{/gson}}
   {{#isContainer}}
-  {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}private {{{datatypeWithEnum}}} {{name}}{{#required}} = {{{defaultValue}}}{{/required}}{{^required}} = null{{/required}};
+  {{#useBeanValidation}}
+  {{>beanValidation}}
+  {{/useBeanValidation}}
+  private {{{datatypeWithEnum}}} {{name}}{{#required}} = {{{defaultValue}}}{{/required}}{{^required}} = null{{/required}};
   {{/isContainer}}
   {{^isContainer}}
-  {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};
+  {{#useBeanValidation}}
+  {{>beanValidation}}
+  {{/useBeanValidation}}
+  private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};
   {{/isContainer}}
 
   {{/vars}}
@@ -78,7 +84,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{/maximum}}
    * @return {{name}}
   **/
- {{#vendorExtensions.x-extra-annotation}}
+  {{#vendorExtensions.x-extra-annotation}}
   {{{vendorExtensions.x-extra-annotation}}}
   {{/vendorExtensions.x-extra-annotation}}
   public {{{datatypeWithEnum}}} {{getter}}() {

diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Category.java b/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Category.java
@@ -12,9 +12,11 @@
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Category   {
   @JsonProperty("id")
+
   private Long id;
 
   @JsonProperty("name")
+
   private String name;
 
   public Category id(Long id) {

diff --git a/...ver/petstore/java-play-framework-api-package-override/app/apimodels/ModelApiResponse.java b/...ver/petstore/java-play-framework-api-package-override/app/apimodels/ModelApiResponse.java
@@ -12,12 +12,15 @@
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class ModelApiResponse   {
   @JsonProperty("code")
+
   private Integer code;
 
   @JsonProperty("type")
+
   private String type;
 
   @JsonProperty("message")
+
   private String message;
 
   public ModelApiResponse code(Integer code) {

diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Order.java b/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Order.java
@@ -13,17 +13,21 @@
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Order   {
   @JsonProperty("id")
+
   private Long id;
 
   @JsonProperty("petId")
+
   private Long petId;
 
   @JsonProperty("quantity")
+
   private Integer quantity;
 
   @JsonProperty("shipDate")
   @Valid
-private OffsetDateTime shipDate;
+
+  private OffsetDateTime shipDate;
 
   /**
    * Order Status
@@ -59,9 +63,11 @@ public static StatusEnum fromValue(String value) {
   }
 
   @JsonProperty("status")
+
   private StatusEnum status;
 
   @JsonProperty("complete")
+
   private Boolean complete = false;
 
   public Order id(Long id) {

diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Pet.java
@@ -16,23 +16,28 @@
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Pet   {
   @JsonProperty("id")
+
   private Long id;
 
   @JsonProperty("category")
   @Valid
-private Category category;
+
+  private Category category;
 
   @JsonProperty("name")
   @NotNull
-private String name;
+
+  private String name;
 
   @JsonProperty("photoUrls")
   @NotNull
-private List<String> photoUrls = new ArrayList<>();
+
+  private List<String> photoUrls = new ArrayList<>();
 
   @JsonProperty("tags")
   @Valid
-private List<Tag> tags = null;
+
+  private List<Tag> tags = null;
 
   /**
    * pet status in the store
@@ -68,6 +73,7 @@ public static StatusEnum fromValue(String value) {
   }
 
   @JsonProperty("status")
+
   private StatusEnum status;
 
   public Pet id(Long id) {

diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Tag.java b/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/Tag.java
@@ -12,9 +12,11 @@
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Tag   {
   @JsonProperty("id")
+
   private Long id;
 
   @JsonProperty("name")
+
   private String name;
 
   public Tag id(Long id) {

diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/User.java b/samples/server/petstore/java-play-framework-api-package-override/app/apimodels/User.java
@@ -12,27 +12,35 @@
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class User   {
   @JsonProperty("id")
+
   private Long id;
 
   @JsonProperty("username")
+
   private String username;
 
   @JsonProperty("firstName")
+
   private String firstName;
 
   @JsonProperty("lastName")
+
   private String lastName;
 
   @JsonProperty("email")
+
   private String email;
 
   @JsonProperty("password")
+
   private String password;
 
   @JsonProperty("phone")
+
   private String phone;
 
   @JsonProperty("userStatus")
+
   private Integer userStatus;
 
   public User id(Long id) {

diff --git a/samples/server/petstore/java-play-framework-async/app/apimodels/Category.java b/samples/server/petstore/java-play-framework-async/app/apimodels/Category.java
@@ -12,9 +12,11 @@
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Category   {
   @JsonProperty("id")
+
   private Long id;
 
   @JsonProperty("name")
+
   private String name;
 
   public Category id(Long id) {

diff --git a/samples/server/petstore/java-play-framework-async/app/apimodels/ModelApiResponse.java b/samples/server/petstore/java-play-framework-async/app/apimodels/ModelApiResponse.java
@@ -12,12 +12,15 @@
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class ModelApiResponse   {
   @JsonProperty("code")
+
   private Integer code;
 
   @JsonProperty("type")
+
   private String type;
 
   @JsonProperty("message")
+
   private String message;
 
   public ModelApiResponse code(Integer code) {

diff --git a/samples/server/petstore/java-play-framework-async/app/apimodels/Order.java b/samples/server/petstore/java-play-framework-async/app/apimodels/Order.java
@@ -13,17 +13,21 @@
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Order   {
   @JsonProperty("id")
+
   private Long id;
 
   @JsonProperty("petId")
+
   private Long petId;
 
   @JsonProperty("quantity")
+
   private Integer quantity;
 
   @JsonProperty("shipDate")
   @Valid
-private OffsetDateTime shipDate;
+
+  private OffsetDateTime shipDate;
 
   /**
    * Order Status
@@ -59,9 +63,11 @@ public static StatusEnum fromValue(String value) {
   }
 
   @JsonProperty("status")
+
   private StatusEnum status;
 
   @JsonProperty("complete")
+
   private Boolean complete = false;
 
   public Order id(Long id) {

diff --git a/samples/server/petstore/java-play-framework-async/app/apimodels/Pet.java b/samples/server/petstore/java-play-framework-async/app/apimodels/Pet.java
@@ -16,23 +16,28 @@
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Pet   {
   @JsonProperty("id")
+
   private Long id;
 
   @JsonProperty("category")
   @Valid
-private Category category;
+
+  private Category category;
 
   @JsonProperty("name")
   @NotNull
-private String name;
+
+  private String name;
 
   @JsonProperty("photoUrls")
   @NotNull
-private List<String> photoUrls = new ArrayList<>();
+
+  private List<String> photoUrls = new ArrayList<>();
 
   @JsonProperty("tags")
   @Valid
-private List<Tag> tags = null;
+
+  private List<Tag> tags = null;
 
   /**
    * pet status in the store
@@ -68,6 +73,7 @@ public static StatusEnum fromValue(String value) {
   }
 
   @JsonProperty("status")
+
   private StatusEnum status;
 
   public Pet id(Long id) {

diff --git a/samples/server/petstore/java-play-framework-async/app/apimodels/Tag.java b/samples/server/petstore/java-play-framework-async/app/apimodels/Tag.java
@@ -12,9 +12,11 @@
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Tag   {
   @JsonProperty("id")
+
   private Long id;
 
   @JsonProperty("name")
+
   private String name;
 
   public Tag id(Long id) {

diff --git a/samples/server/petstore/java-play-framework-async/app/apimodels/User.java b/samples/server/petstore/java-play-framework-async/app/apimodels/User.java
@@ -12,27 +12,35 @@
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class User   {
   @JsonProperty("id")
+
   private Long id;
 
   @JsonProperty("username")
+
   private String username;
 
   @JsonProperty("firstName")
+
   private String firstName;
 
   @JsonProperty("lastName")
+
   private String lastName;
 
   @JsonProperty("email")
+
   private String email;
 
   @JsonProperty("password")
+
   private String password;
 
   @JsonProperty("phone")
+
   private String phone;
 
   @JsonProperty("userStatus")
+
   private Integer userStatus;
 
   public User id(Long id) {

diff --git a/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Category.java b/samples/server/petstore/java-play-framework-controller-only/app/apimodels/Category.java
@@ -12,9 +12,11 @@
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class Category   {
   @JsonProperty("id")
+
   private Long id;
 
   @JsonProperty("name")
+
   private String name;
 
   public Category id(Long id) {

diff --git a/...s/server/petstore/java-play-framework-controller-only/app/apimodels/ModelApiResponse.java b/...s/server/petstore/java-play-framework-controller-only/app/apimodels/ModelApiResponse.java
@@ -12,12 +12,15 @@
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class ModelApiResponse   {
   @JsonProperty("code")
+
   private Integer code;
 
   @JsonProperty("type")
+
   private String type;
 
   @JsonProperty("message")
+
   private String message;
 
   public ModelApiResponse code(Integer code) {