From 4f404a794d0647844357ca4ee2e6c6b104bffd75 Mon Sep 17 00:00:00 2001 From: wing328 Date: Wed, 28 Jun 2017 18:05:53 +0800 Subject: [PATCH 01/20] add stkrwork as the owner of apache2 template --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 9120cf48c3..75932bcc3a 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ This is the swagger codegen project, which allows generation of API client libra - **API clients**: **ActionScript**, **Apex**, **Bash**, **C#** (.net 2.0, 4.0 or later), **C++** (cpprest, Qt5, Tizen), **Clojure**, **Dart**, **Elixir**, **Go**, **Groovy**, **Haskell**, **Java** (Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign), **Kotlin**, **Node.js** (ES5, ES6, AngularJS with Google Closure Compiler annotations) **Objective-C**, **Perl**, **PHP**, **PowerShell**, **Python**, **Ruby**, **Scala**, **Swift** (2.x, 3.x), **Typescript** (Angular1.x, Angular2.x, Fetch, jQuery, Node) - **Server stubs**: **C#** (ASP.NET Core, NancyFx), **C++** (Pistache, Restbed), **Erlang**, **Go**, **Haskell**, **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, RestEasy, Play Framework), **PHP** (Lumen, Slim, Silex, [Zend Expressive](https://github.com/zendframework/zend-expressive)), **Python** (Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Scala** ([Finch](https://github.com/finagle/finch), Scalatra) - **API documentation generators**: **HTML**, **Confluence Wiki** +- **Configuration files**: [**Apache2**](https://httpd.apache.org/) - **Others**: **JMeter** Check out [OpenAPI-Spec](https://github.com/OAI/OpenAPI-Specification) for additional information about the OpenAPI project. @@ -968,6 +969,8 @@ Here is a list of template creators: * Documentation * HTML Doc 2: @jhitchcock * Confluence Wiki: @jhitchcock + * Configuration + * Apache2: @stkrwork ## How to join the core team From cbd7301f9c9db316f05017dad302865740aec31b Mon Sep 17 00:00:00 2001 From: Bernd Date: Wed, 28 Jun 2017 16:28:16 +0200 Subject: [PATCH 02/20] Update README.md (#5942) Added Leanix as Company using swagger codegen --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 75932bcc3a..4cc3194646 100644 --- a/README.md +++ b/README.md @@ -776,6 +776,7 @@ Here are some companies/projects using Swagger Codegen in production. To add you - [Kubernetes](https://kubernetes.io/) - [LANDR Audio](https://www.landr.com/) - [Lascaux](http://www.lascaux.it/) +- [Leanix](http://www.leanix.net/) - [Leica Geosystems AG](http://leica-geosystems.com) - [LiveAgent](https://www.ladesk.com/) - [LXL Tech](http://lxltech.com) From e3da4f9fdee945ba269c43c6e8a730e00c0a0d6d Mon Sep 17 00:00:00 2001 From: Dennis Kieselhorst Date: Wed, 28 Jun 2017 18:14:16 +0200 Subject: [PATCH 03/20] updated maven-war-plugin (#5941) --- .../src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache | 4 ++-- .../src/main/resources/JavaJaxRS/cxf/server/pom.mustache | 2 +- .../main/resources/JavaJaxRS/libraries/jersey1/pom.mustache | 2 +- .../swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache | 2 +- .../src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache | 2 +- .../src/main/resources/JavaJaxRS/resteasy/pom.mustache | 2 +- .../src/main/resources/JavaJaxRS/spec/pom.mustache | 2 +- .../resources/JavaSpring/libraries/spring-mvc/pom.mustache | 2 +- modules/swagger-generator/pom.xml | 2 +- samples/client/petstore/jaxrs-cxf-client/pom.xml | 2 +- samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml | 2 +- samples/server/petstore/jaxrs-cxf-cdi/pom.xml | 4 ++-- samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml | 2 +- samples/server/petstore/jaxrs-cxf/pom.xml | 2 +- samples/server/petstore/jaxrs-resteasy/default/pom.xml | 2 +- samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml | 2 +- samples/server/petstore/jaxrs-resteasy/eap/pom.xml | 2 +- samples/server/petstore/jaxrs-resteasy/joda/pom.xml | 2 +- samples/server/petstore/jaxrs-spec/pom.xml | 4 ++-- samples/server/petstore/jaxrs/jersey1/pom.xml | 2 +- samples/server/petstore/jaxrs/jersey2/pom.xml | 2 +- samples/server/petstore/spring-mvc-j8-async/pom.xml | 2 +- samples/server/petstore/spring-mvc/pom.xml | 2 +- 23 files changed, 26 insertions(+), 26 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache index eba993f83f..78bea69ca7 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache @@ -35,7 +35,7 @@ maven-war-plugin - 3.0.0 + 3.1.0 false @@ -89,4 +89,4 @@ - \ No newline at end of file + diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache index 2ce6819314..853a2d9fb1 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache @@ -80,7 +80,7 @@ maven-war-plugin - 2.1.1 + 3.1.0 false diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache index bf58a208a1..bc09c88cd5 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache @@ -11,7 +11,7 @@ org.apache.maven.plugins maven-war-plugin - 2.1.1 + 3.1.0 maven-failsafe-plugin diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache index b0f5c23bb0..f56cb7c07a 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache @@ -20,7 +20,7 @@ org.apache.maven.plugins maven-war-plugin - 2.1.1 + 3.1.0 maven-failsafe-plugin diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache index 3f855bd2ed..ce77499a93 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache @@ -12,7 +12,7 @@ org.apache.maven.plugins maven-war-plugin - 2.1.1 + 3.1.0 maven-failsafe-plugin diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache index eba7922cb2..7d37136fbd 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache @@ -12,7 +12,7 @@ org.apache.maven.plugins maven-war-plugin - 2.1.1 + 3.1.0 maven-failsafe-plugin diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/pom.mustache index b44736af05..e469fdd90a 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/pom.mustache @@ -11,7 +11,7 @@ org.apache.maven.plugins maven-war-plugin - 2.6 + 3.1.0 false diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache index b47d3fdfa0..7b0e1c03ce 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache @@ -11,7 +11,7 @@ org.apache.maven.plugins maven-war-plugin - 2.6 + 3.1.0 maven-failsafe-plugin diff --git a/modules/swagger-generator/pom.xml b/modules/swagger-generator/pom.xml index 28bceacbca..83731f64b6 100644 --- a/modules/swagger-generator/pom.xml +++ b/modules/swagger-generator/pom.xml @@ -40,7 +40,7 @@ org.apache.maven.plugins maven-war-plugin - 2.1.1 + 3.1.0 diff --git a/samples/client/petstore/jaxrs-cxf-client/pom.xml b/samples/client/petstore/jaxrs-cxf-client/pom.xml index 52d8bf6b2d..db63343901 100644 --- a/samples/client/petstore/jaxrs-cxf-client/pom.xml +++ b/samples/client/petstore/jaxrs-cxf-client/pom.xml @@ -80,7 +80,7 @@ maven-war-plugin - 2.1.1 + 3.1.0 false diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml index f3298241e0..c3ae69708e 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml @@ -80,7 +80,7 @@ maven-war-plugin - 2.1.1 + 3.1.0 false diff --git a/samples/server/petstore/jaxrs-cxf-cdi/pom.xml b/samples/server/petstore/jaxrs-cxf-cdi/pom.xml index 0b12e6bd4a..b35e29c025 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/pom.xml +++ b/samples/server/petstore/jaxrs-cxf-cdi/pom.xml @@ -35,7 +35,7 @@ maven-war-plugin - 3.0.0 + 3.1.0 false @@ -87,4 +87,4 @@ - \ No newline at end of file + diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml index cc8445afcc..1ba9a2d971 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml @@ -80,7 +80,7 @@ maven-war-plugin - 2.1.1 + 3.1.0 false diff --git a/samples/server/petstore/jaxrs-cxf/pom.xml b/samples/server/petstore/jaxrs-cxf/pom.xml index 57f8376784..d65c71a3dd 100644 --- a/samples/server/petstore/jaxrs-cxf/pom.xml +++ b/samples/server/petstore/jaxrs-cxf/pom.xml @@ -80,7 +80,7 @@ maven-war-plugin - 2.1.1 + 3.1.0 false diff --git a/samples/server/petstore/jaxrs-resteasy/default/pom.xml b/samples/server/petstore/jaxrs-resteasy/default/pom.xml index fb583c63f2..9885d91b04 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/default/pom.xml @@ -12,7 +12,7 @@ org.apache.maven.plugins maven-war-plugin - 2.1.1 + 3.1.0 maven-failsafe-plugin diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml index 0155af16b2..c1da131b55 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml @@ -12,7 +12,7 @@ org.apache.maven.plugins maven-war-plugin - 2.1.1 + 3.1.0 maven-failsafe-plugin diff --git a/samples/server/petstore/jaxrs-resteasy/eap/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap/pom.xml index a760e1662e..d4f0bc7abc 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap/pom.xml @@ -12,7 +12,7 @@ org.apache.maven.plugins maven-war-plugin - 2.1.1 + 3.1.0 maven-failsafe-plugin diff --git a/samples/server/petstore/jaxrs-resteasy/joda/pom.xml b/samples/server/petstore/jaxrs-resteasy/joda/pom.xml index f9fef16164..dc17aeb40b 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/joda/pom.xml @@ -12,7 +12,7 @@ org.apache.maven.plugins maven-war-plugin - 2.1.1 + 3.1.0 maven-failsafe-plugin diff --git a/samples/server/petstore/jaxrs-spec/pom.xml b/samples/server/petstore/jaxrs-spec/pom.xml index 0c8ec37669..984515b616 100644 --- a/samples/server/petstore/jaxrs-spec/pom.xml +++ b/samples/server/petstore/jaxrs-spec/pom.xml @@ -11,7 +11,7 @@ org.apache.maven.plugins maven-war-plugin - 2.6 + 3.1.0 false @@ -80,4 +80,4 @@ 4.8.1 - \ No newline at end of file + diff --git a/samples/server/petstore/jaxrs/jersey1/pom.xml b/samples/server/petstore/jaxrs/jersey1/pom.xml index b151688976..4dee0ee422 100644 --- a/samples/server/petstore/jaxrs/jersey1/pom.xml +++ b/samples/server/petstore/jaxrs/jersey1/pom.xml @@ -11,7 +11,7 @@ org.apache.maven.plugins maven-war-plugin - 2.1.1 + 3.1.0 maven-failsafe-plugin diff --git a/samples/server/petstore/jaxrs/jersey2/pom.xml b/samples/server/petstore/jaxrs/jersey2/pom.xml index 287ab88322..0cfd796880 100644 --- a/samples/server/petstore/jaxrs/jersey2/pom.xml +++ b/samples/server/petstore/jaxrs/jersey2/pom.xml @@ -20,7 +20,7 @@ org.apache.maven.plugins maven-war-plugin - 2.1.1 + 3.1.0 maven-failsafe-plugin diff --git a/samples/server/petstore/spring-mvc-j8-async/pom.xml b/samples/server/petstore/spring-mvc-j8-async/pom.xml index 0b555d8bd1..8578de4484 100644 --- a/samples/server/petstore/spring-mvc-j8-async/pom.xml +++ b/samples/server/petstore/spring-mvc-j8-async/pom.xml @@ -11,7 +11,7 @@ org.apache.maven.plugins maven-war-plugin - 2.6 + 3.1.0 maven-failsafe-plugin diff --git a/samples/server/petstore/spring-mvc/pom.xml b/samples/server/petstore/spring-mvc/pom.xml index b94b4ddd2f..a1426c0e40 100644 --- a/samples/server/petstore/spring-mvc/pom.xml +++ b/samples/server/petstore/spring-mvc/pom.xml @@ -11,7 +11,7 @@ org.apache.maven.plugins maven-war-plugin - 2.6 + 3.1.0 maven-failsafe-plugin From eb6c6d069873d00314e0a72328bc3a337135d05b Mon Sep 17 00:00:00 2001 From: Dennis Kieselhorst Date: Wed, 28 Jun 2017 18:22:26 +0200 Subject: [PATCH 04/20] use enforcer-plugin to fix Maven warning (#5940) --- modules/swagger-codegen-maven-plugin/pom.xml | 3 +++ pom.xml | 23 +++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/modules/swagger-codegen-maven-plugin/pom.xml b/modules/swagger-codegen-maven-plugin/pom.xml index 994b6af88d..b2701b873b 100644 --- a/modules/swagger-codegen-maven-plugin/pom.xml +++ b/modules/swagger-codegen-maven-plugin/pom.xml @@ -13,6 +13,9 @@ swagger-codegen (maven-plugin) maven-plugin maven plugin to build modules from swagger codegen + + 3.2.5 + UTF-8 diff --git a/pom.xml b/pom.xml index df759a700c..fd79b514ad 100644 --- a/pom.xml +++ b/pom.xml @@ -16,9 +16,6 @@ scm:git:git@github.com:swagger-api/swagger-codegen.git https://github.com/swagger-api/swagger-codegen - - 2.2.0 - fehguy @@ -222,6 +219,26 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + 1.4.1 + + + enforce-versions + + enforce + + + + + 3.2.5 + + + + + + From a64c7d7986b5aa87e4b476267496722d10eb3095 Mon Sep 17 00:00:00 2001 From: Dennis Kieselhorst Date: Thu, 29 Jun 2017 04:56:12 +0200 Subject: [PATCH 05/20] updated jackson-version (#5943) --- modules/swagger-codegen-maven-plugin/examples/java-client.xml | 2 +- .../src/main/resources/Java/libraries/feign/pom.mustache | 2 +- .../src/main/resources/Java/libraries/resteasy/pom.mustache | 2 +- .../src/main/resources/JavaJaxRS/cxf/pom.mustache | 2 +- .../src/main/resources/JavaJaxRS/cxf/server/pom.mustache | 2 +- .../src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache | 2 +- .../swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache | 2 +- .../main/resources/JavaSpring/libraries/spring-mvc/pom.mustache | 2 +- modules/swagger-codegen/src/main/resources/scala/pom.mustache | 2 +- .../resources/2_0/templates/Java/libraries/jersey2/pom.mustache | 2 +- pom.xml | 2 +- pom.xml.circleci | 2 +- samples/client/petstore-security-test/scala/pom.xml | 2 +- samples/client/petstore/java/feign/pom.xml | 2 +- samples/client/petstore/java/resteasy/pom.xml | 2 +- samples/client/petstore/jaxrs-cxf-client/pom.xml | 2 +- samples/client/petstore/jaxrs-cxf/pom.xml | 2 +- samples/client/petstore/scala/pom.xml | 2 +- samples/server/petstore/jaxrs-cxf/pom.xml | 2 +- samples/server/petstore/jaxrs/jersey1/pom.xml | 2 +- samples/server/petstore/jaxrs/jersey2/pom.xml | 2 +- samples/server/petstore/spring-mvc-j8-async/pom.xml | 2 +- samples/server/petstore/spring-mvc/pom.xml | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/modules/swagger-codegen-maven-plugin/examples/java-client.xml b/modules/swagger-codegen-maven-plugin/examples/java-client.xml index d1ce8703bc..4ad322b060 100644 --- a/modules/swagger-codegen-maven-plugin/examples/java-client.xml +++ b/modules/swagger-codegen-maven-plugin/examples/java-client.xml @@ -120,7 +120,7 @@ 1.5.8 2.22.2 - 2.7.0 + 2.8.9 2.7 1.0.0 4.8.1 diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache index 98aaf18855..4f21294500 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache @@ -250,7 +250,7 @@ 1.5.15 9.4.0 2.1.0 - 2.8.7 + 2.8.9 4.12 1.0.0 1.0.1 diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/pom.mustache index ffea816e21..15ab95dee4 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/pom.mustache @@ -205,7 +205,7 @@ 1.5.15 3.1.3.Final - 2.7.5 + 2.8.9 {{^java8}} 2.9.9 {{/java8}} diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache index 039060d9c6..df7a5a3bcb 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache @@ -187,7 +187,7 @@ 1.1.0.Final {{/useBeanValidation}} 3.1.11 - 2.8.4 + 2.8.9 UTF-8 diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache index 853a2d9fb1..8fa5b8714c 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache @@ -244,7 +244,7 @@ 1.3.3.RELEASE {{/generateSpringBootApplication}} 3.1.11 - 2.8.4 + 2.8.9 UTF-8 diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache index bc09c88cd5..c813c3a9b8 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache @@ -194,7 +194,7 @@ 1.5.15 9.2.9.v20150224 1.19.1 - 2.8.7 + 2.8.9 1.7.21 4.12 2.5 diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache index f56cb7c07a..589b0501e8 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache @@ -191,7 +191,7 @@ 1.5.15 9.2.9.v20150224 2.22.2 - 2.8.7 + 2.8.9 {{#supportJava6}} 2.5 3.5 diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache index 7b0e1c03ce..2297d93acc 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache @@ -150,7 +150,7 @@ 4.12 2.5 2.4.0 - 2.4.5 + 2.8.9 4.2.5.RELEASE diff --git a/modules/swagger-codegen/src/main/resources/scala/pom.mustache b/modules/swagger-codegen/src/main/resources/scala/pom.mustache index 4d52c3ae2e..1c72f7d4fd 100644 --- a/modules/swagger-codegen/src/main/resources/scala/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/scala/pom.mustache @@ -218,7 +218,7 @@ 1.5.15 1.0.5 1.0.0 - 2.4.2 + 2.8.9 4.8.1 3.1.5 diff --git a/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache b/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache index a865adc3c1..e875fc26b3 100644 --- a/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache +++ b/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache @@ -275,7 +275,7 @@ 1.5.9 2.22.2 - 2.7.5 + 2.8.9 {{^java8}} 2.9.4 {{/java8}} diff --git a/pom.xml b/pom.xml index fd79b514ad..8604fe2da8 100644 --- a/pom.xml +++ b/pom.xml @@ -912,7 +912,7 @@ 2.4 1.2 4.8.1 - 2.8.5 + 2.8.9 1.0.0 3.4 1.7.12 diff --git a/pom.xml.circleci b/pom.xml.circleci index 2a76fe2722..8672fde85d 100644 --- a/pom.xml.circleci +++ b/pom.xml.circleci @@ -904,7 +904,7 @@ 2.4 1.2 4.8.1 - 2.8.5 + 2.8.9 1.0.0 3.4 1.7.12 diff --git a/samples/client/petstore-security-test/scala/pom.xml b/samples/client/petstore-security-test/scala/pom.xml index 53980f82fc..283256f248 100644 --- a/samples/client/petstore-security-test/scala/pom.xml +++ b/samples/client/petstore-security-test/scala/pom.xml @@ -218,7 +218,7 @@ 1.5.15 1.0.5 1.0.0 - 2.4.2 + 2.8.9 4.8.1 3.1.5 diff --git a/samples/client/petstore/java/feign/pom.xml b/samples/client/petstore/java/feign/pom.xml index 165ceec4c9..4aaadeba83 100644 --- a/samples/client/petstore/java/feign/pom.xml +++ b/samples/client/petstore/java/feign/pom.xml @@ -250,7 +250,7 @@ 1.5.15 9.4.0 2.1.0 - 2.8.7 + 2.8.9 4.12 1.0.0 1.0.1 diff --git a/samples/client/petstore/java/resteasy/pom.xml b/samples/client/petstore/java/resteasy/pom.xml index aba73d0ed9..0f7ee5a1d9 100644 --- a/samples/client/petstore/java/resteasy/pom.xml +++ b/samples/client/petstore/java/resteasy/pom.xml @@ -177,7 +177,7 @@ 1.5.15 3.1.3.Final - 2.7.5 + 2.8.9 2.9.9 1.0.0 4.12 diff --git a/samples/client/petstore/jaxrs-cxf-client/pom.xml b/samples/client/petstore/jaxrs-cxf-client/pom.xml index db63343901..0c5cec2310 100644 --- a/samples/client/petstore/jaxrs-cxf-client/pom.xml +++ b/samples/client/petstore/jaxrs-cxf-client/pom.xml @@ -191,7 +191,7 @@ 2.5 1.1.0.Final 3.1.11 - 2.8.4 + 2.8.9 UTF-8 diff --git a/samples/client/petstore/jaxrs-cxf/pom.xml b/samples/client/petstore/jaxrs-cxf/pom.xml index f85557041b..5e6f5059b8 100644 --- a/samples/client/petstore/jaxrs-cxf/pom.xml +++ b/samples/client/petstore/jaxrs-cxf/pom.xml @@ -168,7 +168,7 @@ 1.1.7 2.5 3.1.11 - 2.8.4 + 2.8.9 UTF-8 diff --git a/samples/client/petstore/scala/pom.xml b/samples/client/petstore/scala/pom.xml index 53980f82fc..283256f248 100644 --- a/samples/client/petstore/scala/pom.xml +++ b/samples/client/petstore/scala/pom.xml @@ -218,7 +218,7 @@ 1.5.15 1.0.5 1.0.0 - 2.4.2 + 2.8.9 4.8.1 3.1.5 diff --git a/samples/server/petstore/jaxrs-cxf/pom.xml b/samples/server/petstore/jaxrs-cxf/pom.xml index d65c71a3dd..3d7d56c851 100644 --- a/samples/server/petstore/jaxrs-cxf/pom.xml +++ b/samples/server/petstore/jaxrs-cxf/pom.xml @@ -191,7 +191,7 @@ 2.5 1.1.0.Final 3.1.11 - 2.8.4 + 2.8.9 UTF-8 diff --git a/samples/server/petstore/jaxrs/jersey1/pom.xml b/samples/server/petstore/jaxrs/jersey1/pom.xml index 4dee0ee422..efaa0edf24 100644 --- a/samples/server/petstore/jaxrs/jersey1/pom.xml +++ b/samples/server/petstore/jaxrs/jersey1/pom.xml @@ -192,7 +192,7 @@ 1.5.15 9.2.9.v20150224 1.19.1 - 2.8.7 + 2.8.9 1.7.21 4.12 2.5 diff --git a/samples/server/petstore/jaxrs/jersey2/pom.xml b/samples/server/petstore/jaxrs/jersey2/pom.xml index 0cfd796880..03d596436f 100644 --- a/samples/server/petstore/jaxrs/jersey2/pom.xml +++ b/samples/server/petstore/jaxrs/jersey2/pom.xml @@ -176,7 +176,7 @@ 1.5.15 9.2.9.v20150224 2.22.2 - 2.8.7 + 2.8.9 4.12 1.1.7 2.5 diff --git a/samples/server/petstore/spring-mvc-j8-async/pom.xml b/samples/server/petstore/spring-mvc-j8-async/pom.xml index 8578de4484..3c13f6cd26 100644 --- a/samples/server/petstore/spring-mvc-j8-async/pom.xml +++ b/samples/server/petstore/spring-mvc-j8-async/pom.xml @@ -134,7 +134,7 @@ 4.12 2.5 2.4.0 - 2.4.5 + 2.8.9 4.2.5.RELEASE diff --git a/samples/server/petstore/spring-mvc/pom.xml b/samples/server/petstore/spring-mvc/pom.xml index a1426c0e40..69fffcc592 100644 --- a/samples/server/petstore/spring-mvc/pom.xml +++ b/samples/server/petstore/spring-mvc/pom.xml @@ -139,7 +139,7 @@ 4.12 2.5 2.4.0 - 2.4.5 + 2.8.9 4.2.5.RELEASE From bced355191ab3c9f9b0383e0f9e6c67cda535a6a Mon Sep 17 00:00:00 2001 From: wing328 Date: Thu, 29 Jun 2017 13:01:40 +0800 Subject: [PATCH 06/20] better detection for unresolved merge conflicts --- .travis.yml | 9 ++++++--- bin/utils/detect_merge_conflict.sh | 17 +++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100755 bin/utils/detect_merge_conflict.sh diff --git a/.travis.yml b/.travis.yml index 5694414f3e..6196982e33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,19 +88,22 @@ script: - set -e # fail if templates/generators contain carriage return '\r' - /bin/bash ./bin/utils/detect_carriage_return.sh + # fail if generators contain merge conflicts + - /bin/bash ./bin/utils/detect_merge_conflict.sh # fail if generators contain tab '\t' - /bin/bash ./bin/utils/detect_tab_in_java_class.sh # run integration tests defined in maven pom.xml - mvn -q --batch-mode verify -Psamples +### docker-related tasks have been moved to CircleCI # docker: build generator image and push to Docker Hub #- if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build -t $DOCKER_GENERATOR_IMAGE_NAME ./modules/swagger-generator && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_GENERATOR_IMAGE_NAME:latest $DOCKER_GENERATOR_IMAGE_NAME:$TRAVIS_TAG; fi && if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "master" ]; then docker push $DOCKER_GENERATOR_IMAGE_NAME; fi; fi ## docker: build cli image and push to Docker Hub #- if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/swagger-codegen-cli && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest $DOCKER_CODEGEN_CLI_IMAGE_NAME:$TRAVIS_TAG; fi && if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "master" ]; then docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME; fi; fi - -env: - - DOCKER_GENERATOR_IMAGE_NAME=swaggerapi/swagger-generator DOCKER_CODEGEN_CLI_IMAGE_NAME=swaggerapi/swagger-codegen-cli +#env: +# - DOCKER_GENERATOR_IMAGE_NAME=swaggerapi/swagger-generator DOCKER_CODEGEN_CLI_IMAGE_NAME=swaggerapi/swagger-codegen-cli after_success: + # push a snapshot version to maven repo - if [ $SONATYPE_USERNAME ] && [ -z $TRAVIS_TAG ] && [ $TRAVIS_PULL_REQUEST == false ]; then mvn clean deploy --settings .travis/settings.xml; fi; diff --git a/bin/utils/detect_merge_conflict.sh b/bin/utils/detect_merge_conflict.sh new file mode 100755 index 0000000000..520c9d5c06 --- /dev/null +++ b/bin/utils/detect_merge_conflict.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# grep for '<<<<<<< HEAD' in swagger codegen +grep -RUIl '<<<<<<< HEAD' modules/swagger-codegen/src + +if [ $? -ne 1 ]; then + echo "modules/swagger-codegen/src contain merge conflicts '<<<<<<< HEAD'. Please remove it and try again." + exit 1; +fi + +# grep for '<<<<<<< HEAD' in the samples +grep -RUIl '<<<<<<< HEAD' samples/ + +if [ $? -ne 1 ]; then + echo "samples/ contain merge conflicts '<<<<<<< HEAD'. Please remove it and try again." + exit 1; +fi From 7b8055736331f4ca1dac487f69bdd2e7029d32b3 Mon Sep 17 00:00:00 2001 From: wing328 Date: Thu, 29 Jun 2017 13:22:26 +0800 Subject: [PATCH 07/20] fix file not found --- samples/client/petstore/dart/petstore/packages | 1 + 1 file changed, 1 insertion(+) create mode 100644 samples/client/petstore/dart/petstore/packages diff --git a/samples/client/petstore/dart/petstore/packages b/samples/client/petstore/dart/petstore/packages new file mode 100644 index 0000000000..a16c405015 --- /dev/null +++ b/samples/client/petstore/dart/petstore/packages @@ -0,0 +1 @@ +../packages \ No newline at end of file From b2efb7041001b94157e1f4af24037844c305e82e Mon Sep 17 00:00:00 2001 From: Jordan Zimmerman Date: Thu, 29 Jun 2017 00:23:44 -0500 Subject: [PATCH 08/20] Support a true "java8" option (#5864) * Closes #5863 The "dateLibrary" option for java, sadly, sets a mustache value "java8". This change updates this so that "java" in the mustache libraries means what it should mean - use all java8 classes. In this case, there's no need for the third party Base64 library as java8's JDK has this built in. In my view, the "dateLibrary" should be deprecated but that should be a separate PR. * updated samples * fixed tests for new CLI java8 * regenerated samples after master merge * oops - left in an end tag after master merge * rerun checks * rerun checks --- .../languages/AbstractJavaCodegen.java | 25 +++++- .../Java/auth/HttpBasicAuth.mustache | 13 +++ .../main/resources/Java/build.gradle.mustache | 2 +- .../libraries/jersey2/build.gradle.mustache | 2 +- .../Java/libraries/jersey2/pom.mustache | 3 +- .../libraries/resteasy/build.gradle.mustache | 2 +- .../libraries/resteasy/build.sbt.mustache | 2 +- .../Java/libraries/resteasy/pom.mustache | 3 +- .../src/main/resources/Java/pom.mustache | 2 +- .../codegen/java/JavaClientOptionsTest.java | 2 + .../options/JavaClientOptionsProvider.java | 1 + .../codegen/options/JavaOptionsProvider.java | 2 + .../options/JaxRSServerOptionsProvider.java | 2 + .../libraries/jersey2/build.gradle.mustache | 2 +- .../Java/libraries/jersey2/build.sbt.mustache | 2 +- .../Java/libraries/jersey2/pom.mustache | 3 +- .../java/okhttp-gson/build.gradle | 6 +- .../java/okhttp-gson/build.sbt | 6 +- .../java/okhttp-gson/pom.xml | 4 +- .../petstore/java/jersey2-java6/build.gradle | 12 +-- .../petstore/java/jersey2-java6/build.sbt | 20 ++--- .../petstore/java/jersey2-java6/pom.xml | 11 +-- .../java/io/swagger/client/ApiClient.java | 80 +++++++++---------- .../petstore/java/jersey2-java8/build.gradle | 7 +- .../petstore/java/jersey2-java8/build.sbt | 17 ++-- .../petstore/java/jersey2-java8/pom.xml | 12 +-- .../java/io/swagger/client/ApiClient.java | 80 +++++++++---------- .../io/swagger/client/auth/HttpBasicAuth.java | 10 +-- .../client/petstore/java/jersey2/build.gradle | 8 +- .../client/petstore/java/jersey2/build.sbt | 18 ++--- samples/client/petstore/java/jersey2/pom.xml | 9 ++- .../java/io/swagger/client/ApiClient.java | 80 +++++++++---------- samples/client/petstore/java/resteasy/pom.xml | 3 +- .../petstore/java/resttemplate/build.gradle | 8 +- .../client/petstore/java/resttemplate/pom.xml | 8 +- samples/client/petstore/java/retrofit/pom.xml | 4 +- .../java/retrofit2-play24/build.gradle | 6 +- .../petstore/java/retrofit2-play24/build.sbt | 10 +-- .../petstore/java/retrofit2-play24/pom.xml | 8 +- .../java-inflector/.swagger-codegen/VERSION | 2 +- .../io/swagger/controllers/StringUtil.java | 42 ++++++++++ .../swagger/controllers/FakeController.java | 69 ++++++++++++++++ .../io/swagger/controllers/PetController.java | 74 +++++++++++++++++ .../swagger/controllers/StoreController.java | 49 ++++++++++++ .../swagger/controllers/UserController.java | 73 +++++++++++++++++ .../src/main/swagger/swagger.yaml | 52 +++++++++++- .../java-msf4j/.swagger-codegen/VERSION | 2 +- .../.swagger-codegen/VERSION | 2 +- .../java-play-framework/public/swagger.json | 51 +++++++++++- .../undertow/.swagger-codegen/VERSION | 2 +- .../src/main/resources/config/swagger.json | 51 +++++++++++- 51 files changed, 707 insertions(+), 257 deletions(-) create mode 100644 samples/server/petstore/java-inflector/src/gen/java/io/swagger/controllers/StringUtil.java create mode 100644 samples/server/petstore/java-inflector/src/main/java/io/swagger/controllers/FakeController.java create mode 100644 samples/server/petstore/java-inflector/src/main/java/io/swagger/controllers/PetController.java create mode 100644 samples/server/petstore/java-inflector/src/main/java/io/swagger/controllers/StoreController.java create mode 100644 samples/server/petstore/java-inflector/src/main/java/io/swagger/controllers/UserController.java diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java index 36e575f832..19c7118470 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java @@ -45,8 +45,10 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code public static final String FULL_JAVA_UTIL = "fullJavaUtil"; public static final String DEFAULT_LIBRARY = ""; public static final String DATE_LIBRARY = "dateLibrary"; + public static final String JAVA8_MODE = "java8"; public static final String SUPPORT_JAVA6 = "supportJava6"; + protected boolean java8Mode = false; protected String dateLibrary = "joda"; protected String invokerPackage = "io.swagger"; protected String groupId = "io.swagger"; @@ -148,14 +150,20 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code CliOption dateLibrary = new CliOption(DATE_LIBRARY, "Option. Date library to use"); Map dateOptions = new HashMap(); - dateOptions.put("java8", "Java 8 native"); + dateOptions.put("java8", "Java 8 native - note: this also sets \"" + JAVA8_MODE + "\" to true"); dateOptions.put("java8-localdatetime", "Java 8 using LocalDateTime (for legacy app only)"); dateOptions.put("joda", "Joda"); dateOptions.put("legacy", "Legacy java.util.Date"); dateLibrary.setEnum(dateOptions); - cliOptions.add(dateLibrary); + CliOption java8Mode = new CliOption(JAVA8_MODE, "Option. Use Java8 classes instead of third party equivalents"); + Map java8ModeOptions = new HashMap(); + java8ModeOptions.put("true", "Use Java 8 classes such as Base64"); + java8ModeOptions.put("false", "Various third party libraries as needed"); + java8Mode.setEnum(java8ModeOptions); + cliOptions.add(java8Mode); + } @Override @@ -359,10 +367,17 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code importMapping.put("com.fasterxml.jackson.annotation.JsonProperty", "com.fasterxml.jackson.annotation.JsonCreator"); if(additionalProperties.containsKey(DATE_LIBRARY)) { - setDateLibrary(additionalProperties.get("dateLibrary").toString()); + setDateLibrary(additionalProperties.get(DATE_LIBRARY).toString()); additionalProperties.put(dateLibrary, "true"); } + if(additionalProperties.containsKey(JAVA8_MODE)) { + setJava8Mode(Boolean.parseBoolean(additionalProperties.get(JAVA8_MODE).toString())); + if ( java8Mode ) { + additionalProperties.put("java8", "true"); + } + } + if("joda".equals(dateLibrary)) { additionalProperties.put("joda", "true"); typeMapping.put("date", "LocalDate"); @@ -1126,6 +1141,10 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code this.dateLibrary = library; } + public void setJava8Mode(boolean enabled) { + this.java8Mode = enabled; + } + @Override public String escapeQuotationMark(String input) { // remove " to avoid code injection diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache index 0438f6a40b..015e042e17 100644 --- a/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache @@ -4,12 +4,20 @@ package {{invokerPackage}}.auth; import {{invokerPackage}}.Pair; +{{^java8}} import com.migcomponents.migbase64.Base64; +{{/java8}} +{{#java8}} +import java.util.Base64; +import java.nio.charset.StandardCharsets; +{{/java8}} import java.util.Map; import java.util.List; +{{^java8}} import java.io.UnsupportedEncodingException; +{{/java8}} {{>generatedAnnotation}} public class HttpBasicAuth implements Authentication { @@ -38,10 +46,15 @@ public class HttpBasicAuth implements Authentication { return; } String str = (username == null ? "" : username) + ":" + (password == null ? "" : password); +{{^java8}} try { headerParams.put("Authorization", "Basic " + Base64.encodeToString(str.getBytes("UTF-8"), false)); } catch (UnsupportedEncodingException e) { throw new RuntimeException(e); } +{{/java8}} +{{#java8}} + headerParams.put("Authorization", "Basic " + Base64.getEncoder().encodeToString(str.getBytes(StandardCharsets.UTF_8))); +{{/java8}} } } diff --git a/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache index 751730ec23..5f60c01b36 100644 --- a/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache @@ -127,7 +127,7 @@ dependencies { {{^java8}} compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" compile "joda-time:joda-time:$jodatime_version" - {{/java8}} compile "com.brsanthu:migbase64:2.2" + {{/java8}} testCompile "junit:junit:$junit_version" } diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache index b2db2d26f9..42db9488d1 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/build.gradle.mustache @@ -132,11 +132,11 @@ dependencies { {{^java8}} compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" compile "joda-time:joda-time:$jodatime_version" + compile "com.brsanthu:migbase64:2.2" {{/java8}} {{#supportJava6}} compile "commons-io:commons-io:$commons_io_version" compile "org.apache.commons:commons-lang3:$commons_lang3_version" {{/supportJava6}} - compile "com.brsanthu:migbase64:2.2" testCompile "junit:junit:$junit_version" } diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache index c990bb13ed..4d3bbdabf5 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/jersey2/pom.mustache @@ -240,7 +240,6 @@ joda-time ${jodatime-version} - {{/java8}} @@ -248,6 +247,8 @@ migbase64 2.2 + {{/java8}} + {{#supportJava6}} org.apache.commons diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/build.gradle.mustache index e150b8671e..5a8e29157a 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/build.gradle.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/build.gradle.mustache @@ -132,11 +132,11 @@ dependencies { {{^java8}} compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" compile "joda-time:joda-time:$jodatime_version" + compile "com.brsanthu:migbase64:2.2" {{/java8}} {{#supportJava6}} compile "commons-io:commons-io:$commons_io_version" compile "org.apache.commons:commons-lang3:$commons_lang3_version" {{/supportJava6}} - compile "com.brsanthu:migbase64:2.2" testCompile "junit:junit:$junit_version" } diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/build.sbt.mustache index c1cb91dd31..348d29d96d 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/build.sbt.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/build.sbt.mustache @@ -22,8 +22,8 @@ lazy val root = (project in file(".")). {{^java8}} "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.7.5", "joda-time" % "joda-time" % "2.9.4", - {{/java8}} "com.brsanthu" % "migbase64" % "2.2", + {{/java8}} {{#supportJava6}} "org.apache.commons" % "commons-lang3" % "3.5", "commons-io" % "commons-io" % "2.5", diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/pom.mustache index 15ab95dee4..02af44621a 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/resteasy/pom.mustache @@ -168,7 +168,6 @@ joda-time ${jodatime-version} - {{/java8}} @@ -176,6 +175,8 @@ migbase64 2.2 + {{/java8}} + {{#supportJava6}} org.apache.commons diff --git a/modules/swagger-codegen/src/main/resources/Java/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/pom.mustache index cc834ea360..beedc3a7a3 100644 --- a/modules/swagger-codegen/src/main/resources/Java/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/pom.mustache @@ -241,7 +241,6 @@ joda-time ${jodatime-version} - {{/java8}} @@ -249,6 +248,7 @@ migbase64 2.2 + {{/java8}} {{#supportJava6}} diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java index a4a13ecbcb..336ed0ec4c 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaClientOptionsTest.java @@ -82,6 +82,8 @@ public class JavaClientOptionsTest extends AbstractOptionsTest { times = 1; clientCodegen.setUseBeanValidation(Boolean.valueOf(JavaClientOptionsProvider.PERFORM_BEANVALIDATION)); times = 1; + clientCodegen.setUseBeanValidation(Boolean.valueOf(JavaClientOptionsProvider.PERFORM_BEANVALIDATION)); + times = 1; }}; } } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaClientOptionsProvider.java index 2b8426af3c..a3595f6794 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaClientOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaClientOptionsProvider.java @@ -25,6 +25,7 @@ public class JavaClientOptionsProvider extends JavaOptionsProvider { options.put(JavaClientCodegen.PERFORM_BEANVALIDATION, PERFORM_BEANVALIDATION); options.put(JavaClientCodegen.USE_GZIP_FEATURE, "false"); options.put(JavaClientCodegen.USE_RUNTIME_EXCEPTION, "false"); + options.put(JavaClientCodegen.JAVA8_MODE, "false"); return options; } diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java index eb60599435..5ba2417b50 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java @@ -29,6 +29,7 @@ public class JavaOptionsProvider implements OptionsProvider { public static final String LOCAL_PREFIX_VALUE = "tst"; public static final String SERIALIZABLE_MODEL_VALUE = "false"; public static final String FULL_JAVA_UTIL_VALUE = "true"; + public static final String JAVA8_MODE_VALUE = "true"; public static final String ENSURE_UNIQUE_PARAMS_VALUE = "true"; //public static final String SUPPORT_JAVA6 = "true"; public static final String USE_BEANVALIDATION = "false"; @@ -65,6 +66,7 @@ public class JavaOptionsProvider implements OptionsProvider { .put(CodegenConstants.LOCAL_VARIABLE_PREFIX, LOCAL_PREFIX_VALUE) .put(CodegenConstants.SERIALIZABLE_MODEL, SERIALIZABLE_MODEL_VALUE) .put(JavaClientCodegen.FULL_JAVA_UTIL, FULL_JAVA_UTIL_VALUE) + .put(JavaClientCodegen.JAVA8_MODE, JAVA8_MODE_VALUE) .put(CodegenConstants.SERIALIZE_BIG_DECIMAL_AS_STRING, "true") .put(JavaClientCodegen.DATE_LIBRARY, "joda") .put("hideGenerationTimestamp", "true") diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java index ce89ee75ec..535c637a4c 100644 --- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java +++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java @@ -37,6 +37,7 @@ public class JaxRSServerOptionsProvider implements OptionsProvider { public static final String JAXRS_DEFAULT_LIBRARY_VALUE = "jersey1"; public static final String USE_BEANVALIDATION = "true"; public static final String ALLOW_UNICODE_IDENTIFIERS_VALUE = "false"; + public static final String JAVA8_MODE_VALUE = "false"; @Override @@ -81,6 +82,7 @@ public class JaxRSServerOptionsProvider implements OptionsProvider { .put(JavaClientCodegen.FULL_JAVA_UTIL, FULL_JAVA_UTIL_VALUE) .put(CodegenConstants.LIBRARY, JAXRS_DEFAULT_LIBRARY_VALUE) .put(CodegenConstants.SERIALIZE_BIG_DECIMAL_AS_STRING, "true") + .put(JavaClientCodegen.JAVA8_MODE, JAVA8_MODE_VALUE) //.put(JavaClientCodegen.DATE_LIBRARY, "joda") .put("hideGenerationTimestamp", "true") .put(JavaCXFServerCodegen.USE_BEANVALIDATION, USE_BEANVALIDATION) diff --git a/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/build.gradle.mustache b/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/build.gradle.mustache index 739287b28c..b6d2dd8ec3 100644 --- a/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/build.gradle.mustache +++ b/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/build.gradle.mustache @@ -134,11 +134,11 @@ dependencies { {{^java8}} compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" compile "joda-time:joda-time:$jodatime_version" + compile "com.brsanthu:migbase64:2.2" {{/java8}} {{#supportJava6}} compile "commons-io:commons-io:$commons_io_version" compile "org.apache.commons:commons-lang3:$commons_lang3_version" {{/supportJava6}} - compile "com.brsanthu:migbase64:2.2" testCompile "junit:junit:$junit_version" } diff --git a/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/build.sbt.mustache b/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/build.sbt.mustache index b2d31d23f7..cce1667464 100644 --- a/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/build.sbt.mustache +++ b/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/build.sbt.mustache @@ -24,8 +24,8 @@ lazy val root = (project in file(".")). {{^java8}} "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.7.5", "joda-time" % "joda-time" % "2.9.4", - {{/java8}} "com.brsanthu" % "migbase64" % "2.2", + {{/java8}} {{#supportJava6}} "org.apache.commons" % "commons-lang3" % "3.5", "commons-io" % "commons-io" % "2.5", diff --git a/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache b/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache index e875fc26b3..0566cb81d9 100644 --- a/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache +++ b/modules/swagger-codegen/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache @@ -242,7 +242,6 @@ joda-time ${jodatime-version} - {{/java8}} @@ -250,6 +249,8 @@ migbase64 2.2 + {{/java8}} + {{#supportJava6}} org.apache.commons diff --git a/samples/client/petstore-security-test/java/okhttp-gson/build.gradle b/samples/client/petstore-security-test/java/okhttp-gson/build.gradle index 0f403ed63f..1d7eb55f31 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/build.gradle +++ b/samples/client/petstore-security-test/java/okhttp-gson/build.gradle @@ -94,10 +94,10 @@ if(hasProperty('target') && target == 'android') { } dependencies { - compile 'io.swagger:swagger-annotations:1.5.8' + compile 'io.swagger:swagger-annotations:1.5.15' compile 'com.squareup.okhttp:okhttp:2.7.5' compile 'com.squareup.okhttp:logging-interceptor:2.7.5' - compile 'com.google.code.gson:gson:2.6.2' - compile 'joda-time:joda-time:2.9.3' + compile 'com.google.code.gson:gson:2.8.1' + compile 'joda-time:joda-time:2.9.9' testCompile 'junit:junit:4.12' } diff --git a/samples/client/petstore-security-test/java/okhttp-gson/build.sbt b/samples/client/petstore-security-test/java/okhttp-gson/build.sbt index 01a1095f8a..0cb2e94994 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/build.sbt +++ b/samples/client/petstore-security-test/java/okhttp-gson/build.sbt @@ -9,11 +9,11 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( - "io.swagger" % "swagger-annotations" % "1.5.8", + "io.swagger" % "swagger-annotations" % "1.5.15", "com.squareup.okhttp" % "okhttp" % "2.7.5", "com.squareup.okhttp" % "logging-interceptor" % "2.7.5", - "com.google.code.gson" % "gson" % "2.6.2", - "joda-time" % "joda-time" % "2.9.3" % "compile", + "com.google.code.gson" % "gson" % "2.8.1", + "joda-time" % "joda-time" % "2.9.9" % "compile", "junit" % "junit" % "4.12" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/samples/client/petstore-security-test/java/okhttp-gson/pom.xml b/samples/client/petstore-security-test/java/okhttp-gson/pom.xml index dbd7942c97..00d2187628 100644 --- a/samples/client/petstore-security-test/java/okhttp-gson/pom.xml +++ b/samples/client/petstore-security-test/java/okhttp-gson/pom.xml @@ -208,8 +208,8 @@ ${java.version} 1.5.15 2.7.5 - 2.6.2 - 2.9.3 + 2.8.1 + 2.9.9 1.0.0 4.12 UTF-8 diff --git a/samples/client/petstore/java/jersey2-java6/build.gradle b/samples/client/petstore/java/jersey2-java6/build.gradle index 7910021321..a069e61270 100644 --- a/samples/client/petstore/java/jersey2-java6/build.gradle +++ b/samples/client/petstore/java/jersey2-java6/build.gradle @@ -93,12 +93,12 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.15" - jackson_version = "2.8.9" - jersey_version = "2.25.1" - jodatime_version = "2.9.9" + swagger_annotations_version = "1.5.8" + jackson_version = "2.7.5" + jersey_version = "2.22.2" + jodatime_version = "2.9.4" commons_io_version=2.5 - commons_lang3_version=3.6 + commons_lang3_version=3.5 junit_version = "4.12" } @@ -112,8 +112,8 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version" compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" compile "joda-time:joda-time:$jodatime_version" + compile "com.brsanthu:migbase64:2.2" compile "commons-io:commons-io:$commons_io_version" compile "org.apache.commons:commons-lang3:$commons_lang3_version" - compile "com.brsanthu:migbase64:2.2" testCompile "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/jersey2-java6/build.sbt b/samples/client/petstore/java/jersey2-java6/build.sbt index 05f502ac4a..d1d444bee2 100644 --- a/samples/client/petstore/java/jersey2-java6/build.sbt +++ b/samples/client/petstore/java/jersey2-java6/build.sbt @@ -9,17 +9,17 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( - "io.swagger" % "swagger-annotations" % "1.5.15", - "org.glassfish.jersey.core" % "jersey-client" % "2.25.1", - "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.25.1", - "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.25.1", - "com.fasterxml.jackson.core" % "jackson-core" % "2.8.9", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.9", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.9", - "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.8.9", - "joda-time" % "joda-time" % "2.9.9", + "io.swagger" % "swagger-annotations" % "1.5.8", + "org.glassfish.jersey.core" % "jersey-client" % "2.22.2", + "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.22.2", + "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.22.2", + "com.fasterxml.jackson.core" % "jackson-core" % "2.7.5", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5", + "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.7.5", + "joda-time" % "joda-time" % "2.9.4", "com.brsanthu" % "migbase64" % "2.2", - "org.apache.commons" % "commons-lang3" % "3.6", + "org.apache.commons" % "commons-lang3" % "3.5", "commons-io" % "commons-io" % "2.5", "junit" % "junit" % "4.12" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" diff --git a/samples/client/petstore/java/jersey2-java6/pom.xml b/samples/client/petstore/java/jersey2-java6/pom.xml index 1eae180b67..c5f68e3008 100644 --- a/samples/client/petstore/java/jersey2-java6/pom.xml +++ b/samples/client/petstore/java/jersey2-java6/pom.xml @@ -233,6 +233,7 @@ migbase64 2.2 + org.apache.commons commons-lang3 @@ -254,12 +255,12 @@ - 1.5.15 - 2.25.1 - 2.8.9 - 2.9.9 + 1.5.12 + 2.22.2 + 2.7.5 + 2.9.4 2.5 - 3.6 + 3.5 1.0.0 4.12 diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/ApiClient.java index 79df237e1d..938b7521e6 100644 --- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/ApiClient.java @@ -671,56 +671,48 @@ public class ApiClient { Entity entity = serialize(body, formParams, contentType); - Response response = null; + Response response; - try { - if ("GET".equals(method)) { - response = invocationBuilder.get(); - } else if ("POST".equals(method)) { - response = invocationBuilder.post(entity); - } else if ("PUT".equals(method)) { - response = invocationBuilder.put(entity); - } else if ("DELETE".equals(method)) { - response = invocationBuilder.delete(); - } else if ("PATCH".equals(method)) { - response = invocationBuilder.header("X-HTTP-Method-Override", "PATCH").post(entity); - } else { - throw new ApiException(500, "unknown method type " + method); - } + if ("GET".equals(method)) { + response = invocationBuilder.get(); + } else if ("POST".equals(method)) { + response = invocationBuilder.post(entity); + } else if ("PUT".equals(method)) { + response = invocationBuilder.put(entity); + } else if ("DELETE".equals(method)) { + response = invocationBuilder.delete(); + } else if ("PATCH".equals(method)) { + response = invocationBuilder.header("X-HTTP-Method-Override", "PATCH").post(entity); + } else { + throw new ApiException(500, "unknown method type " + method); + } - statusCode = response.getStatusInfo().getStatusCode(); - responseHeaders = buildResponseHeaders(response); + statusCode = response.getStatusInfo().getStatusCode(); + responseHeaders = buildResponseHeaders(response); - if (response.getStatus() == Status.NO_CONTENT.getStatusCode()) { + if (response.getStatus() == Status.NO_CONTENT.getStatusCode()) { + return null; + } else if (response.getStatusInfo().getFamily() == Status.Family.SUCCESSFUL) { + if (returnType == null) return null; - } else if (response.getStatusInfo().getFamily() == Status.Family.SUCCESSFUL) { - if (returnType == null) - return null; - else - return deserialize(response, returnType); - } else { - String message = "error"; - String respBody = null; - if (response.hasEntity()) { - try { - respBody = String.valueOf(response.readEntity(String.class)); - message = respBody; - } catch (RuntimeException e) { - // e.printStackTrace(); - } + else + return deserialize(response, returnType); + } else { + String message = "error"; + String respBody = null; + if (response.hasEntity()) { + try { + respBody = String.valueOf(response.readEntity(String.class)); + message = respBody; + } catch (RuntimeException e) { + // e.printStackTrace(); } - throw new ApiException( - response.getStatus(), - message, - buildResponseHeaders(response), - respBody); - } - } finally { - try { - response.close(); - } catch (Exception e) { - // it's not critical, since the response object is local in method invokeAPI; that's fine, just continue } + throw new ApiException( + response.getStatus(), + message, + buildResponseHeaders(response), + respBody); } } diff --git a/samples/client/petstore/java/jersey2-java8/build.gradle b/samples/client/petstore/java/jersey2-java8/build.gradle index 13ad1675cd..4aa158e8bd 100644 --- a/samples/client/petstore/java/jersey2-java8/build.gradle +++ b/samples/client/petstore/java/jersey2-java8/build.gradle @@ -93,9 +93,9 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.15" - jackson_version = "2.8.9" - jersey_version = "2.25.1" + swagger_annotations_version = "1.5.8" + jackson_version = "2.7.5" + jersey_version = "2.22.2" junit_version = "4.12" } @@ -108,6 +108,5 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version" compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" - compile "com.brsanthu:migbase64:2.2" testCompile "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/jersey2-java8/build.sbt b/samples/client/petstore/java/jersey2-java8/build.sbt index 4d2a46846f..bc4a50dc3c 100644 --- a/samples/client/petstore/java/jersey2-java8/build.sbt +++ b/samples/client/petstore/java/jersey2-java8/build.sbt @@ -9,15 +9,14 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( - "io.swagger" % "swagger-annotations" % "1.5.15", - "org.glassfish.jersey.core" % "jersey-client" % "2.25.1", - "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.25.1", - "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.25.1", - "com.fasterxml.jackson.core" % "jackson-core" % "2.8.9", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.9", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.9", - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.8.9", - "com.brsanthu" % "migbase64" % "2.2", + "io.swagger" % "swagger-annotations" % "1.5.8", + "org.glassfish.jersey.core" % "jersey-client" % "2.22.2", + "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.22.2", + "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.22.2", + "com.fasterxml.jackson.core" % "jackson-core" % "2.7.5", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.7.5", "junit" % "junit" % "4.12" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/samples/client/petstore/java/jersey2-java8/pom.xml b/samples/client/petstore/java/jersey2-java8/pom.xml index 547cb4cbef..34b327ff63 100644 --- a/samples/client/petstore/java/jersey2-java8/pom.xml +++ b/samples/client/petstore/java/jersey2-java8/pom.xml @@ -222,12 +222,6 @@ ${jackson-version} - - - com.brsanthu - migbase64 - 2.2 - @@ -238,9 +232,9 @@ - 1.5.15 - 2.25.1 - 2.8.9 + 1.5.12 + 2.22.2 + 2.7.5 1.0.0 4.12 diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/ApiClient.java index 16b5e5796d..0995fbc3df 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/ApiClient.java @@ -671,56 +671,48 @@ public class ApiClient { Entity entity = serialize(body, formParams, contentType); - Response response = null; + Response response; - try { - if ("GET".equals(method)) { - response = invocationBuilder.get(); - } else if ("POST".equals(method)) { - response = invocationBuilder.post(entity); - } else if ("PUT".equals(method)) { - response = invocationBuilder.put(entity); - } else if ("DELETE".equals(method)) { - response = invocationBuilder.delete(); - } else if ("PATCH".equals(method)) { - response = invocationBuilder.header("X-HTTP-Method-Override", "PATCH").post(entity); - } else { - throw new ApiException(500, "unknown method type " + method); - } + if ("GET".equals(method)) { + response = invocationBuilder.get(); + } else if ("POST".equals(method)) { + response = invocationBuilder.post(entity); + } else if ("PUT".equals(method)) { + response = invocationBuilder.put(entity); + } else if ("DELETE".equals(method)) { + response = invocationBuilder.delete(); + } else if ("PATCH".equals(method)) { + response = invocationBuilder.header("X-HTTP-Method-Override", "PATCH").post(entity); + } else { + throw new ApiException(500, "unknown method type " + method); + } - statusCode = response.getStatusInfo().getStatusCode(); - responseHeaders = buildResponseHeaders(response); + statusCode = response.getStatusInfo().getStatusCode(); + responseHeaders = buildResponseHeaders(response); - if (response.getStatus() == Status.NO_CONTENT.getStatusCode()) { + if (response.getStatus() == Status.NO_CONTENT.getStatusCode()) { + return null; + } else if (response.getStatusInfo().getFamily() == Status.Family.SUCCESSFUL) { + if (returnType == null) return null; - } else if (response.getStatusInfo().getFamily() == Status.Family.SUCCESSFUL) { - if (returnType == null) - return null; - else - return deserialize(response, returnType); - } else { - String message = "error"; - String respBody = null; - if (response.hasEntity()) { - try { - respBody = String.valueOf(response.readEntity(String.class)); - message = respBody; - } catch (RuntimeException e) { - // e.printStackTrace(); - } + else + return deserialize(response, returnType); + } else { + String message = "error"; + String respBody = null; + if (response.hasEntity()) { + try { + respBody = String.valueOf(response.readEntity(String.class)); + message = respBody; + } catch (RuntimeException e) { + // e.printStackTrace(); } - throw new ApiException( - response.getStatus(), - message, - buildResponseHeaders(response), - respBody); - } - } finally { - try { - response.close(); - } catch (Exception e) { - // it's not critical, since the response object is local in method invokeAPI; that's fine, just continue } + throw new ApiException( + response.getStatus(), + message, + buildResponseHeaders(response), + respBody); } } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/auth/HttpBasicAuth.java index 788b63a991..0b2a5b4921 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/auth/HttpBasicAuth.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/auth/HttpBasicAuth.java @@ -15,12 +15,12 @@ package io.swagger.client.auth; import io.swagger.client.Pair; -import com.migcomponents.migbase64.Base64; +import java.util.Base64; +import java.nio.charset.StandardCharsets; import java.util.Map; import java.util.List; -import java.io.UnsupportedEncodingException; public class HttpBasicAuth implements Authentication { @@ -49,10 +49,6 @@ public class HttpBasicAuth implements Authentication { return; } String str = (username == null ? "" : username) + ":" + (password == null ? "" : password); - try { - headerParams.put("Authorization", "Basic " + Base64.encodeToString(str.getBytes("UTF-8"), false)); - } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); - } + headerParams.put("Authorization", "Basic " + Base64.getEncoder().encodeToString(str.getBytes(StandardCharsets.UTF_8))); } } diff --git a/samples/client/petstore/java/jersey2/build.gradle b/samples/client/petstore/java/jersey2/build.gradle index 2290cd0f1e..f20bda6db1 100644 --- a/samples/client/petstore/java/jersey2/build.gradle +++ b/samples/client/petstore/java/jersey2/build.gradle @@ -93,10 +93,10 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.15" - jackson_version = "2.8.9" - jersey_version = "2.25.1" - jodatime_version = "2.9.9" + swagger_annotations_version = "1.5.8" + jackson_version = "2.7.5" + jersey_version = "2.22.2" + jodatime_version = "2.9.4" junit_version = "4.12" } diff --git a/samples/client/petstore/java/jersey2/build.sbt b/samples/client/petstore/java/jersey2/build.sbt index 9a516c92cf..555b44f16d 100644 --- a/samples/client/petstore/java/jersey2/build.sbt +++ b/samples/client/petstore/java/jersey2/build.sbt @@ -9,15 +9,15 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( - "io.swagger" % "swagger-annotations" % "1.5.15", - "org.glassfish.jersey.core" % "jersey-client" % "2.25.1", - "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.25.1", - "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.25.1", - "com.fasterxml.jackson.core" % "jackson-core" % "2.8.9", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.9", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.9", - "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.8.9", - "joda-time" % "joda-time" % "2.9.9", + "io.swagger" % "swagger-annotations" % "1.5.8", + "org.glassfish.jersey.core" % "jersey-client" % "2.22.2", + "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.22.2", + "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.22.2", + "com.fasterxml.jackson.core" % "jackson-core" % "2.7.5", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5", + "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.7.5", + "joda-time" % "joda-time" % "2.9.4", "com.brsanthu" % "migbase64" % "2.2", "junit" % "junit" % "4.12" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" diff --git a/samples/client/petstore/java/jersey2/pom.xml b/samples/client/petstore/java/jersey2/pom.xml index b665825c4f..c8ce44478d 100644 --- a/samples/client/petstore/java/jersey2/pom.xml +++ b/samples/client/petstore/java/jersey2/pom.xml @@ -234,6 +234,7 @@ 2.2 + junit @@ -243,10 +244,10 @@ - 1.5.15 - 2.25.1 - 2.8.9 - 2.9.9 + 1.5.12 + 2.22.2 + 2.7.5 + 2.9.4 1.0.0 4.12 diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java index 16b5e5796d..0995fbc3df 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java @@ -671,56 +671,48 @@ public class ApiClient { Entity entity = serialize(body, formParams, contentType); - Response response = null; + Response response; - try { - if ("GET".equals(method)) { - response = invocationBuilder.get(); - } else if ("POST".equals(method)) { - response = invocationBuilder.post(entity); - } else if ("PUT".equals(method)) { - response = invocationBuilder.put(entity); - } else if ("DELETE".equals(method)) { - response = invocationBuilder.delete(); - } else if ("PATCH".equals(method)) { - response = invocationBuilder.header("X-HTTP-Method-Override", "PATCH").post(entity); - } else { - throw new ApiException(500, "unknown method type " + method); - } + if ("GET".equals(method)) { + response = invocationBuilder.get(); + } else if ("POST".equals(method)) { + response = invocationBuilder.post(entity); + } else if ("PUT".equals(method)) { + response = invocationBuilder.put(entity); + } else if ("DELETE".equals(method)) { + response = invocationBuilder.delete(); + } else if ("PATCH".equals(method)) { + response = invocationBuilder.header("X-HTTP-Method-Override", "PATCH").post(entity); + } else { + throw new ApiException(500, "unknown method type " + method); + } - statusCode = response.getStatusInfo().getStatusCode(); - responseHeaders = buildResponseHeaders(response); + statusCode = response.getStatusInfo().getStatusCode(); + responseHeaders = buildResponseHeaders(response); - if (response.getStatus() == Status.NO_CONTENT.getStatusCode()) { + if (response.getStatus() == Status.NO_CONTENT.getStatusCode()) { + return null; + } else if (response.getStatusInfo().getFamily() == Status.Family.SUCCESSFUL) { + if (returnType == null) return null; - } else if (response.getStatusInfo().getFamily() == Status.Family.SUCCESSFUL) { - if (returnType == null) - return null; - else - return deserialize(response, returnType); - } else { - String message = "error"; - String respBody = null; - if (response.hasEntity()) { - try { - respBody = String.valueOf(response.readEntity(String.class)); - message = respBody; - } catch (RuntimeException e) { - // e.printStackTrace(); - } + else + return deserialize(response, returnType); + } else { + String message = "error"; + String respBody = null; + if (response.hasEntity()) { + try { + respBody = String.valueOf(response.readEntity(String.class)); + message = respBody; + } catch (RuntimeException e) { + // e.printStackTrace(); } - throw new ApiException( - response.getStatus(), - message, - buildResponseHeaders(response), - respBody); - } - } finally { - try { - response.close(); - } catch (Exception e) { - // it's not critical, since the response object is local in method invokeAPI; that's fine, just continue } + throw new ApiException( + response.getStatus(), + message, + buildResponseHeaders(response), + respBody); } } diff --git a/samples/client/petstore/java/resteasy/pom.xml b/samples/client/petstore/java/resteasy/pom.xml index 0f7ee5a1d9..c0a928de64 100644 --- a/samples/client/petstore/java/resteasy/pom.xml +++ b/samples/client/petstore/java/resteasy/pom.xml @@ -161,10 +161,11 @@ migbase64 2.2 + org.jboss.resteasy resteasy-jackson-provider - 3.1.3.Final + 2.3.4.Final diff --git a/samples/client/petstore/java/resttemplate/build.gradle b/samples/client/petstore/java/resttemplate/build.gradle index eeb852d309..ab71189322 100644 --- a/samples/client/petstore/java/resttemplate/build.gradle +++ b/samples/client/petstore/java/resttemplate/build.gradle @@ -94,10 +94,10 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.15" - jackson_version = "2.8.9" - spring_web_version = "4.3.9.RELEASE" - jodatime_version = "2.9.9" + swagger_annotations_version = "1.5.8" + jackson_version = "2.8.8" + spring_web_version = "4.3.7.RELEASE" + jodatime_version = "2.9.4" junit_version = "4.12" } diff --git a/samples/client/petstore/java/resttemplate/pom.xml b/samples/client/petstore/java/resttemplate/pom.xml index 01059b5fcb..f5b77cc1e7 100644 --- a/samples/client/petstore/java/resttemplate/pom.xml +++ b/samples/client/petstore/java/resttemplate/pom.xml @@ -233,10 +233,10 @@ UTF-8 - 1.5.15 - 4.3.9.RELEASE - 2.8.9 - 2.9.9 + 1.5.8 + 4.3.7.RELEASE + 2.8.8 + 2.9.4 1.0.0 4.12 diff --git a/samples/client/petstore/java/retrofit/pom.xml b/samples/client/petstore/java/retrofit/pom.xml index ffb62b3f28..cb50ddea34 100644 --- a/samples/client/petstore/java/retrofit/pom.xml +++ b/samples/client/petstore/java/retrofit/pom.xml @@ -213,10 +213,10 @@ - 1.5.15 + 1.5.12 1.9.0 2.7.5 - 2.9.9 + 2.9.3 1.0.1 1.0.0 4.12 diff --git a/samples/client/petstore/java/retrofit2-play24/build.gradle b/samples/client/petstore/java/retrofit2-play24/build.gradle index 660aa9a74f..d5624f8999 100644 --- a/samples/client/petstore/java/retrofit2-play24/build.gradle +++ b/samples/client/petstore/java/retrofit2-play24/build.gradle @@ -96,11 +96,11 @@ if(hasProperty('target') && target == 'android') { ext { oltu_version = "1.0.1" retrofit_version = "2.1.0" - jackson_version = "2.8.9" + jackson_version = "2.7.5" play_version = "2.4.11" - swagger_annotations_version = "1.5.15" + swagger_annotations_version = "1.5.12" junit_version = "4.12" - jodatime_version = "2.9.9" + jodatime_version = "2.9.4" } dependencies { diff --git a/samples/client/petstore/java/retrofit2-play24/build.sbt b/samples/client/petstore/java/retrofit2-play24/build.sbt index 60a3d4c78e..feceac08cf 100644 --- a/samples/client/petstore/java/retrofit2-play24/build.sbt +++ b/samples/client/petstore/java/retrofit2-play24/build.sbt @@ -14,12 +14,12 @@ lazy val root = (project in file(".")). "com.squareup.retrofit2" % "converter-scalars" % "2.1.0" % "compile", "com.squareup.retrofit2" % "converter-gson" % "2.1.0" % "compile", "com.squareup.retrofit2" % "converter-jackson" % "2.1.0" % "compile", - "com.fasterxml.jackson.core" % "jackson-core" % "2.8.9" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.9" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.9" % "compile", - "io.swagger" % "swagger-annotations" % "1.5.15" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.7.5" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5" % "compile", + "io.swagger" % "swagger-annotations" % "1.5.12" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", - "joda-time" % "joda-time" % "2.9.9" % "compile", + "joda-time" % "joda-time" % "2.9.4" % "compile", "junit" % "junit" % "4.12" % "test", "com.novocode" % "junit-interface" % "0.11" % "test" ) diff --git a/samples/client/petstore/java/retrofit2-play24/pom.xml b/samples/client/petstore/java/retrofit2-play24/pom.xml index f711d86178..6693f615e6 100644 --- a/samples/client/petstore/java/retrofit2-play24/pom.xml +++ b/samples/client/petstore/java/retrofit2-play24/pom.xml @@ -246,11 +246,11 @@ 1.7 ${java.version} ${java.version} - 1.5.15 - 2.8.9 + 1.5.12 + 2.7.5 2.4.11 - 2.3.0 - 2.9.9 + 2.2.0 + 2.9.4 1.0.1 4.12 diff --git a/samples/server/petstore/java-inflector/.swagger-codegen/VERSION b/samples/server/petstore/java-inflector/.swagger-codegen/VERSION index 7fea99011a..f9f7450d13 100644 --- a/samples/server/petstore/java-inflector/.swagger-codegen/VERSION +++ b/samples/server/petstore/java-inflector/.swagger-codegen/VERSION @@ -1 +1 @@ -2.2.3-SNAPSHOT \ No newline at end of file +2.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-inflector/src/gen/java/io/swagger/controllers/StringUtil.java b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/controllers/StringUtil.java new file mode 100644 index 0000000000..a6dce76b5f --- /dev/null +++ b/samples/server/petstore/java-inflector/src/gen/java/io/swagger/controllers/StringUtil.java @@ -0,0 +1,42 @@ +package io.swagger.controllers; + + +public class StringUtil { + /** + * Check if the given array contains the given value (with case-insensitive comparison). + * + * @param array The array + * @param value The value to search + * @return true if the array contains the value + */ + public static boolean containsIgnoreCase(String[] array, String value) { + for (String str : array) { + if (value == null && str == null) return true; + if (value != null && value.equalsIgnoreCase(str)) return true; + } + return false; + } + + /** + * Join an array of strings with the given separator. + *

