From 57871d845dad8a829a19457915ca73c2d3754d11 Mon Sep 17 00:00:00 2001 From: wing328 Date: Thu, 13 Apr 2017 17:53:10 +0800 Subject: [PATCH 1/7] update travis ci to cover samples/server/petstore/springboot-beanvalidation --- pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pom.xml b/pom.xml index 92c8bf18c8e..b0a70e427b1 100644 --- a/pom.xml +++ b/pom.xml @@ -710,6 +710,18 @@ samples/server/petstore/spring-mvc + + springboot-beanvalidation + + + env + java + + + + samples/server/petstore/springboot-beanvalidation + + springboot @@ -820,6 +832,7 @@ samples/server/petstore/spring-mvc samples/client/petstore/spring-cloud samples/server/petstore/springboot + samples/server/petstore/springboot-beanvalidation samples/server/petstore/jaxrs-cxf samples/server/petstore/jaxrs-cxf-annotated-base-path samples/server/petstore/jaxrs-cxf-cdi From c637157f9e3fcc11f38be289f38b0a41b9179560 Mon Sep 17 00:00:00 2001 From: wing328 Date: Thu, 13 Apr 2017 18:38:34 +0800 Subject: [PATCH 2/7] update project identifier for spring boot beanvalidation --- samples/server/petstore/springboot-beanvalidation/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/server/petstore/springboot-beanvalidation/pom.xml b/samples/server/petstore/springboot-beanvalidation/pom.xml index 79ebd1099b7..2541ef0f478 100644 --- a/samples/server/petstore/springboot-beanvalidation/pom.xml +++ b/samples/server/petstore/springboot-beanvalidation/pom.xml @@ -1,7 +1,7 @@ 4.0.0 io.swagger - swagger-spring + swagger-spring-beanvalidation jar swagger-spring 1.0.0 @@ -70,4 +70,4 @@ provided - \ No newline at end of file + From 4e6a342c13564dff3fe16d5b191ba0a805f90f11 Mon Sep 17 00:00:00 2001 From: wing328 Date: Thu, 13 Apr 2017 19:03:34 +0800 Subject: [PATCH 3/7] replace tab with 4-space in spring templates (#5389) --- .../JavaSpring/apiException.mustache | 10 +- .../JavaSpring/apiOriginFilter.mustache | 32 +++--- .../JavaSpring/apiResponseMessage.mustache | 108 +++++++++--------- .../spring-boot/homeController.mustache | 10 +- .../spring-boot/swagger2SpringBoot.mustache | 32 +++--- .../JavaSpring/notFoundException.mustache | 10 +- .../java/io/swagger/api/ApiException.java | 10 +- .../java/io/swagger/api/ApiOriginFilter.java | 32 +++--- .../io/swagger/api/ApiResponseMessage.java | 108 +++++++++--------- .../io/swagger/api/NotFoundException.java | 10 +- .../java/io/swagger/api/ApiException.java | 10 +- .../java/io/swagger/api/ApiOriginFilter.java | 32 +++--- .../io/swagger/api/ApiResponseMessage.java | 108 +++++++++--------- .../io/swagger/api/NotFoundException.java | 10 +- .../java/io/swagger/Swagger2SpringBoot.java | 32 +++--- .../java/io/swagger/api/ApiException.java | 10 +- .../java/io/swagger/api/ApiOriginFilter.java | 32 +++--- .../io/swagger/api/ApiResponseMessage.java | 108 +++++++++--------- .../io/swagger/api/NotFoundException.java | 10 +- .../swagger/configuration/HomeController.java | 10 +- .../java/io/swagger/Swagger2SpringBoot.java | 32 +++--- .../java/io/swagger/api/ApiException.java | 10 +- .../java/io/swagger/api/ApiOriginFilter.java | 32 +++--- .../io/swagger/api/ApiResponseMessage.java | 108 +++++++++--------- .../io/swagger/api/NotFoundException.java | 10 +- .../swagger/configuration/HomeController.java | 10 +- .../java/io/swagger/Swagger2SpringBoot.java | 32 +++--- .../java/io/swagger/api/ApiException.java | 10 +- .../java/io/swagger/api/ApiOriginFilter.java | 32 +++--- .../io/swagger/api/ApiResponseMessage.java | 108 +++++++++--------- .../io/swagger/api/NotFoundException.java | 10 +- .../swagger/configuration/HomeController.java | 10 +- .../java/io/swagger/Swagger2SpringBoot.java | 32 +++--- .../java/io/swagger/api/ApiException.java | 10 +- .../java/io/swagger/api/ApiOriginFilter.java | 32 +++--- .../io/swagger/api/ApiResponseMessage.java | 108 +++++++++--------- .../io/swagger/api/NotFoundException.java | 10 +- .../swagger/configuration/HomeController.java | 10 +- 38 files changed, 665 insertions(+), 665 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/apiException.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/apiException.mustache index 11b4036b832..f6161147700 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpring/apiException.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpring/apiException.mustache @@ -2,9 +2,9 @@ package {{apiPackage}}; {{>generatedAnnotation}} public class ApiException extends Exception{ - private int code; - public ApiException (int code, String msg) { - super(msg); - this.code = code; - } + private int code; + public ApiException (int code, String msg) { + super(msg); + this.code = code; + } } diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/apiOriginFilter.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/apiOriginFilter.mustache index 5db3301b3d9..5cf72a7dc42 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpring/apiOriginFilter.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpring/apiOriginFilter.mustache @@ -7,21 +7,21 @@ import javax.servlet.http.HttpServletResponse; {{>generatedAnnotation}} public class ApiOriginFilter implements javax.servlet.Filter { - @Override - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) throws IOException, ServletException { - HttpServletResponse res = (HttpServletResponse) response; - res.addHeader("Access-Control-Allow-Origin", "*"); - res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); - res.addHeader("Access-Control-Allow-Headers", "Content-Type"); - chain.doFilter(request, response); - } + @Override + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { + HttpServletResponse res = (HttpServletResponse) response; + res.addHeader("Access-Control-Allow-Origin", "*"); + res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); + res.addHeader("Access-Control-Allow-Headers", "Content-Type"); + chain.doFilter(request, response); + } - @Override - public void destroy() { - } + @Override + public void destroy() { + } - @Override - public void init(FilterConfig filterConfig) throws ServletException { - } -} \ No newline at end of file + @Override + public void init(FilterConfig filterConfig) throws ServletException { + } +} diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/apiResponseMessage.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/apiResponseMessage.mustache index 579e57a1524..17b155f3b69 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpring/apiResponseMessage.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpring/apiResponseMessage.mustache @@ -5,65 +5,65 @@ import javax.xml.bind.annotation.XmlTransient; {{>generatedAnnotation}} @javax.xml.bind.annotation.XmlRootElement public class ApiResponseMessage { - public static final int ERROR = 1; - public static final int WARNING = 2; - public static final int INFO = 3; - public static final int OK = 4; - public static final int TOO_BUSY = 5; + public static final int ERROR = 1; + public static final int WARNING = 2; + public static final int INFO = 3; + public static final int OK = 4; + public static final int TOO_BUSY = 5; - int code; - String type; - String message; - - public ApiResponseMessage(){} - - public ApiResponseMessage(int code, String message){ - this.code = code; - switch(code){ - case ERROR: - setType("error"); - break; - case WARNING: - setType("warning"); - break; - case INFO: - setType("info"); - break; - case OK: - setType("ok"); - break; - case TOO_BUSY: - setType("too busy"); - break; - default: - setType("unknown"); - break; - } - this.message = message; - } + int code; + String type; + String message; - @XmlTransient - public int getCode() { - return code; - } + public ApiResponseMessage(){} - public void setCode(int code) { - this.code = code; - } + public ApiResponseMessage(int code, String message){ + this.code = code; + switch(code){ + case ERROR: + setType("error"); + break; + case WARNING: + setType("warning"); + break; + case INFO: + setType("info"); + break; + case OK: + setType("ok"); + break; + case TOO_BUSY: + setType("too busy"); + break; + default: + setType("unknown"); + break; + } + this.message = message; + } - public String getType() { - return type; - } + @XmlTransient + public int getCode() { + return code; + } - public void setType(String type) { - this.type = type; - } + public void setCode(int code) { + this.code = code; + } - public String getMessage() { - return message; - } + public String getType() { + return type; + } - public void setMessage(String message) { - this.message = message; - } + public void setType(String type) { + this.type = type; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } } diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/homeController.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/homeController.mustache index bc33ec134e8..91a07d5efb7 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/homeController.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/homeController.mustache @@ -8,9 +8,9 @@ import org.springframework.web.bind.annotation.RequestMapping; */ @Controller public class HomeController { - @RequestMapping(value = "/") - public String index() { - System.out.println("swagger-ui.html"); - return "redirect:swagger-ui.html"; - } + @RequestMapping(value = "/") + public String index() { + System.out.println("swagger-ui.html"); + return "redirect:swagger-ui.html"; + } } diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/swagger2SpringBoot.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/swagger2SpringBoot.mustache index 6d9f64d1a5a..100383b3cc6 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/swagger2SpringBoot.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/swagger2SpringBoot.mustache @@ -13,24 +13,24 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @ComponentScan(basePackages = "{{basePackage}}") public class Swagger2SpringBoot implements CommandLineRunner { - @Override - public void run(String... arg0) throws Exception { - if (arg0.length > 0 && arg0[0].equals("exitcode")) { - throw new ExitException(); - } - } + @Override + public void run(String... arg0) throws Exception { + if (arg0.length > 0 && arg0[0].equals("exitcode")) { + throw new ExitException(); + } + } - public static void main(String[] args) throws Exception { - new SpringApplication(Swagger2SpringBoot.class).run(args); - } + public static void main(String[] args) throws Exception { + new SpringApplication(Swagger2SpringBoot.class).run(args); + } - class ExitException extends RuntimeException implements ExitCodeGenerator { - private static final long serialVersionUID = 1L; + class ExitException extends RuntimeException implements ExitCodeGenerator { + private static final long serialVersionUID = 1L; - @Override - public int getExitCode() { - return 10; - } + @Override + public int getExitCode() { + return 10; + } - } + } } diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/notFoundException.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/notFoundException.mustache index 1bd5e207d7b..40c25c5ea5c 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpring/notFoundException.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpring/notFoundException.mustache @@ -2,9 +2,9 @@ package {{apiPackage}}; {{>generatedAnnotation}} public class NotFoundException extends ApiException { - private int code; - public NotFoundException (int code, String msg) { - super(code, msg); - this.code = code; - } + private int code; + public NotFoundException (int code, String msg) { + super(code, msg); + this.code = code; + } } diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiException.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiException.java index 7fa61c50d24..97e535d3c21 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiException.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiException.java @@ -2,9 +2,9 @@ package io.swagger.api; public class ApiException extends Exception{ - private int code; - public ApiException (int code, String msg) { - super(msg); - this.code = code; - } + private int code; + public ApiException (int code, String msg) { + super(msg); + this.code = code; + } } diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiOriginFilter.java index f0f62dc7206..62646761f5a 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiOriginFilter.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiOriginFilter.java @@ -7,21 +7,21 @@ import javax.servlet.http.HttpServletResponse; public class ApiOriginFilter implements javax.servlet.Filter { - @Override - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) throws IOException, ServletException { - HttpServletResponse res = (HttpServletResponse) response; - res.addHeader("Access-Control-Allow-Origin", "*"); - res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); - res.addHeader("Access-Control-Allow-Headers", "Content-Type"); - chain.doFilter(request, response); - } + @Override + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { + HttpServletResponse res = (HttpServletResponse) response; + res.addHeader("Access-Control-Allow-Origin", "*"); + res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); + res.addHeader("Access-Control-Allow-Headers", "Content-Type"); + chain.doFilter(request, response); + } - @Override - public void destroy() { - } + @Override + public void destroy() { + } - @Override - public void init(FilterConfig filterConfig) throws ServletException { - } -} \ No newline at end of file + @Override + public void init(FilterConfig filterConfig) throws ServletException { + } +} diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiResponseMessage.java index f03840f8e06..162678c57e3 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiResponseMessage.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/ApiResponseMessage.java @@ -5,65 +5,65 @@ import javax.xml.bind.annotation.XmlTransient; @javax.xml.bind.annotation.XmlRootElement public class ApiResponseMessage { - public static final int ERROR = 1; - public static final int WARNING = 2; - public static final int INFO = 3; - public static final int OK = 4; - public static final int TOO_BUSY = 5; + public static final int ERROR = 1; + public static final int WARNING = 2; + public static final int INFO = 3; + public static final int OK = 4; + public static final int TOO_BUSY = 5; - int code; - String type; - String message; - - public ApiResponseMessage(){} - - public ApiResponseMessage(int code, String message){ - this.code = code; - switch(code){ - case ERROR: - setType("error"); - break; - case WARNING: - setType("warning"); - break; - case INFO: - setType("info"); - break; - case OK: - setType("ok"); - break; - case TOO_BUSY: - setType("too busy"); - break; - default: - setType("unknown"); - break; - } - this.message = message; - } + int code; + String type; + String message; - @XmlTransient - public int getCode() { - return code; - } + public ApiResponseMessage(){} - public void setCode(int code) { - this.code = code; - } + public ApiResponseMessage(int code, String message){ + this.code = code; + switch(code){ + case ERROR: + setType("error"); + break; + case WARNING: + setType("warning"); + break; + case INFO: + setType("info"); + break; + case OK: + setType("ok"); + break; + case TOO_BUSY: + setType("too busy"); + break; + default: + setType("unknown"); + break; + } + this.message = message; + } - public String getType() { - return type; - } + @XmlTransient + public int getCode() { + return code; + } - public void setType(String type) { - this.type = type; - } + public void setCode(int code) { + this.code = code; + } - public String getMessage() { - return message; - } + public String getType() { + return type; + } - public void setMessage(String message) { - this.message = message; - } + public void setType(String type) { + this.type = type; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } } diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/NotFoundException.java index 295109d7fc4..b28b67ea4b2 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/NotFoundException.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/NotFoundException.java @@ -2,9 +2,9 @@ package io.swagger.api; public class NotFoundException extends ApiException { - private int code; - public NotFoundException (int code, String msg) { - super(code, msg); - this.code = code; - } + private int code; + public NotFoundException (int code, String msg) { + super(code, msg); + this.code = code; + } } diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiException.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiException.java index 7fa61c50d24..97e535d3c21 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiException.java +++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiException.java @@ -2,9 +2,9 @@ package io.swagger.api; public class ApiException extends Exception{ - private int code; - public ApiException (int code, String msg) { - super(msg); - this.code = code; - } + private int code; + public ApiException (int code, String msg) { + super(msg); + this.code = code; + } } diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiOriginFilter.java index f0f62dc7206..62646761f5a 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiOriginFilter.java +++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiOriginFilter.java @@ -7,21 +7,21 @@ import javax.servlet.http.HttpServletResponse; public class ApiOriginFilter implements javax.servlet.Filter { - @Override - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) throws IOException, ServletException { - HttpServletResponse res = (HttpServletResponse) response; - res.addHeader("Access-Control-Allow-Origin", "*"); - res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); - res.addHeader("Access-Control-Allow-Headers", "Content-Type"); - chain.doFilter(request, response); - } + @Override + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { + HttpServletResponse res = (HttpServletResponse) response; + res.addHeader("Access-Control-Allow-Origin", "*"); + res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); + res.addHeader("Access-Control-Allow-Headers", "Content-Type"); + chain.doFilter(request, response); + } - @Override - public void destroy() { - } + @Override + public void destroy() { + } - @Override - public void init(FilterConfig filterConfig) throws ServletException { - } -} \ No newline at end of file + @Override + public void init(FilterConfig filterConfig) throws ServletException { + } +} diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiResponseMessage.java index f03840f8e06..162678c57e3 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiResponseMessage.java +++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiResponseMessage.java @@ -5,65 +5,65 @@ import javax.xml.bind.annotation.XmlTransient; @javax.xml.bind.annotation.XmlRootElement public class ApiResponseMessage { - public static final int ERROR = 1; - public static final int WARNING = 2; - public static final int INFO = 3; - public static final int OK = 4; - public static final int TOO_BUSY = 5; + public static final int ERROR = 1; + public static final int WARNING = 2; + public static final int INFO = 3; + public static final int OK = 4; + public static final int TOO_BUSY = 5; - int code; - String type; - String message; - - public ApiResponseMessage(){} - - public ApiResponseMessage(int code, String message){ - this.code = code; - switch(code){ - case ERROR: - setType("error"); - break; - case WARNING: - setType("warning"); - break; - case INFO: - setType("info"); - break; - case OK: - setType("ok"); - break; - case TOO_BUSY: - setType("too busy"); - break; - default: - setType("unknown"); - break; - } - this.message = message; - } + int code; + String type; + String message; - @XmlTransient - public int getCode() { - return code; - } + public ApiResponseMessage(){} - public void setCode(int code) { - this.code = code; - } + public ApiResponseMessage(int code, String message){ + this.code = code; + switch(code){ + case ERROR: + setType("error"); + break; + case WARNING: + setType("warning"); + break; + case INFO: + setType("info"); + break; + case OK: + setType("ok"); + break; + case TOO_BUSY: + setType("too busy"); + break; + default: + setType("unknown"); + break; + } + this.message = message; + } - public String getType() { - return type; - } + @XmlTransient + public int getCode() { + return code; + } - public void setType(String type) { - this.type = type; - } + public void setCode(int code) { + this.code = code; + } - public String getMessage() { - return message; - } + public String getType() { + return type; + } - public void setMessage(String message) { - this.message = message; - } + public void setType(String type) { + this.type = type; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } } diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/NotFoundException.java index 295109d7fc4..b28b67ea4b2 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/NotFoundException.java +++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/NotFoundException.java @@ -2,9 +2,9 @@ package io.swagger.api; public class NotFoundException extends ApiException { - private int code; - public NotFoundException (int code, String msg) { - super(code, msg); - this.code = code; - } + private int code; + public NotFoundException (int code, String msg) { + super(code, msg); + this.code = code; + } } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/Swagger2SpringBoot.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/Swagger2SpringBoot.java index c06fbae3c7a..75d822f027e 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/Swagger2SpringBoot.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/Swagger2SpringBoot.java @@ -13,24 +13,24 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @ComponentScan(basePackages = "io.swagger") public class Swagger2SpringBoot implements CommandLineRunner { - @Override - public void run(String... arg0) throws Exception { - if (arg0.length > 0 && arg0[0].equals("exitcode")) { - throw new ExitException(); - } - } + @Override + public void run(String... arg0) throws Exception { + if (arg0.length > 0 && arg0[0].equals("exitcode")) { + throw new ExitException(); + } + } - public static void main(String[] args) throws Exception { - new SpringApplication(Swagger2SpringBoot.class).run(args); - } + public static void main(String[] args) throws Exception { + new SpringApplication(Swagger2SpringBoot.class).run(args); + } - class ExitException extends RuntimeException implements ExitCodeGenerator { - private static final long serialVersionUID = 1L; + class ExitException extends RuntimeException implements ExitCodeGenerator { + private static final long serialVersionUID = 1L; - @Override - public int getExitCode() { - return 10; - } + @Override + public int getExitCode() { + return 10; + } - } + } } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/ApiException.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/ApiException.java index 7fa61c50d24..97e535d3c21 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/ApiException.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/ApiException.java @@ -2,9 +2,9 @@ package io.swagger.api; public class ApiException extends Exception{ - private int code; - public ApiException (int code, String msg) { - super(msg); - this.code = code; - } + private int code; + public ApiException (int code, String msg) { + super(msg); + this.code = code; + } } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/ApiOriginFilter.java index f0f62dc7206..62646761f5a 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/ApiOriginFilter.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/ApiOriginFilter.java @@ -7,21 +7,21 @@ import javax.servlet.http.HttpServletResponse; public class ApiOriginFilter implements javax.servlet.Filter { - @Override - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) throws IOException, ServletException { - HttpServletResponse res = (HttpServletResponse) response; - res.addHeader("Access-Control-Allow-Origin", "*"); - res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); - res.addHeader("Access-Control-Allow-Headers", "Content-Type"); - chain.doFilter(request, response); - } + @Override + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { + HttpServletResponse res = (HttpServletResponse) response; + res.addHeader("Access-Control-Allow-Origin", "*"); + res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); + res.addHeader("Access-Control-Allow-Headers", "Content-Type"); + chain.doFilter(request, response); + } - @Override - public void destroy() { - } + @Override + public void destroy() { + } - @Override - public void init(FilterConfig filterConfig) throws ServletException { - } -} \ No newline at end of file + @Override + public void init(FilterConfig filterConfig) throws ServletException { + } +} diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/ApiResponseMessage.java index f03840f8e06..162678c57e3 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/ApiResponseMessage.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/ApiResponseMessage.java @@ -5,65 +5,65 @@ import javax.xml.bind.annotation.XmlTransient; @javax.xml.bind.annotation.XmlRootElement public class ApiResponseMessage { - public static final int ERROR = 1; - public static final int WARNING = 2; - public static final int INFO = 3; - public static final int OK = 4; - public static final int TOO_BUSY = 5; + public static final int ERROR = 1; + public static final int WARNING = 2; + public static final int INFO = 3; + public static final int OK = 4; + public static final int TOO_BUSY = 5; - int code; - String type; - String message; - - public ApiResponseMessage(){} - - public ApiResponseMessage(int code, String message){ - this.code = code; - switch(code){ - case ERROR: - setType("error"); - break; - case WARNING: - setType("warning"); - break; - case INFO: - setType("info"); - break; - case OK: - setType("ok"); - break; - case TOO_BUSY: - setType("too busy"); - break; - default: - setType("unknown"); - break; - } - this.message = message; - } + int code; + String type; + String message; - @XmlTransient - public int getCode() { - return code; - } + public ApiResponseMessage(){} - public void setCode(int code) { - this.code = code; - } + public ApiResponseMessage(int code, String message){ + this.code = code; + switch(code){ + case ERROR: + setType("error"); + break; + case WARNING: + setType("warning"); + break; + case INFO: + setType("info"); + break; + case OK: + setType("ok"); + break; + case TOO_BUSY: + setType("too busy"); + break; + default: + setType("unknown"); + break; + } + this.message = message; + } - public String getType() { - return type; - } + @XmlTransient + public int getCode() { + return code; + } - public void setType(String type) { - this.type = type; - } + public void setCode(int code) { + this.code = code; + } - public String getMessage() { - return message; - } + public String getType() { + return type; + } - public void setMessage(String message) { - this.message = message; - } + public void setType(String type) { + this.type = type; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/NotFoundException.java index 295109d7fc4..b28b67ea4b2 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/NotFoundException.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/api/NotFoundException.java @@ -2,9 +2,9 @@ package io.swagger.api; public class NotFoundException extends ApiException { - private int code; - public NotFoundException (int code, String msg) { - super(code, msg); - this.code = code; - } + private int code; + public NotFoundException (int code, String msg) { + super(code, msg); + this.code = code; + } } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/configuration/HomeController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/configuration/HomeController.java index d195523c1d3..f8328099284 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/configuration/HomeController.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/io/swagger/configuration/HomeController.java @@ -8,9 +8,9 @@ import org.springframework.web.bind.annotation.RequestMapping; */ @Controller public class HomeController { - @RequestMapping(value = "/") - public String index() { - System.out.println("swagger-ui.html"); - return "redirect:swagger-ui.html"; - } + @RequestMapping(value = "/") + public String index() { + System.out.println("swagger-ui.html"); + return "redirect:swagger-ui.html"; + } } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/Swagger2SpringBoot.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/Swagger2SpringBoot.java index c06fbae3c7a..75d822f027e 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/Swagger2SpringBoot.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/Swagger2SpringBoot.java @@ -13,24 +13,24 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @ComponentScan(basePackages = "io.swagger") public class Swagger2SpringBoot implements CommandLineRunner { - @Override - public void run(String... arg0) throws Exception { - if (arg0.length > 0 && arg0[0].equals("exitcode")) { - throw new ExitException(); - } - } + @Override + public void run(String... arg0) throws Exception { + if (arg0.length > 0 && arg0[0].equals("exitcode")) { + throw new ExitException(); + } + } - public static void main(String[] args) throws Exception { - new SpringApplication(Swagger2SpringBoot.class).run(args); - } + public static void main(String[] args) throws Exception { + new SpringApplication(Swagger2SpringBoot.class).run(args); + } - class ExitException extends RuntimeException implements ExitCodeGenerator { - private static final long serialVersionUID = 1L; + class ExitException extends RuntimeException implements ExitCodeGenerator { + private static final long serialVersionUID = 1L; - @Override - public int getExitCode() { - return 10; - } + @Override + public int getExitCode() { + return 10; + } - } + } } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/ApiException.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/ApiException.java index 7fa61c50d24..97e535d3c21 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/ApiException.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/ApiException.java @@ -2,9 +2,9 @@ package io.swagger.api; public class ApiException extends Exception{ - private int code; - public ApiException (int code, String msg) { - super(msg); - this.code = code; - } + private int code; + public ApiException (int code, String msg) { + super(msg); + this.code = code; + } } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/ApiOriginFilter.java index f0f62dc7206..62646761f5a 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/ApiOriginFilter.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/ApiOriginFilter.java @@ -7,21 +7,21 @@ import javax.servlet.http.HttpServletResponse; public class ApiOriginFilter implements javax.servlet.Filter { - @Override - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) throws IOException, ServletException { - HttpServletResponse res = (HttpServletResponse) response; - res.addHeader("Access-Control-Allow-Origin", "*"); - res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); - res.addHeader("Access-Control-Allow-Headers", "Content-Type"); - chain.doFilter(request, response); - } + @Override + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { + HttpServletResponse res = (HttpServletResponse) response; + res.addHeader("Access-Control-Allow-Origin", "*"); + res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); + res.addHeader("Access-Control-Allow-Headers", "Content-Type"); + chain.doFilter(request, response); + } - @Override - public void destroy() { - } + @Override + public void destroy() { + } - @Override - public void init(FilterConfig filterConfig) throws ServletException { - } -} \ No newline at end of file + @Override + public void init(FilterConfig filterConfig) throws ServletException { + } +} diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/ApiResponseMessage.java index f03840f8e06..162678c57e3 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/ApiResponseMessage.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/ApiResponseMessage.java @@ -5,65 +5,65 @@ import javax.xml.bind.annotation.XmlTransient; @javax.xml.bind.annotation.XmlRootElement public class ApiResponseMessage { - public static final int ERROR = 1; - public static final int WARNING = 2; - public static final int INFO = 3; - public static final int OK = 4; - public static final int TOO_BUSY = 5; + public static final int ERROR = 1; + public static final int WARNING = 2; + public static final int INFO = 3; + public static final int OK = 4; + public static final int TOO_BUSY = 5; - int code; - String type; - String message; - - public ApiResponseMessage(){} - - public ApiResponseMessage(int code, String message){ - this.code = code; - switch(code){ - case ERROR: - setType("error"); - break; - case WARNING: - setType("warning"); - break; - case INFO: - setType("info"); - break; - case OK: - setType("ok"); - break; - case TOO_BUSY: - setType("too busy"); - break; - default: - setType("unknown"); - break; - } - this.message = message; - } + int code; + String type; + String message; - @XmlTransient - public int getCode() { - return code; - } + public ApiResponseMessage(){} - public void setCode(int code) { - this.code = code; - } + public ApiResponseMessage(int code, String message){ + this.code = code; + switch(code){ + case ERROR: + setType("error"); + break; + case WARNING: + setType("warning"); + break; + case INFO: + setType("info"); + break; + case OK: + setType("ok"); + break; + case TOO_BUSY: + setType("too busy"); + break; + default: + setType("unknown"); + break; + } + this.message = message; + } - public String getType() { - return type; - } + @XmlTransient + public int getCode() { + return code; + } - public void setType(String type) { - this.type = type; - } + public void setCode(int code) { + this.code = code; + } - public String getMessage() { - return message; - } + public String getType() { + return type; + } - public void setMessage(String message) { - this.message = message; - } + public void setType(String type) { + this.type = type; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/NotFoundException.java index 295109d7fc4..b28b67ea4b2 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/NotFoundException.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/api/NotFoundException.java @@ -2,9 +2,9 @@ package io.swagger.api; public class NotFoundException extends ApiException { - private int code; - public NotFoundException (int code, String msg) { - super(code, msg); - this.code = code; - } + private int code; + public NotFoundException (int code, String msg) { + super(code, msg); + this.code = code; + } } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/configuration/HomeController.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/configuration/HomeController.java index d195523c1d3..f8328099284 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/configuration/HomeController.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/io/swagger/configuration/HomeController.java @@ -8,9 +8,9 @@ import org.springframework.web.bind.annotation.RequestMapping; */ @Controller public class HomeController { - @RequestMapping(value = "/") - public String index() { - System.out.println("swagger-ui.html"); - return "redirect:swagger-ui.html"; - } + @RequestMapping(value = "/") + public String index() { + System.out.println("swagger-ui.html"); + return "redirect:swagger-ui.html"; + } } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/Swagger2SpringBoot.java b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/Swagger2SpringBoot.java index c06fbae3c7a..75d822f027e 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/Swagger2SpringBoot.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/Swagger2SpringBoot.java @@ -13,24 +13,24 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @ComponentScan(basePackages = "io.swagger") public class Swagger2SpringBoot implements CommandLineRunner { - @Override - public void run(String... arg0) throws Exception { - if (arg0.length > 0 && arg0[0].equals("exitcode")) { - throw new ExitException(); - } - } + @Override + public void run(String... arg0) throws Exception { + if (arg0.length > 0 && arg0[0].equals("exitcode")) { + throw new ExitException(); + } + } - public static void main(String[] args) throws Exception { - new SpringApplication(Swagger2SpringBoot.class).run(args); - } + public static void main(String[] args) throws Exception { + new SpringApplication(Swagger2SpringBoot.class).run(args); + } - class ExitException extends RuntimeException implements ExitCodeGenerator { - private static final long serialVersionUID = 1L; + class ExitException extends RuntimeException implements ExitCodeGenerator { + private static final long serialVersionUID = 1L; - @Override - public int getExitCode() { - return 10; - } + @Override + public int getExitCode() { + return 10; + } - } + } } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/ApiException.java b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/ApiException.java index 7fa61c50d24..97e535d3c21 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/ApiException.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/ApiException.java @@ -2,9 +2,9 @@ package io.swagger.api; public class ApiException extends Exception{ - private int code; - public ApiException (int code, String msg) { - super(msg); - this.code = code; - } + private int code; + public ApiException (int code, String msg) { + super(msg); + this.code = code; + } } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/ApiOriginFilter.java index f0f62dc7206..62646761f5a 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/ApiOriginFilter.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/ApiOriginFilter.java @@ -7,21 +7,21 @@ import javax.servlet.http.HttpServletResponse; public class ApiOriginFilter implements javax.servlet.Filter { - @Override - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) throws IOException, ServletException { - HttpServletResponse res = (HttpServletResponse) response; - res.addHeader("Access-Control-Allow-Origin", "*"); - res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); - res.addHeader("Access-Control-Allow-Headers", "Content-Type"); - chain.doFilter(request, response); - } + @Override + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { + HttpServletResponse res = (HttpServletResponse) response; + res.addHeader("Access-Control-Allow-Origin", "*"); + res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); + res.addHeader("Access-Control-Allow-Headers", "Content-Type"); + chain.doFilter(request, response); + } - @Override - public void destroy() { - } + @Override + public void destroy() { + } - @Override - public void init(FilterConfig filterConfig) throws ServletException { - } -} \ No newline at end of file + @Override + public void init(FilterConfig filterConfig) throws ServletException { + } +} diff --git a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/ApiResponseMessage.java index f03840f8e06..162678c57e3 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/ApiResponseMessage.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/ApiResponseMessage.java @@ -5,65 +5,65 @@ import javax.xml.bind.annotation.XmlTransient; @javax.xml.bind.annotation.XmlRootElement public class ApiResponseMessage { - public static final int ERROR = 1; - public static final int WARNING = 2; - public static final int INFO = 3; - public static final int OK = 4; - public static final int TOO_BUSY = 5; + public static final int ERROR = 1; + public static final int WARNING = 2; + public static final int INFO = 3; + public static final int OK = 4; + public static final int TOO_BUSY = 5; - int code; - String type; - String message; - - public ApiResponseMessage(){} - - public ApiResponseMessage(int code, String message){ - this.code = code; - switch(code){ - case ERROR: - setType("error"); - break; - case WARNING: - setType("warning"); - break; - case INFO: - setType("info"); - break; - case OK: - setType("ok"); - break; - case TOO_BUSY: - setType("too busy"); - break; - default: - setType("unknown"); - break; - } - this.message = message; - } + int code; + String type; + String message; - @XmlTransient - public int getCode() { - return code; - } + public ApiResponseMessage(){} - public void setCode(int code) { - this.code = code; - } + public ApiResponseMessage(int code, String message){ + this.code = code; + switch(code){ + case ERROR: + setType("error"); + break; + case WARNING: + setType("warning"); + break; + case INFO: + setType("info"); + break; + case OK: + setType("ok"); + break; + case TOO_BUSY: + setType("too busy"); + break; + default: + setType("unknown"); + break; + } + this.message = message; + } - public String getType() { - return type; - } + @XmlTransient + public int getCode() { + return code; + } - public void setType(String type) { - this.type = type; - } + public void setCode(int code) { + this.code = code; + } - public String getMessage() { - return message; - } + public String getType() { + return type; + } - public void setMessage(String message) { - this.message = message; - } + public void setType(String type) { + this.type = type; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/NotFoundException.java index 295109d7fc4..b28b67ea4b2 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/NotFoundException.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/api/NotFoundException.java @@ -2,9 +2,9 @@ package io.swagger.api; public class NotFoundException extends ApiException { - private int code; - public NotFoundException (int code, String msg) { - super(code, msg); - this.code = code; - } + private int code; + public NotFoundException (int code, String msg) { + super(code, msg); + this.code = code; + } } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/configuration/HomeController.java b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/configuration/HomeController.java index d195523c1d3..f8328099284 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/configuration/HomeController.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/io/swagger/configuration/HomeController.java @@ -8,9 +8,9 @@ import org.springframework.web.bind.annotation.RequestMapping; */ @Controller public class HomeController { - @RequestMapping(value = "/") - public String index() { - System.out.println("swagger-ui.html"); - return "redirect:swagger-ui.html"; - } + @RequestMapping(value = "/") + public String index() { + System.out.println("swagger-ui.html"); + return "redirect:swagger-ui.html"; + } } diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/Swagger2SpringBoot.java b/samples/server/petstore/springboot/src/main/java/io/swagger/Swagger2SpringBoot.java index c06fbae3c7a..75d822f027e 100644 --- a/samples/server/petstore/springboot/src/main/java/io/swagger/Swagger2SpringBoot.java +++ b/samples/server/petstore/springboot/src/main/java/io/swagger/Swagger2SpringBoot.java @@ -13,24 +13,24 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @ComponentScan(basePackages = "io.swagger") public class Swagger2SpringBoot implements CommandLineRunner { - @Override - public void run(String... arg0) throws Exception { - if (arg0.length > 0 && arg0[0].equals("exitcode")) { - throw new ExitException(); - } - } + @Override + public void run(String... arg0) throws Exception { + if (arg0.length > 0 && arg0[0].equals("exitcode")) { + throw new ExitException(); + } + } - public static void main(String[] args) throws Exception { - new SpringApplication(Swagger2SpringBoot.class).run(args); - } + public static void main(String[] args) throws Exception { + new SpringApplication(Swagger2SpringBoot.class).run(args); + } - class ExitException extends RuntimeException implements ExitCodeGenerator { - private static final long serialVersionUID = 1L; + class ExitException extends RuntimeException implements ExitCodeGenerator { + private static final long serialVersionUID = 1L; - @Override - public int getExitCode() { - return 10; - } + @Override + public int getExitCode() { + return 10; + } - } + } } diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiException.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiException.java index 7fa61c50d24..97e535d3c21 100644 --- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiException.java +++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiException.java @@ -2,9 +2,9 @@ package io.swagger.api; public class ApiException extends Exception{ - private int code; - public ApiException (int code, String msg) { - super(msg); - this.code = code; - } + private int code; + public ApiException (int code, String msg) { + super(msg); + this.code = code; + } } diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiOriginFilter.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiOriginFilter.java index f0f62dc7206..62646761f5a 100644 --- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiOriginFilter.java +++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiOriginFilter.java @@ -7,21 +7,21 @@ import javax.servlet.http.HttpServletResponse; public class ApiOriginFilter implements javax.servlet.Filter { - @Override - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) throws IOException, ServletException { - HttpServletResponse res = (HttpServletResponse) response; - res.addHeader("Access-Control-Allow-Origin", "*"); - res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); - res.addHeader("Access-Control-Allow-Headers", "Content-Type"); - chain.doFilter(request, response); - } + @Override + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { + HttpServletResponse res = (HttpServletResponse) response; + res.addHeader("Access-Control-Allow-Origin", "*"); + res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT"); + res.addHeader("Access-Control-Allow-Headers", "Content-Type"); + chain.doFilter(request, response); + } - @Override - public void destroy() { - } + @Override + public void destroy() { + } - @Override - public void init(FilterConfig filterConfig) throws ServletException { - } -} \ No newline at end of file + @Override + public void init(FilterConfig filterConfig) throws ServletException { + } +} diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiResponseMessage.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiResponseMessage.java index f03840f8e06..162678c57e3 100644 --- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiResponseMessage.java +++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/ApiResponseMessage.java @@ -5,65 +5,65 @@ import javax.xml.bind.annotation.XmlTransient; @javax.xml.bind.annotation.XmlRootElement public class ApiResponseMessage { - public static final int ERROR = 1; - public static final int WARNING = 2; - public static final int INFO = 3; - public static final int OK = 4; - public static final int TOO_BUSY = 5; + public static final int ERROR = 1; + public static final int WARNING = 2; + public static final int INFO = 3; + public static final int OK = 4; + public static final int TOO_BUSY = 5; - int code; - String type; - String message; - - public ApiResponseMessage(){} - - public ApiResponseMessage(int code, String message){ - this.code = code; - switch(code){ - case ERROR: - setType("error"); - break; - case WARNING: - setType("warning"); - break; - case INFO: - setType("info"); - break; - case OK: - setType("ok"); - break; - case TOO_BUSY: - setType("too busy"); - break; - default: - setType("unknown"); - break; - } - this.message = message; - } + int code; + String type; + String message; - @XmlTransient - public int getCode() { - return code; - } + public ApiResponseMessage(){} - public void setCode(int code) { - this.code = code; - } + public ApiResponseMessage(int code, String message){ + this.code = code; + switch(code){ + case ERROR: + setType("error"); + break; + case WARNING: + setType("warning"); + break; + case INFO: + setType("info"); + break; + case OK: + setType("ok"); + break; + case TOO_BUSY: + setType("too busy"); + break; + default: + setType("unknown"); + break; + } + this.message = message; + } - public String getType() { - return type; - } + @XmlTransient + public int getCode() { + return code; + } - public void setType(String type) { - this.type = type; - } + public void setCode(int code) { + this.code = code; + } - public String getMessage() { - return message; - } + public String getType() { + return type; + } - public void setMessage(String message) { - this.message = message; - } + public void setType(String type) { + this.type = type; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } } diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/api/NotFoundException.java b/samples/server/petstore/springboot/src/main/java/io/swagger/api/NotFoundException.java index 295109d7fc4..b28b67ea4b2 100644 --- a/samples/server/petstore/springboot/src/main/java/io/swagger/api/NotFoundException.java +++ b/samples/server/petstore/springboot/src/main/java/io/swagger/api/NotFoundException.java @@ -2,9 +2,9 @@ package io.swagger.api; public class NotFoundException extends ApiException { - private int code; - public NotFoundException (int code, String msg) { - super(code, msg); - this.code = code; - } + private int code; + public NotFoundException (int code, String msg) { + super(code, msg); + this.code = code; + } } diff --git a/samples/server/petstore/springboot/src/main/java/io/swagger/configuration/HomeController.java b/samples/server/petstore/springboot/src/main/java/io/swagger/configuration/HomeController.java index d195523c1d3..f8328099284 100644 --- a/samples/server/petstore/springboot/src/main/java/io/swagger/configuration/HomeController.java +++ b/samples/server/petstore/springboot/src/main/java/io/swagger/configuration/HomeController.java @@ -8,9 +8,9 @@ import org.springframework.web.bind.annotation.RequestMapping; */ @Controller public class HomeController { - @RequestMapping(value = "/") - public String index() { - System.out.println("swagger-ui.html"); - return "redirect:swagger-ui.html"; - } + @RequestMapping(value = "/") + public String index() { + System.out.println("swagger-ui.html"); + return "redirect:swagger-ui.html"; + } } From ca9fcd7db1201ac240c7cbcb4b5a715690351aea Mon Sep 17 00:00:00 2001 From: Mike Kistler Date: Thu, 13 Apr 2017 07:58:55 -0500 Subject: [PATCH 4/7] Fix copy method of CodegenParameter to copy isPrimitiveType (#5381) --- .../src/main/java/io/swagger/codegen/CodegenParameter.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java index e65c6ffe841..e151d4b1ee7 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java @@ -91,6 +91,7 @@ public class CodegenParameter { output.dataFormat = this.dataFormat; output.collectionFormat = this.collectionFormat; output.isCollectionFormatMulti = this.isCollectionFormatMulti; + output.isPrimitiveType = this.isPrimitiveType; output.description = this.description; output.unescapedDescription = this.unescapedDescription; output.baseType = this.baseType; From e2cd00f90529e94f22c39a44e1065007b3b9d127 Mon Sep 17 00:00:00 2001 From: hossamhossny Date: Sun, 16 Apr 2017 15:35:34 +0200 Subject: [PATCH 5/7] Update README.md (#5402) adding company. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9ae8c0feb48..31cfbf02651 100644 --- a/README.md +++ b/README.md @@ -796,6 +796,7 @@ Here are some companies/projects using Swagger Codegen in production. To add you - [Svenska Spel AB](https://www.svenskaspel.se/) - [TaskData](http://www.taskdata.com/) - [ThoughtWorks](https://www.thoughtworks.com) +- [Trexle](https://trexle.com/) - [Upwork](http://upwork.com/) - [uShip](https://www.uship.com/) - [VMware](https://vmware.com/) From e858f2390bd39effe5987ca87112b3b1295670a8 Mon Sep 17 00:00:00 2001 From: Tino Fuhrmann Date: Mon, 17 Apr 2017 16:43:33 +0200 Subject: [PATCH 6/7] [TypeScript] fix class filename in import/export (#5396) * Fixed classFilename in typescript-angular and recreated samples * Changed classname to classFilename in ts-angular2/models.mustache Also recreated ts-angular2 sample --- .../src/main/resources/typescript-angular/apis.mustache | 6 +++--- .../src/main/resources/typescript-angular/models.mustache | 2 +- .../main/resources/typescript-angular2/models.mustache | 2 +- .../petstore-security-test/typescript-angular/api/api.ts | 4 ++-- samples/client/petstore/typescript-angular/api/api.ts | 8 ++++---- samples/client/petstore/typescript-angular2/npm/README.md | 4 ++-- .../client/petstore/typescript-angular2/npm/package.json | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular/apis.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular/apis.mustache index 85522cf6c58..fc1bce9ae8d 100644 --- a/modules/swagger-codegen/src/main/resources/typescript-angular/apis.mustache +++ b/modules/swagger-codegen/src/main/resources/typescript-angular/apis.mustache @@ -1,9 +1,9 @@ {{#apiInfo}} {{#apis}} {{#operations}} -export * from './{{ classname }}'; -import { {{ classname }} } from './{{ classname }}'; +export * from './{{ classFilename }}'; +import { {{ classname }} } from './{{ classFilename }}'; {{/operations}} {{/apis}} -export const APIS = [ {{#apis}}{{#operations}}{{ classname }}, {{/operations}}{{/apis}}]; +export const APIS = [{{#apis}}{{#operations}}{{ classname }}, {{/operations}}{{/apis}}]; {{/apiInfo}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular/models.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular/models.mustache index ace053bd55b..02a39c248c4 100644 --- a/modules/swagger-codegen/src/main/resources/typescript-angular/models.mustache +++ b/modules/swagger-codegen/src/main/resources/typescript-angular/models.mustache @@ -1,5 +1,5 @@ {{#models}} {{#model}} -export * from './{{{ classname }}}'; +export * from './{{{ classFilename }}}'; {{/model}} {{/models}} diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular2/models.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular2/models.mustache index ace053bd55b..02a39c248c4 100644 --- a/modules/swagger-codegen/src/main/resources/typescript-angular2/models.mustache +++ b/modules/swagger-codegen/src/main/resources/typescript-angular2/models.mustache @@ -1,5 +1,5 @@ {{#models}} {{#model}} -export * from './{{{ classname }}}'; +export * from './{{{ classFilename }}}'; {{/model}} {{/models}} diff --git a/samples/client/petstore-security-test/typescript-angular/api/api.ts b/samples/client/petstore-security-test/typescript-angular/api/api.ts index 940c85b890d..c8fc0cc936d 100644 --- a/samples/client/petstore-security-test/typescript-angular/api/api.ts +++ b/samples/client/petstore-security-test/typescript-angular/api/api.ts @@ -1,3 +1,3 @@ export * from './FakeApi'; -import { FakeApi } from './FakeApi'; -export const APIS = [ FakeApi, ]; +import { FakeApi } from './FakeApi'; +export const APIS = [FakeApi, ]; diff --git a/samples/client/petstore/typescript-angular/api/api.ts b/samples/client/petstore/typescript-angular/api/api.ts index 0d1e9f047fd..02423026327 100644 --- a/samples/client/petstore/typescript-angular/api/api.ts +++ b/samples/client/petstore/typescript-angular/api/api.ts @@ -1,7 +1,7 @@ export * from './PetApi'; -import { PetApi } from './PetApi'; +import { PetApi } from './PetApi'; export * from './StoreApi'; -import { StoreApi } from './StoreApi'; +import { StoreApi } from './StoreApi'; export * from './UserApi'; -import { UserApi } from './UserApi'; -export const APIS = [ PetApi, StoreApi, UserApi, ]; +import { UserApi } from './UserApi'; +export const APIS = [PetApi, StoreApi, UserApi, ]; diff --git a/samples/client/petstore/typescript-angular2/npm/README.md b/samples/client/petstore/typescript-angular2/npm/README.md index 9bfa85dc2ec..dc87504299b 100644 --- a/samples/client/petstore/typescript-angular2/npm/README.md +++ b/samples/client/petstore/typescript-angular2/npm/README.md @@ -1,4 +1,4 @@ -## @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201703211709 +## @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201704132011 ### Building @@ -19,7 +19,7 @@ navigate to the folder of your consuming project and run one of next commando's. _published:_ ``` -npm install @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201703211709 --save +npm install @swagger/angular2-typescript-petstore@0.0.1-SNAPSHOT.201704132011 --save ``` _unPublished (not recommended):_ diff --git a/samples/client/petstore/typescript-angular2/npm/package.json b/samples/client/petstore/typescript-angular2/npm/package.json index ae0d67dbafa..b4ea8a079bc 100644 --- a/samples/client/petstore/typescript-angular2/npm/package.json +++ b/samples/client/petstore/typescript-angular2/npm/package.json @@ -1,6 +1,6 @@ { "name": "@swagger/angular2-typescript-petstore", - "version": "0.0.1-SNAPSHOT.201703211709", + "version": "0.0.1-SNAPSHOT.201704132011", "description": "swagger client for @swagger/angular2-typescript-petstore", "author": "Swagger Codegen Contributors", "keywords": [ From fd289ac6de828be1b36631c99e489c6990549b14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9langer?= Date: Mon, 17 Apr 2017 10:47:21 -0400 Subject: [PATCH 7/7] [JavaSpring] add support for map minProperties and maxProperties bean validation (#5395) --- .../src/main/java/io/swagger/codegen/DefaultCodegen.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index e684a94e375..a67cd98cfdc 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -1739,12 +1739,16 @@ public class DefaultCodegen { CodegenProperty cp = fromProperty(property.name, ap.getItems()); updatePropertyForArray(property, cp); } else if (p instanceof MapProperty) { + MapProperty ap = (MapProperty) p; + property.isContainer = true; property.isMapContainer = true; property.containerType = "map"; property.baseType = getSwaggerType(p); + property.minItems = ap.getMinProperties(); + property.maxItems = ap.getMaxProperties(); + // handle inner property - MapProperty ap = (MapProperty) p; CodegenProperty cp = fromProperty("inner", ap.getAdditionalProperties()); updatePropertyForMap(property, cp); } else {