+ * Note: This might be replaced by utility method from commons-lang or guava someday + * if one of those libraries is added as dependency. + *

+ * + * @param array The array of strings + * @param separator The separator + * @return the resulting string + */ + public static String join(String[] array, String separator) { + int len = array.length; + if (len == 0) return ""; + + StringBuilder out = new StringBuilder(); + out.append(array[0]); + for (int i = 1; i < len; i++) { + out.append(separator).append(array[i]); + } + return out.toString(); + } +} diff --git a/samples/server/petstore/java-inflector/src/main/java/io/swagger/controllers/FakeController.java b/samples/server/petstore/java-inflector/src/main/java/io/swagger/controllers/FakeController.java new file mode 100644 index 0000000000..17cebd09aa --- /dev/null +++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/controllers/FakeController.java @@ -0,0 +1,69 @@ +package io.swagger.controllers; + +import io.swagger.inflector.models.RequestContext; +import io.swagger.inflector.models.ResponseContext; +import javax.ws.rs.core.Response.Status; + +import org.glassfish.jersey.media.multipart.FormDataContentDisposition; +import java.io.File; +import java.util.List; + +import io.swagger.model.*; + +import java.math.BigDecimal; +import io.swagger.model.Client; +import java.util.Date; +import io.swagger.model.OuterComposite; + + +public class FakeController { + /** + * Uncomment and implement as you see fit. These operations will map + * Directly to operation calls from the routing logic. Because the inflector + * Code allows you to implement logic incrementally, they are disabled. + **/ + + /* + public ResponseContext fakeOuterBooleanSerialize(RequestContext request , Boolean body) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext fakeOuterCompositeSerialize(RequestContext request , OuterComposite body) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext fakeOuterNumberSerialize(RequestContext request , BigDecimal body) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext fakeOuterStringSerialize(RequestContext request , String body) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext testClientModel(RequestContext request , Client body) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext testEndpointParameters(RequestContext request , BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, byte[] binary, Date date, Date dateTime, String password, String paramCallback) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext testEnumParameters(RequestContext request , List enumFormStringArray, String enumFormString, List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + +} + diff --git a/samples/server/petstore/java-inflector/src/main/java/io/swagger/controllers/PetController.java b/samples/server/petstore/java-inflector/src/main/java/io/swagger/controllers/PetController.java new file mode 100644 index 0000000000..48a211e715 --- /dev/null +++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/controllers/PetController.java @@ -0,0 +1,74 @@ +package io.swagger.controllers; + +import io.swagger.inflector.models.RequestContext; +import io.swagger.inflector.models.ResponseContext; +import javax.ws.rs.core.Response.Status; + +import org.glassfish.jersey.media.multipart.FormDataContentDisposition; +import java.io.File; +import java.util.List; + +import io.swagger.model.*; + +import java.io.File; +import io.swagger.model.ModelApiResponse; +import io.swagger.model.Pet; + + +public class PetController { + /** + * Uncomment and implement as you see fit. These operations will map + * Directly to operation calls from the routing logic. Because the inflector + * Code allows you to implement logic incrementally, they are disabled. + **/ + + /* + public ResponseContext addPet(RequestContext request , Pet body) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext deletePet(RequestContext request , Long petId, String apiKey) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext findPetsByStatus(RequestContext request , List status) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext findPetsByTags(RequestContext request , List tags) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext getPetById(RequestContext request , Long petId) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext updatePet(RequestContext request , Pet body) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext updatePetWithForm(RequestContext request , Long petId, String name, String status) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext uploadFile(RequestContext request , Long petId, String additionalMetadata, FormDataContentDisposition fileDetail) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + +} + diff --git a/samples/server/petstore/java-inflector/src/main/java/io/swagger/controllers/StoreController.java b/samples/server/petstore/java-inflector/src/main/java/io/swagger/controllers/StoreController.java new file mode 100644 index 0000000000..0c4856dc1b --- /dev/null +++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/controllers/StoreController.java @@ -0,0 +1,49 @@ +package io.swagger.controllers; + +import io.swagger.inflector.models.RequestContext; +import io.swagger.inflector.models.ResponseContext; +import javax.ws.rs.core.Response.Status; + +import org.glassfish.jersey.media.multipart.FormDataContentDisposition; +import java.io.File; +import java.util.List; + +import io.swagger.model.*; + +import java.util.Map; +import io.swagger.model.Order; + + +public class StoreController { + /** + * Uncomment and implement as you see fit. These operations will map + * Directly to operation calls from the routing logic. Because the inflector + * Code allows you to implement logic incrementally, they are disabled. + **/ + + /* + public ResponseContext deleteOrder(RequestContext request , String orderId) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext getInventory(RequestContext request ) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext getOrderById(RequestContext request , Long orderId) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext placeOrder(RequestContext request , Order body) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + +} + diff --git a/samples/server/petstore/java-inflector/src/main/java/io/swagger/controllers/UserController.java b/samples/server/petstore/java-inflector/src/main/java/io/swagger/controllers/UserController.java new file mode 100644 index 0000000000..907b5100fa --- /dev/null +++ b/samples/server/petstore/java-inflector/src/main/java/io/swagger/controllers/UserController.java @@ -0,0 +1,73 @@ +package io.swagger.controllers; + +import io.swagger.inflector.models.RequestContext; +import io.swagger.inflector.models.ResponseContext; +import javax.ws.rs.core.Response.Status; + +import org.glassfish.jersey.media.multipart.FormDataContentDisposition; +import java.io.File; +import java.util.List; + +import io.swagger.model.*; + +import java.util.List; +import io.swagger.model.User; + + +public class UserController { + /** + * Uncomment and implement as you see fit. These operations will map + * Directly to operation calls from the routing logic. Because the inflector + * Code allows you to implement logic incrementally, they are disabled. + **/ + + /* + public ResponseContext createUser(RequestContext request , User body) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext createUsersWithArrayInput(RequestContext request , List body) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext createUsersWithListInput(RequestContext request , List body) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext deleteUser(RequestContext request , String username) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext getUserByName(RequestContext request , String username) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext loginUser(RequestContext request , String username, String password) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext logoutUser(RequestContext request ) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + + /* + public ResponseContext updateUser(RequestContext request , String username, User body) { + return new ResponseContext().status(Status.INTERNAL_SERVER_ERROR).entity( "Not implemented" ); + } + */ + +} + diff --git a/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml b/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml index 9258d1ae2d..34aa0e3f53 100644 --- a/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml +++ b/samples/server/petstore/java-inflector/src/main/swagger/swagger.yaml @@ -109,11 +109,11 @@ paths: type: "array" items: type: "string" + default: "available" enum: - "available" - "pending" - "sold" - default: "available" collectionFormat: "csv" responses: 200: @@ -623,10 +623,10 @@ paths: type: "array" items: type: "string" + default: "$" enum: - ">" - "$" - default: "$" - name: "enum_form_string" in: "formData" description: "Form parameter enum test (string)" @@ -644,10 +644,10 @@ paths: type: "array" items: type: "string" + default: "$" enum: - ">" - "$" - default: "$" - name: "enum_header_string" in: "header" description: "Header parameter enum test (string)" @@ -665,10 +665,10 @@ paths: type: "array" items: type: "string" + default: "$" enum: - ">" - "$" - default: "$" - name: "enum_query_string" in: "query" description: "Query parameter enum test (string)" @@ -964,6 +964,13 @@ definitions: complete: type: "boolean" default: false + example: + petId: 6 + quantity: 1 + id: 0 + shipDate: "2000-01-23T04:56:07.000+00:00" + complete: false + status: "placed" xml: name: "Order" Category: @@ -974,6 +981,9 @@ definitions: format: "int64" name: type: "string" + example: + name: "aeiou" + id: 6 xml: name: "Category" User: @@ -999,6 +1009,15 @@ definitions: type: "integer" format: "int32" description: "User Status" + example: + firstName: "aeiou" + lastName: "aeiou" + password: "aeiou" + userStatus: 6 + phone: "aeiou" + id: 0 + email: "aeiou" + username: "aeiou" xml: name: "User" Tag: @@ -1009,6 +1028,9 @@ definitions: format: "int64" name: type: "string" + example: + name: "aeiou" + id: 1 xml: name: "Tag" Pet: @@ -1047,6 +1069,18 @@ definitions: - "available" - "pending" - "sold" + example: + photoUrls: + - "aeiou" + name: "doggie" + id: 0 + category: + name: "aeiou" + id: 6 + tags: + - name: "aeiou" + id: 1 + status: "available" xml: name: "Pet" ApiResponse: @@ -1059,6 +1093,10 @@ definitions: type: "string" message: type: "string" + example: + code: 0 + type: "aeiou" + message: "aeiou" $special[model.name]: properties: $special[property.name]: @@ -1260,6 +1298,8 @@ definitions: properties: client: type: "string" + example: + client: "aeiou" ReadOnlyFirst: type: "object" properties: @@ -1386,6 +1426,10 @@ definitions: $ref: "#/definitions/OuterString" my_boolean: $ref: "#/definitions/OuterBoolean" + example: + my_string: {} + my_number: {} + my_boolean: {} externalDocs: description: "Find out more about Swagger" url: "http://swagger.io" diff --git a/samples/server/petstore/java-msf4j/.swagger-codegen/VERSION b/samples/server/petstore/java-msf4j/.swagger-codegen/VERSION index 7fea99011a..f9f7450d13 100644 --- a/samples/server/petstore/java-msf4j/.swagger-codegen/VERSION +++ b/samples/server/petstore/java-msf4j/.swagger-codegen/VERSION @@ -1 +1 @@ -2.2.3-SNAPSHOT \ No newline at end of file +2.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework/.swagger-codegen/VERSION b/samples/server/petstore/java-play-framework/.swagger-codegen/VERSION index 7fea99011a..f9f7450d13 100644 --- a/samples/server/petstore/java-play-framework/.swagger-codegen/VERSION +++ b/samples/server/petstore/java-play-framework/.swagger-codegen/VERSION @@ -1 +1 @@ -2.2.3-SNAPSHOT \ No newline at end of file +2.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework/public/swagger.json b/samples/server/petstore/java-play-framework/public/swagger.json index 3446ff8eac..c2d08f8e01 100644 --- a/samples/server/petstore/java-play-framework/public/swagger.json +++ b/samples/server/petstore/java-play-framework/public/swagger.json @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "enum" : [ "available", "pending", "sold" ], - "default" : "available" + "default" : "available", + "enum" : [ "available", "pending", "sold" ] }, "collectionFormat" : "csv" } ], @@ -723,6 +723,14 @@ }, "title" : "Pet Order", "description" : "An order for a pets from the pet store", + "example" : { + "petId" : 6, + "quantity" : 1, + "id" : 0, + "shipDate" : "2000-01-23T04:56:07.000+00:00", + "complete" : false, + "status" : "placed" + }, "xml" : { "name" : "Order" } @@ -740,6 +748,10 @@ }, "title" : "Pet catehgry", "description" : "A category for a pet", + "example" : { + "name" : "aeiou", + "id" : 6 + }, "xml" : { "name" : "Category" } @@ -777,6 +789,16 @@ }, "title" : "a User", "description" : "A User who is purchasing from the pet store", + "example" : { + "firstName" : "aeiou", + "lastName" : "aeiou", + "password" : "aeiou", + "userStatus" : 6, + "phone" : "aeiou", + "id" : 0, + "email" : "aeiou", + "username" : "aeiou" + }, "xml" : { "name" : "User" } @@ -794,6 +816,10 @@ }, "title" : "Pet Tag", "description" : "A tag for a pet", + "example" : { + "name" : "aeiou", + "id" : 1 + }, "xml" : { "name" : "Tag" } @@ -841,6 +867,20 @@ }, "title" : "a Pet", "description" : "A pet for sale in the pet store", + "example" : { + "photoUrls" : [ "aeiou" ], + "name" : "doggie", + "id" : 0, + "category" : { + "name" : "aeiou", + "id" : 6 + }, + "tags" : [ { + "name" : "aeiou", + "id" : 1 + } ], + "status" : "available" + }, "xml" : { "name" : "Pet" } @@ -860,7 +900,12 @@ } }, "title" : "An uploaded response", - "description" : "Describes the result of uploading an image resource" + "description" : "Describes the result of uploading an image resource", + "example" : { + "code" : 0, + "type" : "aeiou", + "message" : "aeiou" + } } }, "externalDocs" : { diff --git a/samples/server/petstore/undertow/.swagger-codegen/VERSION b/samples/server/petstore/undertow/.swagger-codegen/VERSION index 7fea99011a..f9f7450d13 100644 --- a/samples/server/petstore/undertow/.swagger-codegen/VERSION +++ b/samples/server/petstore/undertow/.swagger-codegen/VERSION @@ -1 +1 @@ -2.2.3-SNAPSHOT \ No newline at end of file +2.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/undertow/src/main/resources/config/swagger.json b/samples/server/petstore/undertow/src/main/resources/config/swagger.json index 3446ff8eac..c2d08f8e01 100644 --- a/samples/server/petstore/undertow/src/main/resources/config/swagger.json +++ b/samples/server/petstore/undertow/src/main/resources/config/swagger.json @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "enum" : [ "available", "pending", "sold" ], - "default" : "available" + "default" : "available", + "enum" : [ "available", "pending", "sold" ] }, "collectionFormat" : "csv" } ], @@ -723,6 +723,14 @@ }, "title" : "Pet Order", "description" : "An order for a pets from the pet store", + "example" : { + "petId" : 6, + "quantity" : 1, + "id" : 0, + "shipDate" : "2000-01-23T04:56:07.000+00:00", + "complete" : false, + "status" : "placed" + }, "xml" : { "name" : "Order" } @@ -740,6 +748,10 @@ }, "title" : "Pet catehgry", "description" : "A category for a pet", + "example" : { + "name" : "aeiou", + "id" : 6 + }, "xml" : { "name" : "Category" } @@ -777,6 +789,16 @@ }, "title" : "a User", "description" : "A User who is purchasing from the pet store", + "example" : { + "firstName" : "aeiou", + "lastName" : "aeiou", + "password" : "aeiou", + "userStatus" : 6, + "phone" : "aeiou", + "id" : 0, + "email" : "aeiou", + "username" : "aeiou" + }, "xml" : { "name" : "User" } @@ -794,6 +816,10 @@ }, "title" : "Pet Tag", "description" : "A tag for a pet", + "example" : { + "name" : "aeiou", + "id" : 1 + }, "xml" : { "name" : "Tag" } @@ -841,6 +867,20 @@ }, "title" : "a Pet", "description" : "A pet for sale in the pet store", + "example" : { + "photoUrls" : [ "aeiou" ], + "name" : "doggie", + "id" : 0, + "category" : { + "name" : "aeiou", + "id" : 6 + }, + "tags" : [ { + "name" : "aeiou", + "id" : 1 + } ], + "status" : "available" + }, "xml" : { "name" : "Pet" } @@ -860,7 +900,12 @@ } }, "title" : "An uploaded response", - "description" : "Describes the result of uploading an image resource" + "description" : "Describes the result of uploading an image resource", + "example" : { + "code" : 0, + "type" : "aeiou", + "message" : "aeiou" + } } }, "externalDocs" : { From 801574421280eac4ba505b7c69d30843959832b4 Mon Sep 17 00:00:00 2001 From: wing328 Date: Thu, 29 Jun 2017 13:53:37 +0800 Subject: [PATCH 09/20] update java petstore samples --- .../petstore/java/jersey1/docs/FakeApi.md | 2 +- .../petstore/java/jersey2-java6/build.gradle | 10 +-- .../petstore/java/jersey2-java6/build.sbt | 20 ++--- .../java/jersey2-java6/docs/FakeApi.md | 2 +- .../petstore/java/jersey2-java6/pom.xml | 10 +-- .../java/io/swagger/client/ApiClient.java | 88 ++++++++++--------- .../petstore/java/jersey2-java8/build.gradle | 6 +- .../petstore/java/jersey2-java8/build.sbt | 17 ++-- .../java/jersey2-java8/docs/FakeApi.md | 2 +- .../petstore/java/jersey2-java8/pom.xml | 6 +- .../java/io/swagger/client/ApiClient.java | 88 ++++++++++--------- .../client/petstore/java/jersey2/build.gradle | 8 +- .../client/petstore/java/jersey2/build.sbt | 18 ++-- .../petstore/java/jersey2/docs/FakeApi.md | 2 +- samples/client/petstore/java/jersey2/pom.xml | 8 +- .../java/io/swagger/client/ApiClient.java | 88 ++++++++++--------- .../docs/FakeApi.md | 2 +- .../petstore/java/okhttp-gson/docs/FakeApi.md | 2 +- .../petstore/java/resteasy/docs/FakeApi.md | 2 +- samples/client/petstore/java/resteasy/pom.xml | 2 +- .../petstore/java/resttemplate/build.gradle | 8 +- .../java/resttemplate/docs/FakeApi.md | 2 +- .../client/petstore/java/resttemplate/pom.xml | 8 +- samples/client/petstore/java/retrofit/pom.xml | 4 +- .../java/retrofit2-play24/build.gradle | 6 +- .../petstore/java/retrofit2-play24/build.sbt | 10 +-- .../java/retrofit2-play24/docs/FakeApi.md | 2 +- .../petstore/java/retrofit2-play24/pom.xml | 8 +- .../io/swagger/client/model/FormatTest.java | 2 +- .../petstore/java/retrofit2/docs/FakeApi.md | 2 +- .../petstore/java/retrofit2rx/docs/FakeApi.md | 2 +- .../java/retrofit2rx2/docs/FakeApi.md | 2 +- 32 files changed, 232 insertions(+), 207 deletions(-) diff --git a/samples/client/petstore/java/jersey1/docs/FakeApi.md b/samples/client/petstore/java/jersey1/docs/FakeApi.md index 5219c54115..8da2074348 100644 --- a/samples/client/petstore/java/jersey1/docs/FakeApi.md +++ b/samples/client/petstore/java/jersey1/docs/FakeApi.md @@ -266,7 +266,7 @@ FakeApi apiInstance = new FakeApi(); BigDecimal number = new BigDecimal(); // BigDecimal | None Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None -byte[] _byte = B; // byte[] | None +byte[] _byte = _byte_example; // byte[] | None Integer integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 789L; // Long | None diff --git a/samples/client/petstore/java/jersey2-java6/build.gradle b/samples/client/petstore/java/jersey2-java6/build.gradle index a069e61270..4809dcd79a 100644 --- a/samples/client/petstore/java/jersey2-java6/build.gradle +++ b/samples/client/petstore/java/jersey2-java6/build.gradle @@ -93,12 +93,12 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.8" - jackson_version = "2.7.5" - jersey_version = "2.22.2" - jodatime_version = "2.9.4" + swagger_annotations_version = "1.5.15" + jackson_version = "2.8.9" + jersey_version = "2.25.1" + jodatime_version = "2.9.9" commons_io_version=2.5 - commons_lang3_version=3.5 + commons_lang3_version=3.6 junit_version = "4.12" } diff --git a/samples/client/petstore/java/jersey2-java6/build.sbt b/samples/client/petstore/java/jersey2-java6/build.sbt index d1d444bee2..05f502ac4a 100644 --- a/samples/client/petstore/java/jersey2-java6/build.sbt +++ b/samples/client/petstore/java/jersey2-java6/build.sbt @@ -9,17 +9,17 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( - "io.swagger" % "swagger-annotations" % "1.5.8", - "org.glassfish.jersey.core" % "jersey-client" % "2.22.2", - "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.22.2", - "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.22.2", - "com.fasterxml.jackson.core" % "jackson-core" % "2.7.5", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5", - "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.7.5", - "joda-time" % "joda-time" % "2.9.4", + "io.swagger" % "swagger-annotations" % "1.5.15", + "org.glassfish.jersey.core" % "jersey-client" % "2.25.1", + "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.25.1", + "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.25.1", + "com.fasterxml.jackson.core" % "jackson-core" % "2.8.9", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.9", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.9", + "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.8.9", + "joda-time" % "joda-time" % "2.9.9", "com.brsanthu" % "migbase64" % "2.2", - "org.apache.commons" % "commons-lang3" % "3.5", + "org.apache.commons" % "commons-lang3" % "3.6", "commons-io" % "commons-io" % "2.5", "junit" % "junit" % "4.12" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" diff --git a/samples/client/petstore/java/jersey2-java6/docs/FakeApi.md b/samples/client/petstore/java/jersey2-java6/docs/FakeApi.md index 5219c54115..8da2074348 100644 --- a/samples/client/petstore/java/jersey2-java6/docs/FakeApi.md +++ b/samples/client/petstore/java/jersey2-java6/docs/FakeApi.md @@ -266,7 +266,7 @@ FakeApi apiInstance = new FakeApi(); BigDecimal number = new BigDecimal(); // BigDecimal | None Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None -byte[] _byte = B; // byte[] | None +byte[] _byte = _byte_example; // byte[] | None Integer integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 789L; // Long | None diff --git a/samples/client/petstore/java/jersey2-java6/pom.xml b/samples/client/petstore/java/jersey2-java6/pom.xml index c5f68e3008..10c36abe73 100644 --- a/samples/client/petstore/java/jersey2-java6/pom.xml +++ b/samples/client/petstore/java/jersey2-java6/pom.xml @@ -255,12 +255,12 @@ - 1.5.12 - 2.22.2 - 2.7.5 - 2.9.4 + 1.5.15 + 2.25.1 + 2.8.9 + 2.9.9 2.5 - 3.5 + 3.6 1.0.0 4.12 diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/ApiClient.java index 938b7521e6..79df237e1d 100644 --- a/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/ApiClient.java @@ -671,48 +671,56 @@ public class ApiClient { Entity entity = serialize(body, formParams, contentType); - Response response; + Response response = null; - if ("GET".equals(method)) { - response = invocationBuilder.get(); - } else if ("POST".equals(method)) { - response = invocationBuilder.post(entity); - } else if ("PUT".equals(method)) { - response = invocationBuilder.put(entity); - } else if ("DELETE".equals(method)) { - response = invocationBuilder.delete(); - } else if ("PATCH".equals(method)) { - response = invocationBuilder.header("X-HTTP-Method-Override", "PATCH").post(entity); - } else { - throw new ApiException(500, "unknown method type " + method); - } - - statusCode = response.getStatusInfo().getStatusCode(); - responseHeaders = buildResponseHeaders(response); - - if (response.getStatus() == Status.NO_CONTENT.getStatusCode()) { - return null; - } else if (response.getStatusInfo().getFamily() == Status.Family.SUCCESSFUL) { - if (returnType == null) - return null; - else - return deserialize(response, returnType); - } else { - String message = "error"; - String respBody = null; - if (response.hasEntity()) { - try { - respBody = String.valueOf(response.readEntity(String.class)); - message = respBody; - } catch (RuntimeException e) { - // e.printStackTrace(); - } + try { + if ("GET".equals(method)) { + response = invocationBuilder.get(); + } else if ("POST".equals(method)) { + response = invocationBuilder.post(entity); + } else if ("PUT".equals(method)) { + response = invocationBuilder.put(entity); + } else if ("DELETE".equals(method)) { + response = invocationBuilder.delete(); + } else if ("PATCH".equals(method)) { + response = invocationBuilder.header("X-HTTP-Method-Override", "PATCH").post(entity); + } else { + throw new ApiException(500, "unknown method type " + method); + } + + statusCode = response.getStatusInfo().getStatusCode(); + responseHeaders = buildResponseHeaders(response); + + if (response.getStatus() == Status.NO_CONTENT.getStatusCode()) { + return null; + } else if (response.getStatusInfo().getFamily() == Status.Family.SUCCESSFUL) { + if (returnType == null) + return null; + else + return deserialize(response, returnType); + } else { + String message = "error"; + String respBody = null; + if (response.hasEntity()) { + try { + respBody = String.valueOf(response.readEntity(String.class)); + message = respBody; + } catch (RuntimeException e) { + // e.printStackTrace(); + } + } + throw new ApiException( + response.getStatus(), + message, + buildResponseHeaders(response), + respBody); + } + } finally { + try { + response.close(); + } catch (Exception e) { + // it's not critical, since the response object is local in method invokeAPI; that's fine, just continue } - throw new ApiException( - response.getStatus(), - message, - buildResponseHeaders(response), - respBody); } } diff --git a/samples/client/petstore/java/jersey2-java8/build.gradle b/samples/client/petstore/java/jersey2-java8/build.gradle index 4aa158e8bd..bf5a6b8d23 100644 --- a/samples/client/petstore/java/jersey2-java8/build.gradle +++ b/samples/client/petstore/java/jersey2-java8/build.gradle @@ -93,9 +93,9 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.8" - jackson_version = "2.7.5" - jersey_version = "2.22.2" + swagger_annotations_version = "1.5.15" + jackson_version = "2.8.9" + jersey_version = "2.25.1" junit_version = "4.12" } diff --git a/samples/client/petstore/java/jersey2-java8/build.sbt b/samples/client/petstore/java/jersey2-java8/build.sbt index bc4a50dc3c..4d2a46846f 100644 --- a/samples/client/petstore/java/jersey2-java8/build.sbt +++ b/samples/client/petstore/java/jersey2-java8/build.sbt @@ -9,14 +9,15 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( - "io.swagger" % "swagger-annotations" % "1.5.8", - "org.glassfish.jersey.core" % "jersey-client" % "2.22.2", - "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.22.2", - "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.22.2", - "com.fasterxml.jackson.core" % "jackson-core" % "2.7.5", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5", - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.7.5", + "io.swagger" % "swagger-annotations" % "1.5.15", + "org.glassfish.jersey.core" % "jersey-client" % "2.25.1", + "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.25.1", + "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.25.1", + "com.fasterxml.jackson.core" % "jackson-core" % "2.8.9", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.9", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.9", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.8.9", + "com.brsanthu" % "migbase64" % "2.2", "junit" % "junit" % "4.12" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/samples/client/petstore/java/jersey2-java8/docs/FakeApi.md b/samples/client/petstore/java/jersey2-java8/docs/FakeApi.md index 87e4b69c8e..98928ca055 100644 --- a/samples/client/petstore/java/jersey2-java8/docs/FakeApi.md +++ b/samples/client/petstore/java/jersey2-java8/docs/FakeApi.md @@ -266,7 +266,7 @@ FakeApi apiInstance = new FakeApi(); BigDecimal number = new BigDecimal(); // BigDecimal | None Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None -byte[] _byte = B; // byte[] | None +byte[] _byte = _byte_example; // byte[] | None Integer integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 789L; // Long | None diff --git a/samples/client/petstore/java/jersey2-java8/pom.xml b/samples/client/petstore/java/jersey2-java8/pom.xml index 34b327ff63..e244229dd2 100644 --- a/samples/client/petstore/java/jersey2-java8/pom.xml +++ b/samples/client/petstore/java/jersey2-java8/pom.xml @@ -232,9 +232,9 @@ - 1.5.12 - 2.22.2 - 2.7.5 + 1.5.15 + 2.25.1 + 2.8.9 1.0.0 4.12 diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/ApiClient.java index 0995fbc3df..16b5e5796d 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/ApiClient.java @@ -671,48 +671,56 @@ public class ApiClient { Entity entity = serialize(body, formParams, contentType); - Response response; + Response response = null; - if ("GET".equals(method)) { - response = invocationBuilder.get(); - } else if ("POST".equals(method)) { - response = invocationBuilder.post(entity); - } else if ("PUT".equals(method)) { - response = invocationBuilder.put(entity); - } else if ("DELETE".equals(method)) { - response = invocationBuilder.delete(); - } else if ("PATCH".equals(method)) { - response = invocationBuilder.header("X-HTTP-Method-Override", "PATCH").post(entity); - } else { - throw new ApiException(500, "unknown method type " + method); - } - - statusCode = response.getStatusInfo().getStatusCode(); - responseHeaders = buildResponseHeaders(response); - - if (response.getStatus() == Status.NO_CONTENT.getStatusCode()) { - return null; - } else if (response.getStatusInfo().getFamily() == Status.Family.SUCCESSFUL) { - if (returnType == null) - return null; - else - return deserialize(response, returnType); - } else { - String message = "error"; - String respBody = null; - if (response.hasEntity()) { - try { - respBody = String.valueOf(response.readEntity(String.class)); - message = respBody; - } catch (RuntimeException e) { - // e.printStackTrace(); - } + try { + if ("GET".equals(method)) { + response = invocationBuilder.get(); + } else if ("POST".equals(method)) { + response = invocationBuilder.post(entity); + } else if ("PUT".equals(method)) { + response = invocationBuilder.put(entity); + } else if ("DELETE".equals(method)) { + response = invocationBuilder.delete(); + } else if ("PATCH".equals(method)) { + response = invocationBuilder.header("X-HTTP-Method-Override", "PATCH").post(entity); + } else { + throw new ApiException(500, "unknown method type " + method); + } + + statusCode = response.getStatusInfo().getStatusCode(); + responseHeaders = buildResponseHeaders(response); + + if (response.getStatus() == Status.NO_CONTENT.getStatusCode()) { + return null; + } else if (response.getStatusInfo().getFamily() == Status.Family.SUCCESSFUL) { + if (returnType == null) + return null; + else + return deserialize(response, returnType); + } else { + String message = "error"; + String respBody = null; + if (response.hasEntity()) { + try { + respBody = String.valueOf(response.readEntity(String.class)); + message = respBody; + } catch (RuntimeException e) { + // e.printStackTrace(); + } + } + throw new ApiException( + response.getStatus(), + message, + buildResponseHeaders(response), + respBody); + } + } finally { + try { + response.close(); + } catch (Exception e) { + // it's not critical, since the response object is local in method invokeAPI; that's fine, just continue } - throw new ApiException( - response.getStatus(), - message, - buildResponseHeaders(response), - respBody); } } diff --git a/samples/client/petstore/java/jersey2/build.gradle b/samples/client/petstore/java/jersey2/build.gradle index f20bda6db1..2290cd0f1e 100644 --- a/samples/client/petstore/java/jersey2/build.gradle +++ b/samples/client/petstore/java/jersey2/build.gradle @@ -93,10 +93,10 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.8" - jackson_version = "2.7.5" - jersey_version = "2.22.2" - jodatime_version = "2.9.4" + swagger_annotations_version = "1.5.15" + jackson_version = "2.8.9" + jersey_version = "2.25.1" + jodatime_version = "2.9.9" junit_version = "4.12" } diff --git a/samples/client/petstore/java/jersey2/build.sbt b/samples/client/petstore/java/jersey2/build.sbt index 555b44f16d..9a516c92cf 100644 --- a/samples/client/petstore/java/jersey2/build.sbt +++ b/samples/client/petstore/java/jersey2/build.sbt @@ -9,15 +9,15 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( - "io.swagger" % "swagger-annotations" % "1.5.8", - "org.glassfish.jersey.core" % "jersey-client" % "2.22.2", - "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.22.2", - "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.22.2", - "com.fasterxml.jackson.core" % "jackson-core" % "2.7.5", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5", - "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.7.5", - "joda-time" % "joda-time" % "2.9.4", + "io.swagger" % "swagger-annotations" % "1.5.15", + "org.glassfish.jersey.core" % "jersey-client" % "2.25.1", + "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.25.1", + "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.25.1", + "com.fasterxml.jackson.core" % "jackson-core" % "2.8.9", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.9", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.9", + "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.8.9", + "joda-time" % "joda-time" % "2.9.9", "com.brsanthu" % "migbase64" % "2.2", "junit" % "junit" % "4.12" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" diff --git a/samples/client/petstore/java/jersey2/docs/FakeApi.md b/samples/client/petstore/java/jersey2/docs/FakeApi.md index 5219c54115..8da2074348 100644 --- a/samples/client/petstore/java/jersey2/docs/FakeApi.md +++ b/samples/client/petstore/java/jersey2/docs/FakeApi.md @@ -266,7 +266,7 @@ FakeApi apiInstance = new FakeApi(); BigDecimal number = new BigDecimal(); // BigDecimal | None Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None -byte[] _byte = B; // byte[] | None +byte[] _byte = _byte_example; // byte[] | None Integer integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 789L; // Long | None diff --git a/samples/client/petstore/java/jersey2/pom.xml b/samples/client/petstore/java/jersey2/pom.xml index c8ce44478d..2b114d13bb 100644 --- a/samples/client/petstore/java/jersey2/pom.xml +++ b/samples/client/petstore/java/jersey2/pom.xml @@ -244,10 +244,10 @@ - 1.5.12 - 2.22.2 - 2.7.5 - 2.9.4 + 1.5.15 + 2.25.1 + 2.8.9 + 2.9.9 1.0.0 4.12 diff --git a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java index 0995fbc3df..16b5e5796d 100644 --- a/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/ApiClient.java @@ -671,48 +671,56 @@ public class ApiClient { Entity entity = serialize(body, formParams, contentType); - Response response; + Response response = null; - if ("GET".equals(method)) { - response = invocationBuilder.get(); - } else if ("POST".equals(method)) { - response = invocationBuilder.post(entity); - } else if ("PUT".equals(method)) { - response = invocationBuilder.put(entity); - } else if ("DELETE".equals(method)) { - response = invocationBuilder.delete(); - } else if ("PATCH".equals(method)) { - response = invocationBuilder.header("X-HTTP-Method-Override", "PATCH").post(entity); - } else { - throw new ApiException(500, "unknown method type " + method); - } - - statusCode = response.getStatusInfo().getStatusCode(); - responseHeaders = buildResponseHeaders(response); - - if (response.getStatus() == Status.NO_CONTENT.getStatusCode()) { - return null; - } else if (response.getStatusInfo().getFamily() == Status.Family.SUCCESSFUL) { - if (returnType == null) - return null; - else - return deserialize(response, returnType); - } else { - String message = "error"; - String respBody = null; - if (response.hasEntity()) { - try { - respBody = String.valueOf(response.readEntity(String.class)); - message = respBody; - } catch (RuntimeException e) { - // e.printStackTrace(); - } + try { + if ("GET".equals(method)) { + response = invocationBuilder.get(); + } else if ("POST".equals(method)) { + response = invocationBuilder.post(entity); + } else if ("PUT".equals(method)) { + response = invocationBuilder.put(entity); + } else if ("DELETE".equals(method)) { + response = invocationBuilder.delete(); + } else if ("PATCH".equals(method)) { + response = invocationBuilder.header("X-HTTP-Method-Override", "PATCH").post(entity); + } else { + throw new ApiException(500, "unknown method type " + method); + } + + statusCode = response.getStatusInfo().getStatusCode(); + responseHeaders = buildResponseHeaders(response); + + if (response.getStatus() == Status.NO_CONTENT.getStatusCode()) { + return null; + } else if (response.getStatusInfo().getFamily() == Status.Family.SUCCESSFUL) { + if (returnType == null) + return null; + else + return deserialize(response, returnType); + } else { + String message = "error"; + String respBody = null; + if (response.hasEntity()) { + try { + respBody = String.valueOf(response.readEntity(String.class)); + message = respBody; + } catch (RuntimeException e) { + // e.printStackTrace(); + } + } + throw new ApiException( + response.getStatus(), + message, + buildResponseHeaders(response), + respBody); + } + } finally { + try { + response.close(); + } catch (Exception e) { + // it's not critical, since the response object is local in method invokeAPI; that's fine, just continue } - throw new ApiException( - response.getStatus(), - message, - buildResponseHeaders(response), - respBody); } } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeApi.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeApi.md index 5219c54115..8da2074348 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeApi.md +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeApi.md @@ -266,7 +266,7 @@ FakeApi apiInstance = new FakeApi(); BigDecimal number = new BigDecimal(); // BigDecimal | None Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None -byte[] _byte = B; // byte[] | None +byte[] _byte = _byte_example; // byte[] | None Integer integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 789L; // Long | None diff --git a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md index 5219c54115..8da2074348 100644 --- a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md +++ b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md @@ -266,7 +266,7 @@ FakeApi apiInstance = new FakeApi(); BigDecimal number = new BigDecimal(); // BigDecimal | None Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None -byte[] _byte = B; // byte[] | None +byte[] _byte = _byte_example; // byte[] | None Integer integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 789L; // Long | None diff --git a/samples/client/petstore/java/resteasy/docs/FakeApi.md b/samples/client/petstore/java/resteasy/docs/FakeApi.md index 5219c54115..8da2074348 100644 --- a/samples/client/petstore/java/resteasy/docs/FakeApi.md +++ b/samples/client/petstore/java/resteasy/docs/FakeApi.md @@ -266,7 +266,7 @@ FakeApi apiInstance = new FakeApi(); BigDecimal number = new BigDecimal(); // BigDecimal | None Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None -byte[] _byte = B; // byte[] | None +byte[] _byte = _byte_example; // byte[] | None Integer integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 789L; // Long | None diff --git a/samples/client/petstore/java/resteasy/pom.xml b/samples/client/petstore/java/resteasy/pom.xml index c0a928de64..ae330202da 100644 --- a/samples/client/petstore/java/resteasy/pom.xml +++ b/samples/client/petstore/java/resteasy/pom.xml @@ -165,7 +165,7 @@ org.jboss.resteasy resteasy-jackson-provider - 2.3.4.Final + 3.1.3.Final diff --git a/samples/client/petstore/java/resttemplate/build.gradle b/samples/client/petstore/java/resttemplate/build.gradle index ab71189322..eeb852d309 100644 --- a/samples/client/petstore/java/resttemplate/build.gradle +++ b/samples/client/petstore/java/resttemplate/build.gradle @@ -94,10 +94,10 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.8" - jackson_version = "2.8.8" - spring_web_version = "4.3.7.RELEASE" - jodatime_version = "2.9.4" + swagger_annotations_version = "1.5.15" + jackson_version = "2.8.9" + spring_web_version = "4.3.9.RELEASE" + jodatime_version = "2.9.9" junit_version = "4.12" } diff --git a/samples/client/petstore/java/resttemplate/docs/FakeApi.md b/samples/client/petstore/java/resttemplate/docs/FakeApi.md index 5219c54115..8da2074348 100644 --- a/samples/client/petstore/java/resttemplate/docs/FakeApi.md +++ b/samples/client/petstore/java/resttemplate/docs/FakeApi.md @@ -266,7 +266,7 @@ FakeApi apiInstance = new FakeApi(); BigDecimal number = new BigDecimal(); // BigDecimal | None Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None -byte[] _byte = B; // byte[] | None +byte[] _byte = _byte_example; // byte[] | None Integer integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 789L; // Long | None diff --git a/samples/client/petstore/java/resttemplate/pom.xml b/samples/client/petstore/java/resttemplate/pom.xml index f5b77cc1e7..01059b5fcb 100644 --- a/samples/client/petstore/java/resttemplate/pom.xml +++ b/samples/client/petstore/java/resttemplate/pom.xml @@ -233,10 +233,10 @@ UTF-8 - 1.5.8 - 4.3.7.RELEASE - 2.8.8 - 2.9.4 + 1.5.15 + 4.3.9.RELEASE + 2.8.9 + 2.9.9 1.0.0 4.12 diff --git a/samples/client/petstore/java/retrofit/pom.xml b/samples/client/petstore/java/retrofit/pom.xml index cb50ddea34..ffb62b3f28 100644 --- a/samples/client/petstore/java/retrofit/pom.xml +++ b/samples/client/petstore/java/retrofit/pom.xml @@ -213,10 +213,10 @@ - 1.5.12 + 1.5.15 1.9.0 2.7.5 - 2.9.3 + 2.9.9 1.0.1 1.0.0 4.12 diff --git a/samples/client/petstore/java/retrofit2-play24/build.gradle b/samples/client/petstore/java/retrofit2-play24/build.gradle index d5624f8999..660aa9a74f 100644 --- a/samples/client/petstore/java/retrofit2-play24/build.gradle +++ b/samples/client/petstore/java/retrofit2-play24/build.gradle @@ -96,11 +96,11 @@ if(hasProperty('target') && target == 'android') { ext { oltu_version = "1.0.1" retrofit_version = "2.1.0" - jackson_version = "2.7.5" + jackson_version = "2.8.9" play_version = "2.4.11" - swagger_annotations_version = "1.5.12" + swagger_annotations_version = "1.5.15" junit_version = "4.12" - jodatime_version = "2.9.4" + jodatime_version = "2.9.9" } dependencies { diff --git a/samples/client/petstore/java/retrofit2-play24/build.sbt b/samples/client/petstore/java/retrofit2-play24/build.sbt index feceac08cf..60a3d4c78e 100644 --- a/samples/client/petstore/java/retrofit2-play24/build.sbt +++ b/samples/client/petstore/java/retrofit2-play24/build.sbt @@ -14,12 +14,12 @@ lazy val root = (project in file(".")). "com.squareup.retrofit2" % "converter-scalars" % "2.1.0" % "compile", "com.squareup.retrofit2" % "converter-gson" % "2.1.0" % "compile", "com.squareup.retrofit2" % "converter-jackson" % "2.1.0" % "compile", - "com.fasterxml.jackson.core" % "jackson-core" % "2.7.5" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5" % "compile", - "io.swagger" % "swagger-annotations" % "1.5.12" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.8.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.9" % "compile", + "io.swagger" % "swagger-annotations" % "1.5.15" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", - "joda-time" % "joda-time" % "2.9.4" % "compile", + "joda-time" % "joda-time" % "2.9.9" % "compile", "junit" % "junit" % "4.12" % "test", "com.novocode" % "junit-interface" % "0.11" % "test" ) diff --git a/samples/client/petstore/java/retrofit2-play24/docs/FakeApi.md b/samples/client/petstore/java/retrofit2-play24/docs/FakeApi.md index 2bc252c751..b83ed56563 100644 --- a/samples/client/petstore/java/retrofit2-play24/docs/FakeApi.md +++ b/samples/client/petstore/java/retrofit2-play24/docs/FakeApi.md @@ -266,7 +266,7 @@ FakeApi apiInstance = new FakeApi(); BigDecimal number = new BigDecimal(); // BigDecimal | None Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None -byte[] _byte = B; // byte[] | None +byte[] _byte = _byte_example; // byte[] | None Integer integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 789L; // Long | None diff --git a/samples/client/petstore/java/retrofit2-play24/pom.xml b/samples/client/petstore/java/retrofit2-play24/pom.xml index 6693f615e6..f711d86178 100644 --- a/samples/client/petstore/java/retrofit2-play24/pom.xml +++ b/samples/client/petstore/java/retrofit2-play24/pom.xml @@ -246,11 +246,11 @@ 1.7 ${java.version} ${java.version} - 1.5.12 - 2.7.5 + 1.5.15 + 2.8.9 2.4.11 - 2.2.0 - 2.9.4 + 2.3.0 + 2.9.9 1.0.1 4.12 diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/FormatTest.java index feab1d429d..8f6fe4898d 100644 --- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/FormatTest.java +++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/model/FormatTest.java @@ -218,7 +218,7 @@ public class FormatTest { * @return _byte **/ @NotNull - @ApiModelProperty(required = true, value = "") + @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") @ApiModelProperty(required = true, value = "") public byte[] getByte() { return _byte; } diff --git a/samples/client/petstore/java/retrofit2/docs/FakeApi.md b/samples/client/petstore/java/retrofit2/docs/FakeApi.md index 2bc252c751..b83ed56563 100644 --- a/samples/client/petstore/java/retrofit2/docs/FakeApi.md +++ b/samples/client/petstore/java/retrofit2/docs/FakeApi.md @@ -266,7 +266,7 @@ FakeApi apiInstance = new FakeApi(); BigDecimal number = new BigDecimal(); // BigDecimal | None Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None -byte[] _byte = B; // byte[] | None +byte[] _byte = _byte_example; // byte[] | None Integer integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 789L; // Long | None diff --git a/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md b/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md index 2bc252c751..b83ed56563 100644 --- a/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md +++ b/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md @@ -266,7 +266,7 @@ FakeApi apiInstance = new FakeApi(); BigDecimal number = new BigDecimal(); // BigDecimal | None Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None -byte[] _byte = B; // byte[] | None +byte[] _byte = _byte_example; // byte[] | None Integer integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 789L; // Long | None diff --git a/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md b/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md index 2bc252c751..b83ed56563 100644 --- a/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md +++ b/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md @@ -266,7 +266,7 @@ FakeApi apiInstance = new FakeApi(); BigDecimal number = new BigDecimal(); // BigDecimal | None Double _double = 3.4D; // Double | None String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None -byte[] _byte = B; // byte[] | None +byte[] _byte = _byte_example; // byte[] | None Integer integer = 56; // Integer | None Integer int32 = 56; // Integer | None Long int64 = 789L; // Long | None From 2d058aa9256bc7b551a76a0ffad060804949cae3 Mon Sep 17 00:00:00 2001 From: wing328 Date: Thu, 29 Jun 2017 14:59:46 +0800 Subject: [PATCH 10/20] add info message for mvn clean deploy --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6196982e33..fa5990d6bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -106,5 +106,6 @@ after_success: # push a snapshot version to maven repo - if [ $SONATYPE_USERNAME ] && [ -z $TRAVIS_TAG ] && [ $TRAVIS_PULL_REQUEST == false ]; then mvn clean deploy --settings .travis/settings.xml; + echo "Finished mvn clean deploy"; fi; From b18e003d12b1e574d9baf7666f3a29f080ce6ef6 Mon Sep 17 00:00:00 2001 From: wing328 Date: Thu, 29 Jun 2017 15:32:10 +0800 Subject: [PATCH 11/20] update petstore script usage --- bin/javascript-closure-angular.sh | 2 +- bin/javascript-es6-petstore.sh | 4 ++-- bin/javascript-petstore.sh | 2 +- bin/javascript-promise-es6-petstore.sh | 4 ++-- bin/javascript-promise-petstore.sh | 4 ++-- bin/php-petstore.sh | 2 +- bin/python-petstore.sh | 2 +- bin/ruby-petstore.sh | 2 +- bin/swift-petstore-promisekit.sh | 2 +- bin/swift-petstore-rxswift.sh | 2 +- bin/swift-petstore.sh | 2 +- bin/swift3-petstore-promisekit.sh | 2 +- bin/swift3-petstore-rxswift.sh | 2 +- bin/swift3-petstore.sh | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/javascript-closure-angular.sh b/bin/javascript-closure-angular.sh index 9ef43666f8..418920f023 100755 --- a/bin/javascript-closure-angular.sh +++ b/bin/javascript-closure-angular.sh @@ -26,6 +26,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l javascript-closure-angular -o samples/client/petstore/javascript-closure-angular" +ags="generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l javascript-closure-angular -o samples/client/petstore/javascript-closure-angular $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/javascript-es6-petstore.sh b/bin/javascript-es6-petstore.sh index c9f3b7b6ff..b2e370e5c9 100755 --- a/bin/javascript-es6-petstore.sh +++ b/bin/javascript-es6-petstore.sh @@ -26,9 +26,9 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -t modules/swagger-codegen/src/main/resources/Javascript/es6 \ +ags="generate -t modules/swagger-codegen/src/main/resources/Javascript/es6 \ -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l javascript \ -o samples/client/petstore/javascript-es6 \ ---additional-properties useES6=true" +--additional-properties useES6=true $@" java -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags diff --git a/bin/javascript-petstore.sh b/bin/javascript-petstore.sh index 984cfca32d..5d87a78b94 100755 --- a/bin/javascript-petstore.sh +++ b/bin/javascript-petstore.sh @@ -26,6 +26,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -t modules/swagger-codegen/src/main/resources/Javascript -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l javascript -o samples/client/petstore/javascript -DappName=PetstoreClient --additional-properties useES6=false" +ags="generate -t modules/swagger-codegen/src/main/resources/Javascript -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l javascript -o samples/client/petstore/javascript -DappName=PetstoreClient --additional-properties useES6=false $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/javascript-promise-es6-petstore.sh b/bin/javascript-promise-es6-petstore.sh index ec4e1bda37..e08208cfa2 100755 --- a/bin/javascript-promise-es6-petstore.sh +++ b/bin/javascript-promise-es6-petstore.sh @@ -26,9 +26,9 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -t modules/swagger-codegen/src/main/resources/Javascript/es6 \ +ags="generate -t modules/swagger-codegen/src/main/resources/Javascript/es6 \ -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l javascript \ -o samples/client/petstore/javascript-promise-es6 \ ---additional-properties usePromises=true,useES6=true" +--additional-properties usePromises=true,useES6=true $@" java -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags diff --git a/bin/javascript-promise-petstore.sh b/bin/javascript-promise-petstore.sh index fa8e346629..fc3d9d0721 100755 --- a/bin/javascript-promise-petstore.sh +++ b/bin/javascript-promise-petstore.sh @@ -26,12 +26,12 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate \ +ags="generate \ -t modules/swagger-codegen/src/main/resources/Javascript \ -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml \ -l javascript \ -o samples/client/petstore/javascript-promise \ --additional-properties usePromises=true,useES6=false \ --DappName=PetstoreClient" +-DappName=PetstoreClient $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/php-petstore.sh b/bin/php-petstore.sh index 3b25c1c1cc..98a8dc708a 100755 --- a/bin/php-petstore.sh +++ b/bin/php-petstore.sh @@ -26,6 +26,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -t modules/swagger-codegen/src/main/resources/php -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l php -o samples/client/petstore/php" +ags="generate -t modules/swagger-codegen/src/main/resources/php -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l php -o samples/client/petstore/php $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/python-petstore.sh b/bin/python-petstore.sh index 0fe89ea39e..664cae449a 100755 --- a/bin/python-petstore.sh +++ b/bin/python-petstore.sh @@ -26,6 +26,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -t modules/swagger-codegen/src/main/resources/python -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l python -o samples/client/petstore/python -DpackageName=petstore_api" +ags="generate -t modules/swagger-codegen/src/main/resources/python -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l python -o samples/client/petstore/python -DpackageName=petstore_api $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/ruby-petstore.sh b/bin/ruby-petstore.sh index f1c87e3202..1c12b7e34d 100755 --- a/bin/ruby-petstore.sh +++ b/bin/ruby-petstore.sh @@ -26,6 +26,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -t modules/swagger-codegen/src/main/resources/ruby -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l ruby -c bin/ruby-petstore.json -o samples/client/petstore/ruby" +ags="generate -t modules/swagger-codegen/src/main/resources/ruby -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l ruby -c bin/ruby-petstore.json -o samples/client/petstore/ruby $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/swift-petstore-promisekit.sh b/bin/swift-petstore-promisekit.sh index d2787a876a..adbfe40419 100755 --- a/bin/swift-petstore-promisekit.sh +++ b/bin/swift-petstore-promisekit.sh @@ -26,6 +26,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -t modules/swagger-codegen/src/main/resources/swift -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l swift -c ./bin/swift-petstore-promisekit.json -o samples/client/petstore/swift/promisekit" +ags="generate -t modules/swagger-codegen/src/main/resources/swift -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l swift -c ./bin/swift-petstore-promisekit.json -o samples/client/petstore/swift/promisekit $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/swift-petstore-rxswift.sh b/bin/swift-petstore-rxswift.sh index c140ed7f90..5485f496f8 100755 --- a/bin/swift-petstore-rxswift.sh +++ b/bin/swift-petstore-rxswift.sh @@ -26,6 +26,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -t modules/swagger-codegen/src/main/resources/swift -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l swift -c ./bin/swift-petstore-rxswift.json -o samples/client/petstore/swift/rxswift" +ags="generate -t modules/swagger-codegen/src/main/resources/swift -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l swift -c ./bin/swift-petstore-rxswift.json -o samples/client/petstore/swift/rxswift $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/swift-petstore.sh b/bin/swift-petstore.sh index 3747b3adca..c8628354da 100755 --- a/bin/swift-petstore.sh +++ b/bin/swift-petstore.sh @@ -26,6 +26,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -t modules/swagger-codegen/src/main/resources/swift -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l swift -c ./bin/swift-petstore.json -o samples/client/petstore/swift/default" +ags="generate -t modules/swagger-codegen/src/main/resources/swift -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l swift -c ./bin/swift-petstore.json -o samples/client/petstore/swift/default $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/swift3-petstore-promisekit.sh b/bin/swift3-petstore-promisekit.sh index 3cf41441d3..9b61150e9a 100755 --- a/bin/swift3-petstore-promisekit.sh +++ b/bin/swift3-petstore-promisekit.sh @@ -26,6 +26,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -t modules/swagger-codegen/src/main/resources/swift3 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l swift3 -c ./bin/swift3-petstore-promisekit.json -o samples/client/petstore/swift3/promisekit" +ags="generate -t modules/swagger-codegen/src/main/resources/swift3 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l swift3 -c ./bin/swift3-petstore-promisekit.json -o samples/client/petstore/swift3/promisekit $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/swift3-petstore-rxswift.sh b/bin/swift3-petstore-rxswift.sh index a3e3043e44..9bb8a35b36 100755 --- a/bin/swift3-petstore-rxswift.sh +++ b/bin/swift3-petstore-rxswift.sh @@ -26,6 +26,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -t modules/swagger-codegen/src/main/resources/swift3 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l swift3 -c ./bin/swift3-petstore-rxswift.json -o samples/client/petstore/swift3/rxswift" +ags="generate -t modules/swagger-codegen/src/main/resources/swift3 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l swift3 -c ./bin/swift3-petstore-rxswift.json -o samples/client/petstore/swift3/rxswift $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/swift3-petstore.sh b/bin/swift3-petstore.sh index fe465cbea9..f6d5ed712a 100755 --- a/bin/swift3-petstore.sh +++ b/bin/swift3-petstore.sh @@ -26,6 +26,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -t modules/swagger-codegen/src/main/resources/swift3 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l swift3 -c ./bin/swift3-petstore.json -o samples/client/petstore/swift3/default" +ags="generate -t modules/swagger-codegen/src/main/resources/swift3 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l swift3 -c ./bin/swift3-petstore.json -o samples/client/petstore/swift3/default $@" java $JAVA_OPTS -jar $executable $ags From 7a9981b350f871da2e0b330fe8f5824c37b8362f Mon Sep 17 00:00:00 2001 From: Dennis Kieselhorst Date: Thu, 29 Jun 2017 10:12:33 +0200 Subject: [PATCH 12/20] updated swagger-ui dependency (#5945) --- .../src/main/resources/JavaJaxRS/cxf/server/pom.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache index 8fa5b8714c..99678d4bb7 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache @@ -212,7 +212,7 @@ org.webjars swagger-ui - 2.1.8-M1 + 3.0.17 {{/useSwaggerUI}} From 846ee63f383429b6a219590238b1afb08477f2fe Mon Sep 17 00:00:00 2001 From: wing328 Date: Thu, 29 Jun 2017 21:37:24 +0800 Subject: [PATCH 13/20] [C#] Update C# API client dependencies to the latest version (#5935) * update C# client dependency * add back csproj file for c# petstore * update test result * downgrade version 1.51.3 * add logo as embedded resource --- .../main/resources/csharp/Project.mustache | 23 +++--- .../resources/csharp/TestProject.mustache | 8 +- .../resources/csharp/compile-mono.sh.mustache | 4 +- .../main/resources/csharp/compile.mustache | 4 +- .../src/main/resources/csharp/nuspec.mustache | 29 ++++--- .../resources/csharp/packages.config.mustache | 4 +- .../csharp/packages_test.config.mustache | 2 +- .../petstore/csharp/SwaggerClient/build.bat | 2 +- .../petstore/csharp/SwaggerClient/build.sh | 2 +- .../IO.Swagger.Test/IO.Swagger.Test.csproj | 40 +++++----- .../src/IO.Swagger.Test/packages.config | 2 +- .../src/IO.Swagger/IO.Swagger.csproj | 13 ++- .../src/IO.Swagger/IO.Swagger.nuspec | 5 +- .../src/IO.Swagger/packages.config | 2 +- .../TestResult.xml | 79 +++++++++++++++---- .../build.bat | 4 +- .../SwaggerClientWithPropertyChanged/build.sh | 4 +- .../IO.Swagger.Test/IO.Swagger.Test.csproj | 8 +- .../src/IO.Swagger.Test/packages.config | 2 +- .../src/IO.Swagger/IO.Swagger.csproj | 10 +-- .../src/IO.Swagger/IO.Swagger.nuspec | 8 +- .../src/IO.Swagger/packages.config | 4 +- 22 files changed, 158 insertions(+), 101 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/csharp/Project.mustache b/modules/swagger-codegen/src/main/resources/csharp/Project.mustache index 2c6db7ae2d..d1271b9d51 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/Project.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/Project.mustache @@ -67,10 +67,10 @@ - $(SolutionDir)\packages\Newtonsoft.Json.8.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll - ..\packages\Newtonsoft.Json.8.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll - ..\..\packages\Newtonsoft.Json.8.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll - {{binRelativePath}}\Newtonsoft.Json.8.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll + $(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.10.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.10.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll + {{binRelativePath}}\Newtonsoft.Json.10.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll $(SolutionDir)\packages\RestSharp.105.1.0\lib\{{targetFrameworkNuget}}\RestSharp.dll @@ -78,9 +78,11 @@ ..\..\packages\RestSharp.105.1.0\lib\{{targetFrameworkNuget}}\RestSharp.dll {{binRelativePath}}\RestSharp.105.1.0\lib\{{targetFrameworkNuget}}\RestSharp.dll - {{#generatePropertyChanged}} + {{#generatePropertyChanged}} + ..\..\packages\PropertyChanged.Fody.1.51.3\Lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll - {{/generatePropertyChanged}} + + {{/generatePropertyChanged}} {{/netStandard}} {{#netStandard}} @@ -94,10 +96,13 @@ {{^netStandard}} - {{#generatePropertyChanged}}{{/generatePropertyChanged}} + {{#generatePropertyChanged}} + + {{/generatePropertyChanged}} - {{#generatePropertyChanged}} - + + {{#generatePropertyChanged}} + {{/generatePropertyChanged}} {{/netStandard}} {{#netStandard}} diff --git a/modules/swagger-codegen/src/main/resources/csharp/TestProject.mustache b/modules/swagger-codegen/src/main/resources/csharp/TestProject.mustache index be847bade9..ee8897d2a6 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/TestProject.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/TestProject.mustache @@ -59,10 +59,10 @@ - $(SolutionDir)\packages\Newtonsoft.Json.8.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll - ..\packages\Newtonsoft.Json.8.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll - ..\..\packages\Newtonsoft.Json.8.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll - {{binRelativePath}}\Newtonsoft.Json.8.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll + $(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.10.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.10.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll + {{binRelativePath}}\Newtonsoft.Json.10.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll $(SolutionDir)\packages\RestSharp.105.1.0\lib\{{targetFrameworkNuget}}\RestSharp.dll diff --git a/modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache b/modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache index 52d2fb767f..cd807b78d0 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/compile-mono.sh.mustache @@ -15,10 +15,10 @@ mono nuget.exe install src/{{packageName}}/packages.config -o packages; echo "[INFO] Copy DLLs to the 'bin' folder" mkdir -p bin; -cp packages/Newtonsoft.Json.8.0.3/lib/{{targetFrameworkNuget}}/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll; +cp packages/Newtonsoft.Json.10.0.3/lib/{{targetFrameworkNuget}}/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll; cp packages/RestSharp.105.1.0/lib/{{targetFrameworkNuget}}/RestSharp.dll bin/RestSharp.dll; {{#generatePropertyChanged}} -cp packages/Fody.1.29.2/Fody.dll bin/Fody.dll +cp packages/Fody.1.29.4/Fody.dll bin/Fody.dll cp packages/PropertyChanged.Fody.1.51.3/PropertyChanged.Fody.dll bin/PropertyChanged.Fody.dll cp packages/PropertyChanged.Fody.1.51.3/Lib/dotnet/PropertyChanged.dll bin/PropertyChanged.dll {{/generatePropertyChanged}} diff --git a/modules/swagger-codegen/src/main/resources/csharp/compile.mustache b/modules/swagger-codegen/src/main/resources/csharp/compile.mustache index 2ecdbadc8b..76d9f2b0bb 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/compile.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/compile.mustache @@ -15,10 +15,10 @@ if not exist ".\nuget.exe" powershell -Command "(new-object System.Net.WebClient if not exist ".\bin" mkdir bin -copy packages\Newtonsoft.Json.8.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll +copy packages\Newtonsoft.Json.10.0.3\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll copy packages\RestSharp.105.1.0\lib\{{targetFrameworkNuget}}\RestSharp.dll bin\RestSharp.dll {{#generatePropertyChanged}} -copy packages\Fody.1.29.2\Fody.dll bin\Fody.dll +copy packages\Fody.1.29.4\Fody.dll bin\Fody.dll copy packages\PropertyChanged.Fody.1.51.3\PropertyChanged.Fody.dll bin\PropertyChanged.Fody.dll copy packages\PropertyChanged.Fody.1.51.3\Lib\dotnet\PropertyChanged.dll bin\PropertyChanged.dll {{/generatePropertyChanged}} diff --git a/modules/swagger-codegen/src/main/resources/csharp/nuspec.mustache b/modules/swagger-codegen/src/main/resources/csharp/nuspec.mustache index eaf4b0e338..dc0fdc327c 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/nuspec.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/nuspec.mustache @@ -19,17 +19,23 @@ - {{packageDescription}}{{#termsOfService}} - {{termsOfService}}{{/termsOfService}}{{#licenseUrl}} - {{licenseUrl}}{{/licenseUrl}} + {{packageDescription}} + {{#termsOfService}} + {{termsOfService}} + {{/termsOfService}} + {{#licenseUrl}} + {{licenseUrl}} + {{/licenseUrl}} - - {{#generatePropertyChanged}} - - {{/generatePropertyChanged}} + + + {{#generatePropertyChanged}} + + + {{/generatePropertyChanged}} @@ -37,9 +43,10 @@ - {{#generatePropertyChanged}} - - {{/generatePropertyChanged}} + + {{#generatePropertyChanged}} + + {{/generatePropertyChanged}} - \ No newline at end of file + diff --git a/modules/swagger-codegen/src/main/resources/csharp/packages.config.mustache b/modules/swagger-codegen/src/main/resources/csharp/packages.config.mustache index 8f82cb7143..10218bf15c 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/packages.config.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/packages.config.mustache @@ -1,9 +1,9 @@ - + {{#generatePropertyChanged}} - + {{/generatePropertyChanged}} diff --git a/modules/swagger-codegen/src/main/resources/csharp/packages_test.config.mustache b/modules/swagger-codegen/src/main/resources/csharp/packages_test.config.mustache index 7e6f457539..1403975d65 100644 --- a/modules/swagger-codegen/src/main/resources/csharp/packages_test.config.mustache +++ b/modules/swagger-codegen/src/main/resources/csharp/packages_test.config.mustache @@ -2,5 +2,5 @@ - + diff --git a/samples/client/petstore/csharp/SwaggerClient/build.bat b/samples/client/petstore/csharp/SwaggerClient/build.bat index 1da4812b36..9460347d45 100644 --- a/samples/client/petstore/csharp/SwaggerClient/build.bat +++ b/samples/client/petstore/csharp/SwaggerClient/build.bat @@ -10,7 +10,7 @@ if not exist ".\nuget.exe" powershell -Command "(new-object System.Net.WebClient if not exist ".\bin" mkdir bin -copy packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll +copy packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll copy packages\RestSharp.105.1.0\lib\net45\RestSharp.dll bin\RestSharp.dll %CSCPATH%\csc /reference:bin\Newtonsoft.Json.dll;bin\RestSharp.dll;System.ComponentModel.DataAnnotations.dll /target:library /out:bin\IO.Swagger.dll /recurse:src\IO.Swagger\*.cs /doc:bin\IO.Swagger.xml diff --git a/samples/client/petstore/csharp/SwaggerClient/build.sh b/samples/client/petstore/csharp/SwaggerClient/build.sh index 6cfe5890b5..0d2b446007 100644 --- a/samples/client/petstore/csharp/SwaggerClient/build.sh +++ b/samples/client/petstore/csharp/SwaggerClient/build.sh @@ -15,7 +15,7 @@ mono nuget.exe install src/IO.Swagger/packages.config -o packages; echo "[INFO] Copy DLLs to the 'bin' folder" mkdir -p bin; -cp packages/Newtonsoft.Json.8.0.3/lib/net45/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll; +cp packages/Newtonsoft.Json.10.0.3/lib/net45/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll; cp packages/RestSharp.105.1.0/lib/net45/RestSharp.dll bin/RestSharp.dll; echo "[INFO] Run 'mcs' to build bin/IO.Swagger.dll" diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj index 3122ce1f81..d84f8a0916 100644 --- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj +++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj @@ -6,9 +6,8 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod OpenAPI spec version: 1.0.0 Contact: apiteam@swagger.io -Generated by: https://github.com/swagger-api/swagger-codegen.git --> - + Debug AnyCPU @@ -48,38 +47,39 @@ Generated by: https://github.com/swagger-api/swagger-codegen.git - $(SolutionDir)\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - ..\..\vendor\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + $(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + ..\..\vendor\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - $(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll - ..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll - ..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll - ..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll + $(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll + ..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll + ..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll + ..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll - $(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll - ..\packages\NUnit.2.6.4\lib\nunit.framework.dll - ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll - ..\..\vendor\NUnit.2.6.4\lib\nunit.framework.dll + $(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll + ..\packages\NUnit.2.6.4\lib\nunit.framework.dll + ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll + ..\..\vendor\NUnit.2.6.4\lib\nunit.framework.dll - + - + - - {1230F4B8-71F8-4A8C-966F-2E10106EA239} - IO.Swagger - + + {321C8C3F-0156-40C1-AE42-D59761FB9B6C} + IO.Swagger + + diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/packages.config b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/packages.config index 9bb00f0fc4..105b8298a4 100644 --- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/packages.config +++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/packages.config @@ -2,5 +2,5 @@ - + diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj index 4c942e8cd5..4d675069f3 100644 --- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj +++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj @@ -48,10 +48,10 @@ Contact: apiteam@swagger.io - $(SolutionDir)\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - ..\..\vendor\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + $(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + ..\..\vendor\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll $(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll @@ -59,7 +59,6 @@ Contact: apiteam@swagger.io ..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll ..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll - - - + + diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.nuspec b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.nuspec index 4762df88d9..1035d5d81e 100644 --- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.nuspec +++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.nuspec @@ -26,7 +26,7 @@ - + @@ -36,5 +36,6 @@ + - \ No newline at end of file + diff --git a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/packages.config b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/packages.config index 80f617d6d9..351ef133ee 100644 --- a/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/packages.config +++ b/samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/packages.config @@ -1,5 +1,5 @@ - + diff --git a/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/TestResult.xml b/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/TestResult.xml index 9dbad20d4b..08369e4ca7 100644 --- a/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/TestResult.xml +++ b/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/TestResult.xml @@ -1,24 +1,24 @@ - - + + - + - + - + - + - + - + - + @@ -58,6 +58,17 @@ + + + + + + + + + + + @@ -73,6 +84,12 @@ + + + + + + @@ -88,7 +105,7 @@ - + @@ -101,15 +118,15 @@ - + - + - + @@ -127,7 +144,7 @@ - + @@ -200,6 +217,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -213,7 +258,7 @@ - + @@ -237,7 +282,7 @@ - + @@ -266,7 +311,7 @@ - + diff --git a/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/build.bat b/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/build.bat index 77508b858a..53ea79a609 100644 --- a/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/build.bat +++ b/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/build.bat @@ -10,9 +10,9 @@ if not exist ".\nuget.exe" powershell -Command "(new-object System.Net.WebClient if not exist ".\bin" mkdir bin -copy packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll +copy packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll bin\Newtonsoft.Json.dll copy packages\RestSharp.105.1.0\lib\net45\RestSharp.dll bin\RestSharp.dll -copy packages\Fody.1.29.2\Fody.dll bin\Fody.dll +copy packages\Fody.1.29.4\Fody.dll bin\Fody.dll copy packages\PropertyChanged.Fody.1.51.3\PropertyChanged.Fody.dll bin\PropertyChanged.Fody.dll copy packages\PropertyChanged.Fody.1.51.3\Lib\dotnet\PropertyChanged.dll bin\PropertyChanged.dll %CSCPATH%\csc /reference:bin\Newtonsoft.Json.dll;bin\RestSharp.dll;System.ComponentModel.DataAnnotations.dll /r:bin\Fody.dll;bin\PropertyChanged.Fody.dll;bin\PropertyChanged.dll /target:library /out:bin\IO.Swagger.dll /recurse:src\IO.Swagger\*.cs /doc:bin\IO.Swagger.xml diff --git a/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/build.sh b/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/build.sh index 23dd920e8f..037c4dd9f6 100644 --- a/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/build.sh +++ b/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/build.sh @@ -15,9 +15,9 @@ mono nuget.exe install src/IO.Swagger/packages.config -o packages; echo "[INFO] Copy DLLs to the 'bin' folder" mkdir -p bin; -cp packages/Newtonsoft.Json.8.0.3/lib/net45/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll; +cp packages/Newtonsoft.Json.10.0.3/lib/net45/Newtonsoft.Json.dll bin/Newtonsoft.Json.dll; cp packages/RestSharp.105.1.0/lib/net45/RestSharp.dll bin/RestSharp.dll; -cp packages/Fody.1.29.2/Fody.dll bin/Fody.dll +cp packages/Fody.1.29.4/Fody.dll bin/Fody.dll cp packages/PropertyChanged.Fody.1.51.3/PropertyChanged.Fody.dll bin/PropertyChanged.Fody.dll cp packages/PropertyChanged.Fody.1.51.3/Lib/dotnet/PropertyChanged.dll bin/PropertyChanged.dll diff --git a/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger.Test/IO.Swagger.Test.csproj b/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger.Test/IO.Swagger.Test.csproj index 7cac6bb012..6dd03871c7 100644 --- a/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger.Test/IO.Swagger.Test.csproj +++ b/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger.Test/IO.Swagger.Test.csproj @@ -47,10 +47,10 @@ Contact: apiteam@swagger.io - $(SolutionDir)\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - ..\..\vendor\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + $(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + ..\..\vendor\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll $(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll diff --git a/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger.Test/packages.config b/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger.Test/packages.config index 9bb00f0fc4..105b8298a4 100644 --- a/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger.Test/packages.config +++ b/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger.Test/packages.config @@ -2,5 +2,5 @@ - + diff --git a/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger/IO.Swagger.csproj b/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger/IO.Swagger.csproj index 493a343283..1cc828f493 100644 --- a/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger/IO.Swagger.csproj +++ b/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger/IO.Swagger.csproj @@ -48,10 +48,10 @@ Contact: apiteam@swagger.io - $(SolutionDir)\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - ..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll - ..\..\vendor\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + $(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + ..\..\vendor\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll $(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll @@ -72,6 +72,6 @@ Contact: apiteam@swagger.io - + diff --git a/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger/IO.Swagger.nuspec b/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger/IO.Swagger.nuspec index 87ba93febf..0a4d19d745 100644 --- a/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger/IO.Swagger.nuspec +++ b/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger/IO.Swagger.nuspec @@ -26,9 +26,9 @@ - + - + @@ -38,7 +38,7 @@ - + - \ No newline at end of file + diff --git a/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger/packages.config b/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger/packages.config index 9483191f24..2ce1bb2f3c 100644 --- a/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger/packages.config +++ b/samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/src/IO.Swagger/packages.config @@ -1,7 +1,7 @@ - - + + From 407d72890811c319091cede59475bfefdfcb21fb Mon Sep 17 00:00:00 2001 From: Dennis Kieselhorst Date: Thu, 29 Jun 2017 16:28:08 +0200 Subject: [PATCH 14/20] updated Spring and Spring Boot dependencies (#5948) --- .../src/main/resources/JavaJaxRS/cxf/server/pom.mustache | 4 ++-- .../resources/JavaSpring/libraries/spring-boot/pom.mustache | 4 ++-- .../resources/JavaSpring/libraries/spring-cloud/pom.mustache | 4 ++-- .../resources/JavaSpring/libraries/spring-mvc/pom.mustache | 2 +- samples/client/petstore/spring-cloud/pom.xml | 4 ++-- samples/client/petstore/spring-stubs/pom.xml | 4 ++-- samples/server/petstore/spring-mvc-j8-async/pom.xml | 2 +- samples/server/petstore/spring-mvc/pom.xml | 2 +- samples/server/petstore/springboot-beanvalidation/pom.xml | 4 ++-- samples/server/petstore/springboot-delegate-j8/pom.xml | 4 ++-- samples/server/petstore/springboot-delegate/pom.xml | 4 ++-- samples/server/petstore/springboot-implicitHeaders/pom.xml | 4 ++-- samples/server/petstore/springboot/pom.xml | 4 ++-- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache index 99678d4bb7..ddf991b6a3 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache @@ -238,10 +238,10 @@ 1.1.0.Final {{/useBeanValidation}} {{#generateSpringApplication}} - 4.2.5.RELEASE + 4.3.9.RELEASE {{/generateSpringApplication}} {{#generateSpringBootApplication}} - 1.3.3.RELEASE + 1.4.7.RELEASE {{/generateSpringBootApplication}} 3.1.11 2.8.9 diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache index 748893ad5e..5da79542d6 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.5.RELEASE + 1.4.7.RELEASE src/main/java @@ -83,4 +83,4 @@ {{/useBeanValidation}} - \ No newline at end of file + diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache index 3f53b76061..b6a641f177 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.1.RELEASE + 1.4.7.RELEASE src/main/java @@ -83,4 +83,4 @@ test - \ No newline at end of file + diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache index 2297d93acc..f93423c17c 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache @@ -151,6 +151,6 @@ 2.5 2.4.0 2.8.9 - 4.2.5.RELEASE + 4.3.9.RELEASE diff --git a/samples/client/petstore/spring-cloud/pom.xml b/samples/client/petstore/spring-cloud/pom.xml index f8e3b2b1e3..8fcd302750 100644 --- a/samples/client/petstore/spring-cloud/pom.xml +++ b/samples/client/petstore/spring-cloud/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.1.RELEASE + 1.4.7.RELEASE src/main/java @@ -72,4 +72,4 @@ test - \ No newline at end of file + diff --git a/samples/client/petstore/spring-stubs/pom.xml b/samples/client/petstore/spring-stubs/pom.xml index a66490dbb6..cfb1f67fdb 100644 --- a/samples/client/petstore/spring-stubs/pom.xml +++ b/samples/client/petstore/spring-stubs/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.5.RELEASE + 1.4.7.RELEASE src/main/java @@ -57,4 +57,4 @@ provided - \ No newline at end of file + diff --git a/samples/server/petstore/spring-mvc-j8-async/pom.xml b/samples/server/petstore/spring-mvc-j8-async/pom.xml index 3c13f6cd26..058be5ba49 100644 --- a/samples/server/petstore/spring-mvc-j8-async/pom.xml +++ b/samples/server/petstore/spring-mvc-j8-async/pom.xml @@ -135,6 +135,6 @@ 2.5 2.4.0 2.8.9 - 4.2.5.RELEASE + 4.3.9.RELEASE diff --git a/samples/server/petstore/spring-mvc/pom.xml b/samples/server/petstore/spring-mvc/pom.xml index 69fffcc592..d159867564 100644 --- a/samples/server/petstore/spring-mvc/pom.xml +++ b/samples/server/petstore/spring-mvc/pom.xml @@ -140,6 +140,6 @@ 2.5 2.4.0 2.8.9 - 4.2.5.RELEASE + 4.3.9.RELEASE diff --git a/samples/server/petstore/springboot-beanvalidation/pom.xml b/samples/server/petstore/springboot-beanvalidation/pom.xml index 5af442938b..12aff7660b 100644 --- a/samples/server/petstore/springboot-beanvalidation/pom.xml +++ b/samples/server/petstore/springboot-beanvalidation/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.5.RELEASE + 1.4.7.RELEASE src/main/java @@ -70,4 +70,4 @@ provided - \ No newline at end of file + diff --git a/samples/server/petstore/springboot-delegate-j8/pom.xml b/samples/server/petstore/springboot-delegate-j8/pom.xml index ed0ffabba6..ba9be83fe8 100644 --- a/samples/server/petstore/springboot-delegate-j8/pom.xml +++ b/samples/server/petstore/springboot-delegate-j8/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.5.RELEASE + 1.4.7.RELEASE src/main/java @@ -66,4 +66,4 @@ provided - \ No newline at end of file + diff --git a/samples/server/petstore/springboot-delegate/pom.xml b/samples/server/petstore/springboot-delegate/pom.xml index 79ebd1099b..140d031676 100644 --- a/samples/server/petstore/springboot-delegate/pom.xml +++ b/samples/server/petstore/springboot-delegate/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.5.RELEASE + 1.4.7.RELEASE src/main/java @@ -70,4 +70,4 @@ provided - \ No newline at end of file + diff --git a/samples/server/petstore/springboot-implicitHeaders/pom.xml b/samples/server/petstore/springboot-implicitHeaders/pom.xml index 79ebd1099b..140d031676 100644 --- a/samples/server/petstore/springboot-implicitHeaders/pom.xml +++ b/samples/server/petstore/springboot-implicitHeaders/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.5.RELEASE + 1.4.7.RELEASE src/main/java @@ -70,4 +70,4 @@ provided - \ No newline at end of file + diff --git a/samples/server/petstore/springboot/pom.xml b/samples/server/petstore/springboot/pom.xml index 79ebd1099b..140d031676 100644 --- a/samples/server/petstore/springboot/pom.xml +++ b/samples/server/petstore/springboot/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.5.RELEASE + 1.4.7.RELEASE src/main/java @@ -70,4 +70,4 @@ provided - \ No newline at end of file + From 64df75d8b6bcf3c2320e822671a0b1ed7d2efa1c Mon Sep 17 00:00:00 2001 From: Juan Pablo Marzetti Date: Thu, 29 Jun 2017 07:34:12 -0700 Subject: [PATCH 15/20] Docs and examples need model name to be passed as baseType (#5944) --- .../src/main/java/io/swagger/codegen/DefaultCodegen.java | 2 +- 1 file changed, 1 insertion(+), 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 627139049f..d3f983453a 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 @@ -2580,8 +2580,8 @@ public class DefaultCodegen { name = typeMapping.get(name); p.baseType = name; } else { - p.baseType = name; name = toModelName(name); + p.baseType = name; if (defaultIncludes.contains(name)) { imports.add(name); } From 6fa4853fe7b8bd595d353021d81aedfd97abee35 Mon Sep 17 00:00:00 2001 From: rubms Date: Thu, 29 Jun 2017 16:35:41 +0200 Subject: [PATCH 16/20] [NancyFx] Fixed bug in the generation of enum models that were generated with compilation errors (#5910) (#5913) * NancyFx - Fixed bug in the generation of enum types in the NancyFx server, which cause enums to be generated as general classes, without the enum values and with compilation errors (#5910) * NancyFx - Changes in the nancyfx sample after the updates in the nancyfx model.mustache template. (#5910) --- .../src/main/resources/nancyfx/model.mustache | 163 +----------------- .../main/resources/nancyfx/modelEnum.mustache | 13 ++ .../resources/nancyfx/modelGeneric.mustache | 156 +++++++++++++++++ .../server/petstore/nancyfx/IO.Swagger.sln | 10 +- .../nancyfx/src/IO.Swagger/IO.Swagger.csproj | 2 +- .../src/IO.Swagger/Models/ApiResponse.cs | 2 +- .../nancyfx/src/IO.Swagger/Models/Category.cs | 2 +- .../nancyfx/src/IO.Swagger/Models/Order.cs | 2 +- .../nancyfx/src/IO.Swagger/Models/Pet.cs | 2 +- .../nancyfx/src/IO.Swagger/Models/Tag.cs | 2 +- .../nancyfx/src/IO.Swagger/Models/User.cs | 2 +- 11 files changed, 185 insertions(+), 171 deletions(-) create mode 100644 modules/swagger-codegen/src/main/resources/nancyfx/modelEnum.mustache create mode 100644 modules/swagger-codegen/src/main/resources/nancyfx/modelGeneric.mustache diff --git a/modules/swagger-codegen/src/main/resources/nancyfx/model.mustache b/modules/swagger-codegen/src/main/resources/nancyfx/model.mustache index 2313ae976f..090f503b42 100644 --- a/modules/swagger-codegen/src/main/resources/nancyfx/model.mustache +++ b/modules/swagger-codegen/src/main/resources/nancyfx/model.mustache @@ -7,166 +7,11 @@ using NodaTime; {{#imports}}using {{import}}; {{/imports}} -{{#models}} -{{#model}} namespace {{packageName}}.{{packageContext}}.Models { - /// - /// {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}} - /// - public {{^hasChildren}}sealed {{/hasChildren}}class {{classname}}: {{#parent}}{{{parent}}}, {{/parent}} IEquatable<{{classname}}> - { {{#vars}}{{^isInherited}} - /// - /// {{^description}}{{{name}}}{{/description}}{{#description}}{{description}}{{/description}} - /// - public {{>nullableDataType}} {{name}} { get; private set; } -{{/isInherited}}{{/vars}} - - /// - /// Empty constructor required by some serializers. - /// Use {{classname}}.Builder() for instance creation instead. - /// - [Obsolete] - public {{classname}}(){{#parent}} : base({{/parent}}{{#parentVars}}null{{#hasMore}}, {{/hasMore}}{{/parentVars}}{{#parent}}){{/parent}} - { - } - - {{#hasChildren}}protected{{/hasChildren}}{{^hasChildren}}private{{/hasChildren}} {{classname}}({{#vars}}{{>nullableDataType}} {{name}}{{#hasMore}}, {{/hasMore}}{{/vars}}){{#parent}} : base({{#parentVars}}{{name}}{{#hasMore}}, {{/hasMore}}{{/parentVars}}){{/parent}} - { - {{#vars}}{{^isInherited}} - this.{{name}} = {{name}}; - {{/isInherited}}{{/vars}} - } - - /// - /// Returns builder of {{classname}}. - /// - /// {{classname}}Builder - public static {{#parent}}new {{/parent}}{{classname}}Builder Builder() - { - return new {{classname}}Builder(); - } - - /// - /// Returns {{classname}}Builder with properties set. - /// Use it to change properties. - /// - /// {{classname}}Builder - public {{#parent}}new {{/parent}}{{classname}}Builder With() - { - return Builder() - {{#vars}} - .{{name}}({{name}}){{#hasMore}} -{{/hasMore}}{{/vars}}; - } - - public override string ToString() - { - return this.PropertiesToString(); - } - - public override bool Equals(object obj) - { - return this.EqualsByProperties(obj); - } - - public bool Equals({{classname}} other) - { - return Equals((object) other); - } - - public override int GetHashCode() - { - return this.PropertiesHash(); - } - - /// - /// Implementation of == operator for ({{classname}}. - /// - /// Compared ({{classname}} - /// Compared ({{classname}} - /// true if compared items are equals, false otherwise - public static bool operator == ({{classname}} left, {{classname}} right) - { - return Equals(left, right); - } - - /// - /// Implementation of != operator for ({{classname}}. - /// - /// Compared ({{classname}} - /// Compared ({{classname}} - /// true if compared items are not equals, false otherwise - public static bool operator != ({{classname}} left, {{classname}} right) - { - return !Equals(left, right); - } - - /// - /// Builder of {{classname}}. - /// - public sealed class {{classname}}Builder - { - {{#vars}} - private {{>nullableDataType}} _{{name}}; - {{/vars}} - - internal {{classname}}Builder() - { - SetupDefaults(); - } - - private void SetupDefaults() - { - {{#vars}} - {{^required}} - {{#defaultValue}} - _{{name}} = {{{defaultValue}}}; - {{/defaultValue}} - {{/required}} - {{/vars}} - } - - {{#vars}} - /// - /// Sets value for {{classname}}.{{{name}}} property. - /// - /// {{^description}}{{{name}}}{{/description}}{{#description}}{{description}}{{/description}} - public {{classname}}Builder {{name}}({{>nullableDataType}} value) - { - _{{name}} = value; - return this; - } - - {{/vars}} - - /// - /// Builds instance of {{classname}}. - /// - /// {{classname}} - public {{classname}} Build() - { - Validate(); - return new {{classname}}( - {{#vars}} - {{name}}: _{{name}}{{#hasMore}},{{/hasMore}} - {{/vars}} - ); - } - - private void Validate() - { {{#vars}}{{#required}} - if (_{{name}} == null) - { - throw new ArgumentException("{{name}} is a required property for {{classname}} and cannot be null"); - } {{/required}}{{/vars}} - } - } - - {{#vars}}{{#isEnum}}{{^parent}} - {{>innerModelEnum}}{{/parent}}{{/isEnum}}{{#items.isEnum}} - {{#items}}{{>innerModelEnum}}{{/items}}{{/items.isEnum}}{{/vars}} - } +{{#models}} +{{#model}} +{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{>modelGeneric}}{{/isEnum}} {{/model}} {{/models}} -} +} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/nancyfx/modelEnum.mustache b/modules/swagger-codegen/src/main/resources/nancyfx/modelEnum.mustache new file mode 100644 index 0000000000..ddc5c2a56c --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/nancyfx/modelEnum.mustache @@ -0,0 +1,13 @@ + /// + /// {{^description}}Defines {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}} + /// {{#description}} + /// {{{description}}}{{/description}} + public enum {{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} + { + {{#allowableValues}}{{#enumVars}} + /// + /// Enum {{name}} + /// + {{name}}{{#isInteger}} = {{{value}}}{{/isInteger}}{{^-last}}, + {{/-last}}{{/enumVars}}{{/allowableValues}} + } \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/nancyfx/modelGeneric.mustache b/modules/swagger-codegen/src/main/resources/nancyfx/modelGeneric.mustache new file mode 100644 index 0000000000..1093e4dd26 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/nancyfx/modelGeneric.mustache @@ -0,0 +1,156 @@ + /// + /// {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}} + /// + public {{^hasChildren}}sealed {{/hasChildren}}class {{classname}}: {{#parent}}{{{parent}}}, {{/parent}} IEquatable<{{classname}}> + { {{#vars}}{{^isInherited}} + /// + /// {{^description}}{{{name}}}{{/description}}{{#description}}{{description}}{{/description}} + /// + public {{>nullableDataType}} {{name}} { get; private set; } +{{/isInherited}}{{/vars}} + + /// + /// Empty constructor required by some serializers. + /// Use {{classname}}.Builder() for instance creation instead. + /// + [Obsolete] + public {{classname}}(){{#parent}} : base({{/parent}}{{#parentVars}}null{{#hasMore}}, {{/hasMore}}{{/parentVars}}{{#parent}}){{/parent}} + { + } + + {{#hasChildren}}protected{{/hasChildren}}{{^hasChildren}}private{{/hasChildren}} {{classname}}({{#vars}}{{>nullableDataType}} {{name}}{{#hasMore}}, {{/hasMore}}{{/vars}}){{#parent}} : base({{#parentVars}}{{name}}{{#hasMore}}, {{/hasMore}}{{/parentVars}}){{/parent}} + { + {{#vars}}{{^isInherited}} + this.{{name}} = {{name}}; + {{/isInherited}}{{/vars}} + } + + /// + /// Returns builder of {{classname}}. + /// + /// {{classname}}Builder + public static {{#parent}}new {{/parent}}{{classname}}Builder Builder() + { + return new {{classname}}Builder(); + } + + /// + /// Returns {{classname}}Builder with properties set. + /// Use it to change properties. + /// + /// {{classname}}Builder + public {{#parent}}new {{/parent}}{{classname}}Builder With() + { + return Builder() + {{#vars}} + .{{name}}({{name}}){{#hasMore}} +{{/hasMore}}{{/vars}}; + } + + public override string ToString() + { + return this.PropertiesToString(); + } + + public override bool Equals(object obj) + { + return this.EqualsByProperties(obj); + } + + public bool Equals({{classname}} other) + { + return Equals((object) other); + } + + public override int GetHashCode() + { + return this.PropertiesHash(); + } + + /// + /// Implementation of == operator for ({{classname}}. + /// + /// Compared ({{classname}} + /// Compared ({{classname}} + /// true if compared items are equals, false otherwise + public static bool operator == ({{classname}} left, {{classname}} right) + { + return Equals(left, right); + } + + /// + /// Implementation of != operator for ({{classname}}. + /// + /// Compared ({{classname}} + /// Compared ({{classname}} + /// true if compared items are not equals, false otherwise + public static bool operator != ({{classname}} left, {{classname}} right) + { + return !Equals(left, right); + } + + /// + /// Builder of {{classname}}. + /// + public sealed class {{classname}}Builder + { + {{#vars}} + private {{>nullableDataType}} _{{name}}; + {{/vars}} + + internal {{classname}}Builder() + { + SetupDefaults(); + } + + private void SetupDefaults() + { + {{#vars}} + {{^required}} + {{#defaultValue}} + _{{name}} = {{{defaultValue}}}; + {{/defaultValue}} + {{/required}} + {{/vars}} + } + + {{#vars}} + /// + /// Sets value for {{classname}}.{{{name}}} property. + /// + /// {{^description}}{{{name}}}{{/description}}{{#description}}{{description}}{{/description}} + public {{classname}}Builder {{name}}({{>nullableDataType}} value) + { + _{{name}} = value; + return this; + } + + {{/vars}} + + /// + /// Builds instance of {{classname}}. + /// + /// {{classname}} + public {{classname}} Build() + { + Validate(); + return new {{classname}}( + {{#vars}} + {{name}}: _{{name}}{{#hasMore}},{{/hasMore}} + {{/vars}} + ); + } + + private void Validate() + { {{#vars}}{{#required}} + if (_{{name}} == null) + { + throw new ArgumentException("{{name}} is a required property for {{classname}} and cannot be null"); + } {{/required}}{{/vars}} + } + } + + {{#vars}}{{#isEnum}}{{^parent}} + {{>innerModelEnum}}{{/parent}}{{/isEnum}}{{#items.isEnum}} + {{#items}}{{>innerModelEnum}}{{/items}}{{/items.isEnum}}{{/vars}} + } \ No newline at end of file diff --git a/samples/server/petstore/nancyfx/IO.Swagger.sln b/samples/server/petstore/nancyfx/IO.Swagger.sln index 1e40deb1a1..5d8c69c5c3 100644 --- a/samples/server/petstore/nancyfx/IO.Swagger.sln +++ b/samples/server/petstore/nancyfx/IO.Swagger.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 VisualStudioVersion = 12.0.0.0 MinimumVisualStudioVersion = 10.0.0.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{768B8DC6-54EE-4D40-9B20-7857E1D742A4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IO.Swagger", "src\IO.Swagger\IO.Swagger.csproj", "{7D0AE5BB-FFF1-4523-83ED-A60492D321D5}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -10,10 +10,10 @@ Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution -{768B8DC6-54EE-4D40-9B20-7857E1D742A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU -{768B8DC6-54EE-4D40-9B20-7857E1D742A4}.Debug|Any CPU.Build.0 = Debug|Any CPU -{768B8DC6-54EE-4D40-9B20-7857E1D742A4}.Release|Any CPU.ActiveCfg = Release|Any CPU -{768B8DC6-54EE-4D40-9B20-7857E1D742A4}.Release|Any CPU.Build.0 = Release|Any CPU +{7D0AE5BB-FFF1-4523-83ED-A60492D321D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +{7D0AE5BB-FFF1-4523-83ED-A60492D321D5}.Debug|Any CPU.Build.0 = Debug|Any CPU +{7D0AE5BB-FFF1-4523-83ED-A60492D321D5}.Release|Any CPU.ActiveCfg = Release|Any CPU +{7D0AE5BB-FFF1-4523-83ED-A60492D321D5}.Release|Any CPU.Build.0 = Release|Any CPU {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {19F1DEBC-DE5E-4517-8062-F000CD499087}.Debug|Any CPU.Build.0 = Debug|Any CPU {19F1DEBC-DE5E-4517-8062-F000CD499087}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/samples/server/petstore/nancyfx/src/IO.Swagger/IO.Swagger.csproj b/samples/server/petstore/nancyfx/src/IO.Swagger/IO.Swagger.csproj index e1577197b6..ad4e5e7a4b 100644 --- a/samples/server/petstore/nancyfx/src/IO.Swagger/IO.Swagger.csproj +++ b/samples/server/petstore/nancyfx/src/IO.Swagger/IO.Swagger.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - {768B8DC6-54EE-4D40-9B20-7857E1D742A4} + {7D0AE5BB-FFF1-4523-83ED-A60492D321D5} Library Properties IO.Swagger.v2 diff --git a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/ApiResponse.cs b/samples/server/petstore/nancyfx/src/IO.Swagger/Models/ApiResponse.cs index 3b8ad566af..ebaa3c8d4f 100644 --- a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/ApiResponse.cs +++ b/samples/server/petstore/nancyfx/src/IO.Swagger/Models/ApiResponse.cs @@ -182,4 +182,4 @@ namespace IO.Swagger.v2.Models } -} +} \ No newline at end of file diff --git a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Category.cs b/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Category.cs index c6089446e5..bf811614b3 100644 --- a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Category.cs +++ b/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Category.cs @@ -162,4 +162,4 @@ namespace IO.Swagger.v2.Models } -} +} \ No newline at end of file diff --git a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Order.cs b/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Order.cs index f1f94f39d7..0495a36f13 100644 --- a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Order.cs +++ b/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Order.cs @@ -244,4 +244,4 @@ namespace IO.Swagger.v2.Models public enum StatusEnum { Placed, Approved, Delivered }; } -} +} \ No newline at end of file diff --git a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Pet.cs b/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Pet.cs index b092feb9e8..f945a0fdd7 100644 --- a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Pet.cs +++ b/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Pet.cs @@ -251,4 +251,4 @@ namespace IO.Swagger.v2.Models public enum StatusEnum { Available, Pending, Sold }; } -} +} \ No newline at end of file diff --git a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Tag.cs b/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Tag.cs index 94b15c123a..02d1e40f1e 100644 --- a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Tag.cs +++ b/samples/server/petstore/nancyfx/src/IO.Swagger/Models/Tag.cs @@ -162,4 +162,4 @@ namespace IO.Swagger.v2.Models } -} +} \ No newline at end of file diff --git a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/User.cs b/samples/server/petstore/nancyfx/src/IO.Swagger/Models/User.cs index bd720290ad..99f401750d 100644 --- a/samples/server/petstore/nancyfx/src/IO.Swagger/Models/User.cs +++ b/samples/server/petstore/nancyfx/src/IO.Swagger/Models/User.cs @@ -282,4 +282,4 @@ namespace IO.Swagger.v2.Models } -} +} \ No newline at end of file From d21023604053a81942f72b3b66d09d6c08b85c99 Mon Sep 17 00:00:00 2001 From: Gavin Sitthiampornphan Date: Thu, 29 Jun 2017 21:47:03 +0700 Subject: [PATCH 17/20] fix(ts-fetch): preserve available headers (#5650) --- .../src/main/resources/TypeScript-Fetch/api.mustache | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache index 88db5deda9..77caddbb75 100644 --- a/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache +++ b/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache @@ -116,11 +116,11 @@ export const {{classname}}FetchParamCreator = { {{#hasHeaderParams}} fetchOptions.headers = {{#supportsES6}}Object.{{/supportsES6}}assign({ {{#headerParams}}"{{baseName}}": params["{{paramName}}"],{{/headerParams}} - }, contentTypeHeader); + }, contentTypeHeader, fetchOptions.headers); {{/hasHeaderParams}} {{^hasHeaderParams}} if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = {{#supportsES6}}Object.{{/supportsES6}}assign({}, contentTypeHeader, fetchOptions.headers); } {{/hasHeaderParams}} return { From b2366670d79fbb54545f3310cffafe4363ede08b Mon Sep 17 00:00:00 2001 From: wing328 Date: Thu, 29 Jun 2017 23:06:25 +0800 Subject: [PATCH 18/20] update ts fetch petstore samples --- .../typescript-fetch/builds/default/api.ts | 40 +++++++++---------- .../typescript-fetch/builds/es6-target/api.ts | 40 +++++++++---------- .../builds/with-npm-version/api.ts | 40 +++++++++---------- 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/samples/client/petstore/typescript-fetch/builds/default/api.ts b/samples/client/petstore/typescript-fetch/builds/default/api.ts index 1ab5a83072..7701171916 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/api.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/api.ts @@ -108,7 +108,7 @@ export const PetApiFetchParamCreator = { fetchOptions.body = JSON.stringify(params["body"] || {}); } if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -134,7 +134,7 @@ export const PetApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; fetchOptions.headers = assign({ "api_key": params["apiKey"], - }, contentTypeHeader); + }, contentTypeHeader, fetchOptions.headers); return { url: url.format(urlObj), options: fetchOptions, @@ -155,7 +155,7 @@ export const PetApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -177,7 +177,7 @@ export const PetApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -201,7 +201,7 @@ export const PetApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -224,7 +224,7 @@ export const PetApiFetchParamCreator = { fetchOptions.body = JSON.stringify(params["body"] || {}); } if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -255,7 +255,7 @@ export const PetApiFetchParamCreator = { "status": params["status"], }); if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -286,7 +286,7 @@ export const PetApiFetchParamCreator = { "file": params["file"], }); if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -616,7 +616,7 @@ export const StoreApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -634,7 +634,7 @@ export const StoreApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -658,7 +658,7 @@ export const StoreApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -681,7 +681,7 @@ export const StoreApiFetchParamCreator = { fetchOptions.body = JSON.stringify(params["body"] || {}); } if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -860,7 +860,7 @@ export const UserApiFetchParamCreator = { fetchOptions.body = JSON.stringify(params["body"] || {}); } if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -883,7 +883,7 @@ export const UserApiFetchParamCreator = { fetchOptions.body = JSON.stringify(params["body"] || {}); } if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -906,7 +906,7 @@ export const UserApiFetchParamCreator = { fetchOptions.body = JSON.stringify(params["body"] || {}); } if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -930,7 +930,7 @@ export const UserApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -954,7 +954,7 @@ export const UserApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -978,7 +978,7 @@ export const UserApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -996,7 +996,7 @@ export const UserApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -1025,7 +1025,7 @@ export const UserApiFetchParamCreator = { fetchOptions.body = JSON.stringify(params["body"] || {}); } if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/api.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/api.ts index 5b787dc84b..c7f1a03230 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/api.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/api.ts @@ -107,7 +107,7 @@ export const PetApiFetchParamCreator = { fetchOptions.body = JSON.stringify(params["body"] || {}); } if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -133,7 +133,7 @@ export const PetApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; fetchOptions.headers = Object.assign({ "api_key": params["apiKey"], - }, contentTypeHeader); + }, contentTypeHeader, fetchOptions.headers); return { url: url.format(urlObj), options: fetchOptions, @@ -154,7 +154,7 @@ export const PetApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -176,7 +176,7 @@ export const PetApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -200,7 +200,7 @@ export const PetApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -223,7 +223,7 @@ export const PetApiFetchParamCreator = { fetchOptions.body = JSON.stringify(params["body"] || {}); } if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -254,7 +254,7 @@ export const PetApiFetchParamCreator = { "status": params["status"], }); if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -285,7 +285,7 @@ export const PetApiFetchParamCreator = { "file": params["file"], }); if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -615,7 +615,7 @@ export const StoreApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -633,7 +633,7 @@ export const StoreApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -657,7 +657,7 @@ export const StoreApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -680,7 +680,7 @@ export const StoreApiFetchParamCreator = { fetchOptions.body = JSON.stringify(params["body"] || {}); } if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -859,7 +859,7 @@ export const UserApiFetchParamCreator = { fetchOptions.body = JSON.stringify(params["body"] || {}); } if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -882,7 +882,7 @@ export const UserApiFetchParamCreator = { fetchOptions.body = JSON.stringify(params["body"] || {}); } if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -905,7 +905,7 @@ export const UserApiFetchParamCreator = { fetchOptions.body = JSON.stringify(params["body"] || {}); } if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -929,7 +929,7 @@ export const UserApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -953,7 +953,7 @@ export const UserApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -977,7 +977,7 @@ export const UserApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -995,7 +995,7 @@ export const UserApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -1024,7 +1024,7 @@ export const UserApiFetchParamCreator = { fetchOptions.body = JSON.stringify(params["body"] || {}); } if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = Object.assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts index 1ab5a83072..7701171916 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts @@ -108,7 +108,7 @@ export const PetApiFetchParamCreator = { fetchOptions.body = JSON.stringify(params["body"] || {}); } if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -134,7 +134,7 @@ export const PetApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; fetchOptions.headers = assign({ "api_key": params["apiKey"], - }, contentTypeHeader); + }, contentTypeHeader, fetchOptions.headers); return { url: url.format(urlObj), options: fetchOptions, @@ -155,7 +155,7 @@ export const PetApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -177,7 +177,7 @@ export const PetApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -201,7 +201,7 @@ export const PetApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -224,7 +224,7 @@ export const PetApiFetchParamCreator = { fetchOptions.body = JSON.stringify(params["body"] || {}); } if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -255,7 +255,7 @@ export const PetApiFetchParamCreator = { "status": params["status"], }); if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -286,7 +286,7 @@ export const PetApiFetchParamCreator = { "file": params["file"], }); if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -616,7 +616,7 @@ export const StoreApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -634,7 +634,7 @@ export const StoreApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -658,7 +658,7 @@ export const StoreApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -681,7 +681,7 @@ export const StoreApiFetchParamCreator = { fetchOptions.body = JSON.stringify(params["body"] || {}); } if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -860,7 +860,7 @@ export const UserApiFetchParamCreator = { fetchOptions.body = JSON.stringify(params["body"] || {}); } if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -883,7 +883,7 @@ export const UserApiFetchParamCreator = { fetchOptions.body = JSON.stringify(params["body"] || {}); } if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -906,7 +906,7 @@ export const UserApiFetchParamCreator = { fetchOptions.body = JSON.stringify(params["body"] || {}); } if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -930,7 +930,7 @@ export const UserApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -954,7 +954,7 @@ export const UserApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -978,7 +978,7 @@ export const UserApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -996,7 +996,7 @@ export const UserApiFetchParamCreator = { let contentTypeHeader: Dictionary = {}; if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), @@ -1025,7 +1025,7 @@ export const UserApiFetchParamCreator = { fetchOptions.body = JSON.stringify(params["body"] || {}); } if (contentTypeHeader) { - fetchOptions.headers = contentTypeHeader; + fetchOptions.headers = assign({}, contentTypeHeader, fetchOptions.headers); } return { url: url.format(urlObj), From fbd888d2983982e6663d160725b38991cce958a1 Mon Sep 17 00:00:00 2001 From: stkrwork Date: Fri, 30 Jun 2017 17:58:31 +0200 Subject: [PATCH 19/20] [CONFIG] [APACHE] Fix for Java7 issue (#5960) * - Added Restbed Generator * - Added Json processing functions to model - Removed unnused code from restbed codegen class - Added response header processing to api template * Changed it to respect alphabetical order * Made the string joining java 7 compatible * Added samples * fix java7 issue with apache --- .../java/io/swagger/codegen/languages/Apache2ConfigCodegen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Apache2ConfigCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Apache2ConfigCodegen.java index 0027e6920c..7a26d91d7b 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Apache2ConfigCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Apache2ConfigCodegen.java @@ -78,8 +78,8 @@ public class Apache2ConfigCodegen extends DefaultCodegen implements CodegenConfi item = "*"; } splitPath.add(item); + op.path += item + "/"; } - op.path = String.join("/", splitPath); op.vendorExtensions.put("x-codegen-userInfoPath", userInfoPath); boolean foundInNewList = false; for (CodegenOperation op1 : newOpList) { From 7fa53773fcf09eb80d7b5d0457908f2557f4bb82 Mon Sep 17 00:00:00 2001 From: wing328 Date: Sat, 1 Jul 2017 15:16:26 +0800 Subject: [PATCH 20/20] mvn deploy for master only (#5946) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa5990d6bf..f4b2862d96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -104,7 +104,7 @@ script: after_success: # push a snapshot version to maven repo - - if [ $SONATYPE_USERNAME ] && [ -z $TRAVIS_TAG ] && [ $TRAVIS_PULL_REQUEST == false ]; then + - if [ $SONATYPE_USERNAME ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_BRANCH" = "master" ]; then mvn clean deploy --settings .travis/settings.xml; echo "Finished mvn clean deploy"; fi;