From 1006b0ca0af69f59d1b79162b38644986e7a7f8a Mon Sep 17 00:00:00 2001 From: Stas Shakirov Date: Mon, 10 Oct 2016 09:57:28 +0300 Subject: [PATCH 1/3] added package paths for retrofit class names --- .../src/main/resources/Java/libraries/retrofit/api.mustache | 4 ++-- .../resources/Java/libraries/retrofit/bodyParams.mustache | 2 +- .../resources/Java/libraries/retrofit/formParams.mustache | 2 +- .../resources/Java/libraries/retrofit/headerParams.mustache | 2 +- .../resources/Java/libraries/retrofit/pathParams.mustache | 2 +- .../resources/Java/libraries/retrofit/queryParams.mustache | 2 +- .../src/main/resources/Java/libraries/retrofit2/api.mustache | 2 +- .../resources/Java/libraries/retrofit2/bodyParams.mustache | 2 +- .../resources/Java/libraries/retrofit2/formParams.mustache | 2 +- .../resources/Java/libraries/retrofit2/headerParams.mustache | 2 +- .../resources/Java/libraries/retrofit2/pathParams.mustache | 2 +- .../resources/Java/libraries/retrofit2/queryParams.mustache | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/api.mustache index aa84768b47a..e03801db6c2 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/api.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/api.mustache @@ -27,7 +27,7 @@ public interface {{classname}} { {{/allParams}} * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} */ {{#formParams}}{{#-first}} - {{#isMultipart}}@Multipart{{/isMultipart}}{{^isMultipart}}@FormUrlEncoded{{/isMultipart}}{{/-first}}{{/formParams}} + {{#isMultipart}}@retrofit.http.Multipart{{/isMultipart}}{{^isMultipart}}@retrofit.http.FormUrlEncoded{{/isMultipart}}{{/-first}}{{/formParams}} @{{httpMethod}}("{{path}}") {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}} {{operationId}}({{^allParams}});{{/allParams}} {{#allParams}}{{>libraries/retrofit/queryParams}}{{>libraries/retrofit/pathParams}}{{>libraries/retrofit/headerParams}}{{>libraries/retrofit/bodyParams}}{{>libraries/retrofit/formParams}}{{#hasMore}}, {{/hasMore}}{{^hasMore}} @@ -41,7 +41,7 @@ public interface {{classname}} { * @return void */ {{#formParams}}{{#-first}} - {{#isMultipart}}@Multipart{{/isMultipart}}{{^isMultipart}}@FormUrlEncoded{{/isMultipart}}{{/-first}}{{/formParams}} + {{#isMultipart}}@retrofit.http.Multipart{{/isMultipart}}{{^isMultipart}}@retrofit.http.FormUrlEncoded{{/isMultipart}}{{/-first}}{{/formParams}} @{{httpMethod}}("{{path}}") void {{operationId}}( {{#allParams}}{{>libraries/retrofit/queryParams}}{{>libraries/retrofit/pathParams}}{{>libraries/retrofit/headerParams}}{{>libraries/retrofit/bodyParams}}{{>libraries/retrofit/formParams}}, {{/allParams}}Callback<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}> cb diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/bodyParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/bodyParams.mustache index f8788583db5..ed55732b053 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/bodyParams.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/bodyParams.mustache @@ -1 +1 @@ -{{#isBodyParam}}@Body {{{dataType}}} {{paramName}}{{/isBodyParam}} \ No newline at end of file +{{#isBodyParam}}@retrofit.http.Body {{{dataType}}} {{paramName}}{{/isBodyParam}} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/formParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/formParams.mustache index be9a3ca9b26..aa92e88e720 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/formParams.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/formParams.mustache @@ -1 +1 @@ -{{#isFormParam}}{{#notFile}}{{#isMultipart}}@Part{{/isMultipart}}{{^isMultipart}}@Field{{/isMultipart}}("{{baseName}}") {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}{{#isMultipart}}@Part{{/isMultipart}}{{^isMultipart}}@Field{{/isMultipart}}("{{baseName}}") TypedFile {{paramName}}{{/isFile}}{{/isFormParam}} \ No newline at end of file +{{#isFormParam}}{{#notFile}}{{#isMultipart}}@retrofit.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit.http.Field{{/isMultipart}}("{{baseName}}") {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}{{#isMultipart}}@retrofit.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit.http.Field{{/isMultipart}}("{{baseName}}") TypedFile {{paramName}}{{/isFile}}{{/isFormParam}} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/headerParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/headerParams.mustache index 29206e1546b..336841150bb 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/headerParams.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/headerParams.mustache @@ -1 +1 @@ -{{#isHeaderParam}}@Header("{{baseName}}") {{{dataType}}} {{paramName}}{{/isHeaderParam}} \ No newline at end of file +{{#isHeaderParam}}@retrofit.http.Header("{{baseName}}") {{{dataType}}} {{paramName}}{{/isHeaderParam}} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pathParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pathParams.mustache index 8a8bdc74c88..f779cf2fba5 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pathParams.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pathParams.mustache @@ -1 +1 @@ -{{#isPathParam}}@Path("{{baseName}}") {{{dataType}}} {{paramName}}{{/isPathParam}} \ No newline at end of file +{{#isPathParam}}@retrofit.http.Path("{{baseName}}") {{{dataType}}} {{paramName}}{{/isPathParam}} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/queryParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/queryParams.mustache index 3c5b1bb7e69..913efbd82b8 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/queryParams.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/queryParams.mustache @@ -1 +1 @@ -{{#isQueryParam}}@Query("{{baseName}}") {{#collectionFormat}}{{#isCollectionFormatMulti}}{{{dataType}}}{{/isCollectionFormatMulti}}{{^isCollectionFormatMulti}}{{{collectionFormat.toUpperCase}}}Params{{/isCollectionFormatMulti}}{{/collectionFormat}}{{^collectionFormat}}{{{dataType}}}{{/collectionFormat}} {{paramName}}{{/isQueryParam}} \ No newline at end of file +{{#isQueryParam}}@retrofit.http.Query("{{baseName}}") {{#collectionFormat}}{{#isCollectionFormatMulti}}{{{dataType}}}{{/isCollectionFormatMulti}}{{^isCollectionFormatMulti}}{{{collectionFormat.toUpperCase}}}Params{{/isCollectionFormatMulti}}{{/collectionFormat}}{{^collectionFormat}}{{{dataType}}}{{/collectionFormat}} {{paramName}}{{/isQueryParam}} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache index 7fa42fe732c..7682d27c9c8 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache @@ -28,7 +28,7 @@ public interface {{classname}} { {{/allParams}} * @return Call<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}> */ {{#formParams}}{{#-first}} - {{#isMultipart}}@Multipart{{/isMultipart}}{{^isMultipart}}@FormUrlEncoded{{/isMultipart}}{{/-first}}{{/formParams}} + {{#isMultipart}}@retrofit2.http.Multipart{{/isMultipart}}{{^isMultipart}}@retrofit2.http.FormUrlEncoded{{/isMultipart}}{{/-first}}{{/formParams}} @{{httpMethod}}("{{path}}") {{#useRxJava}}Observable{{/useRxJava}}{{^useRxJava}}Call{{/useRxJava}}<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}> {{operationId}}({{^allParams}});{{/allParams}} {{#allParams}}{{>libraries/retrofit2/queryParams}}{{>libraries/retrofit2/pathParams}}{{>libraries/retrofit2/headerParams}}{{>libraries/retrofit2/bodyParams}}{{>libraries/retrofit2/formParams}}{{#hasMore}}, {{/hasMore}}{{^hasMore}} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/bodyParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/bodyParams.mustache index f8788583db5..7a0471dfbd2 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/bodyParams.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/bodyParams.mustache @@ -1 +1 @@ -{{#isBodyParam}}@Body {{{dataType}}} {{paramName}}{{/isBodyParam}} \ No newline at end of file +{{#isBodyParam}}@retrofit2.http.Body {{{dataType}}} {{paramName}}{{/isBodyParam}} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/formParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/formParams.mustache index 0620c3a21ba..b29d30d6152 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/formParams.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/formParams.mustache @@ -1 +1 @@ -{{#isFormParam}}{{#notFile}}{{#isMultipart}}@Part{{/isMultipart}}{{^isMultipart}}@Field{{/isMultipart}}("{{baseName}}") {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}{{#isMultipart}}@Part{{/isMultipart}}{{^isMultipart}}@Field{{/isMultipart}}("{{baseName}}\"; filename=\"{{baseName}}") RequestBody {{paramName}}{{/isFile}}{{/isFormParam}} \ No newline at end of file +{{#isFormParam}}{{#notFile}}{{#isMultipart}}@retrofit2.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit2.http.Field{{/isMultipart}}("{{baseName}}") {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}{{#isMultipart}}@retrofit2.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit2.http.Field{{/isMultipart}}("{{baseName}}\"; filename=\"{{baseName}}") RequestBody {{paramName}}{{/isFile}}{{/isFormParam}} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/headerParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/headerParams.mustache index 29206e1546b..9d1ac8e0631 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/headerParams.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/headerParams.mustache @@ -1 +1 @@ -{{#isHeaderParam}}@Header("{{baseName}}") {{{dataType}}} {{paramName}}{{/isHeaderParam}} \ No newline at end of file +{{#isHeaderParam}}@retrofit2.http.Header("{{baseName}}") {{{dataType}}} {{paramName}}{{/isHeaderParam}} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pathParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pathParams.mustache index 8a8bdc74c88..ea0e85de5d8 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pathParams.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pathParams.mustache @@ -1 +1 @@ -{{#isPathParam}}@Path("{{baseName}}") {{{dataType}}} {{paramName}}{{/isPathParam}} \ No newline at end of file +{{#isPathParam}}@retrofit2.http.Path("{{baseName}}") {{{dataType}}} {{paramName}}{{/isPathParam}} diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/queryParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/queryParams.mustache index 3c5b1bb7e69..f8d3d48ebd9 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/queryParams.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/queryParams.mustache @@ -1 +1 @@ -{{#isQueryParam}}@Query("{{baseName}}") {{#collectionFormat}}{{#isCollectionFormatMulti}}{{{dataType}}}{{/isCollectionFormatMulti}}{{^isCollectionFormatMulti}}{{{collectionFormat.toUpperCase}}}Params{{/isCollectionFormatMulti}}{{/collectionFormat}}{{^collectionFormat}}{{{dataType}}}{{/collectionFormat}} {{paramName}}{{/isQueryParam}} \ No newline at end of file +{{#isQueryParam}}@retrofit2.http.Query("{{baseName}}") {{#collectionFormat}}{{#isCollectionFormatMulti}}{{{dataType}}}{{/isCollectionFormatMulti}}{{^isCollectionFormatMulti}}{{{collectionFormat.toUpperCase}}}Params{{/isCollectionFormatMulti}}{{/collectionFormat}}{{^collectionFormat}}{{{dataType}}}{{/collectionFormat}} {{paramName}}{{/isQueryParam}} From 26faf6cf4e336aabe917e1ed336155ce8f6da60d Mon Sep 17 00:00:00 2001 From: Stas Shakirov Date: Mon, 10 Oct 2016 14:42:08 +0300 Subject: [PATCH 2/3] remove newline char in *.mustache; added generated code --- .../libraries/retrofit/bodyParams.mustache | 2 +- .../libraries/retrofit/formParams.mustache | 2 +- .../libraries/retrofit/headerParams.mustache | 2 +- .../libraries/retrofit/pathParams.mustache | 2 +- .../libraries/retrofit/queryParams.mustache | 2 +- .../libraries/retrofit2/bodyParams.mustache | 2 +- .../libraries/retrofit2/formParams.mustache | 2 +- .../retrofit2/formParams.mustache.save | 1 + .../libraries/retrofit2/headerParams.mustache | 2 +- .../libraries/retrofit2/pathParams.mustache | 2 +- .../libraries/retrofit2/queryParams.mustache | 2 +- .../java/io/swagger/client/api/FakeApi.java | 252 +++++++++++++++++- .../java/io/swagger/client/api/PetApi.java | 170 ++++++++++-- .../java/io/swagger/client/api/StoreApi.java | 42 ++- .../java/io/swagger/client/api/UserApi.java | 118 +++++++- .../model/AdditionalPropertiesClass.java | 4 +- .../java/io/swagger/client/model/Animal.java | 4 +- .../io/swagger/client/model/AnimalFarm.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 4 +- .../client/model/ArrayOfNumberOnly.java | 4 +- .../io/swagger/client/model/ArrayTest.java | 4 +- .../java/io/swagger/client/model/Cat.java | 4 +- .../io/swagger/client/model/Category.java | 4 +- .../java/io/swagger/client/model/Client.java | 4 +- .../java/io/swagger/client/model/Dog.java | 4 +- .../io/swagger/client/model/EnumArrays.java | 4 +- .../io/swagger/client/model/EnumClass.java | 1 - .../io/swagger/client/model/EnumTest.java | 4 +- .../io/swagger/client/model/FormatTest.java | 4 +- .../swagger/client/model/HasOnlyReadOnly.java | 4 +- .../java/io/swagger/client/model/MapTest.java | 4 +- ...ropertiesAndAdditionalPropertiesClass.java | 4 +- .../client/model/Model200Response.java | 4 +- .../client/model/ModelApiResponse.java | 4 +- .../io/swagger/client/model/ModelReturn.java | 4 +- .../java/io/swagger/client/model/Name.java | 4 +- .../io/swagger/client/model/NumberOnly.java | 4 +- .../java/io/swagger/client/model/Order.java | 4 +- .../java/io/swagger/client/model/Pet.java | 4 +- .../swagger/client/model/ReadOnlyFirst.java | 4 +- .../client/model/SpecialModelName.java | 4 +- .../java/io/swagger/client/model/Tag.java | 4 +- .../java/io/swagger/client/model/User.java | 4 +- .../petstore/java/retrofit2/docs/FakeApi.md | 6 +- .../java/io/swagger/client/api/FakeApi.java | 126 ++++++++- .../java/io/swagger/client/api/PetApi.java | 85 +++++- .../java/io/swagger/client/api/StoreApi.java | 21 +- .../java/io/swagger/client/api/UserApi.java | 59 +++- .../model/AdditionalPropertiesClass.java | 4 +- .../java/io/swagger/client/model/Animal.java | 4 +- .../io/swagger/client/model/AnimalFarm.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 4 +- .../client/model/ArrayOfNumberOnly.java | 4 +- .../io/swagger/client/model/ArrayTest.java | 4 +- .../java/io/swagger/client/model/Cat.java | 4 +- .../io/swagger/client/model/Category.java | 4 +- .../java/io/swagger/client/model/Client.java | 4 +- .../java/io/swagger/client/model/Dog.java | 4 +- .../io/swagger/client/model/EnumArrays.java | 4 +- .../io/swagger/client/model/EnumClass.java | 1 - .../io/swagger/client/model/EnumTest.java | 4 +- .../io/swagger/client/model/FormatTest.java | 4 +- .../swagger/client/model/HasOnlyReadOnly.java | 4 +- .../java/io/swagger/client/model/MapTest.java | 4 +- ...ropertiesAndAdditionalPropertiesClass.java | 4 +- .../client/model/Model200Response.java | 4 +- .../client/model/ModelApiResponse.java | 4 +- .../io/swagger/client/model/ModelReturn.java | 4 +- .../java/io/swagger/client/model/Name.java | 4 +- .../io/swagger/client/model/NumberOnly.java | 4 +- .../java/io/swagger/client/model/Order.java | 4 +- .../java/io/swagger/client/model/Pet.java | 4 +- .../swagger/client/model/ReadOnlyFirst.java | 4 +- .../client/model/SpecialModelName.java | 4 +- .../java/io/swagger/client/model/Tag.java | 4 +- .../java/io/swagger/client/model/User.java | 4 +- .../java/io/swagger/client/api/FakeApi.java | 126 ++++++++- .../java/io/swagger/client/api/PetApi.java | 85 +++++- .../java/io/swagger/client/api/StoreApi.java | 21 +- .../java/io/swagger/client/api/UserApi.java | 59 +++- .../model/AdditionalPropertiesClass.java | 4 +- .../java/io/swagger/client/model/Animal.java | 4 +- .../io/swagger/client/model/AnimalFarm.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 4 +- .../client/model/ArrayOfNumberOnly.java | 4 +- .../io/swagger/client/model/ArrayTest.java | 4 +- .../java/io/swagger/client/model/Cat.java | 4 +- .../io/swagger/client/model/Category.java | 4 +- .../java/io/swagger/client/model/Client.java | 4 +- .../java/io/swagger/client/model/Dog.java | 4 +- .../io/swagger/client/model/EnumArrays.java | 4 +- .../io/swagger/client/model/EnumClass.java | 1 - .../io/swagger/client/model/EnumTest.java | 4 +- .../io/swagger/client/model/FormatTest.java | 4 +- .../swagger/client/model/HasOnlyReadOnly.java | 4 +- .../java/io/swagger/client/model/MapTest.java | 4 +- ...ropertiesAndAdditionalPropertiesClass.java | 4 +- .../client/model/Model200Response.java | 4 +- .../client/model/ModelApiResponse.java | 4 +- .../io/swagger/client/model/ModelReturn.java | 4 +- .../java/io/swagger/client/model/Name.java | 4 +- .../io/swagger/client/model/NumberOnly.java | 4 +- .../java/io/swagger/client/model/Order.java | 4 +- .../java/io/swagger/client/model/Pet.java | 4 +- .../swagger/client/model/ReadOnlyFirst.java | 4 +- .../client/model/SpecialModelName.java | 4 +- .../java/io/swagger/client/model/Tag.java | 4 +- .../java/io/swagger/client/model/User.java | 4 +- 108 files changed, 1241 insertions(+), 277 deletions(-) create mode 100644 modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/formParams.mustache.save diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/bodyParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/bodyParams.mustache index ed55732b053..81de324b691 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/bodyParams.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/bodyParams.mustache @@ -1 +1 @@ -{{#isBodyParam}}@retrofit.http.Body {{{dataType}}} {{paramName}}{{/isBodyParam}} +{{#isBodyParam}}@retrofit.http.Body {{{dataType}}} {{paramName}}{{/isBodyParam}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/formParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/formParams.mustache index aa92e88e720..f1f9027ae51 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/formParams.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/formParams.mustache @@ -1 +1 @@ -{{#isFormParam}}{{#notFile}}{{#isMultipart}}@retrofit.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit.http.Field{{/isMultipart}}("{{baseName}}") {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}{{#isMultipart}}@retrofit.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit.http.Field{{/isMultipart}}("{{baseName}}") TypedFile {{paramName}}{{/isFile}}{{/isFormParam}} +{{#isFormParam}}{{#notFile}}{{#isMultipart}}@retrofit.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit.http.Field{{/isMultipart}}("{{baseName}}") {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}{{#isMultipart}}@retrofit.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit.http.Field{{/isMultipart}}("{{baseName}}") TypedFile {{paramName}}{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/headerParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/headerParams.mustache index 336841150bb..5d6da4a9437 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/headerParams.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/headerParams.mustache @@ -1 +1 @@ -{{#isHeaderParam}}@retrofit.http.Header("{{baseName}}") {{{dataType}}} {{paramName}}{{/isHeaderParam}} +{{#isHeaderParam}}@retrofit.http.Header("{{baseName}}") {{{dataType}}} {{paramName}}{{/isHeaderParam}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pathParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pathParams.mustache index f779cf2fba5..7b8be8442e0 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pathParams.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/pathParams.mustache @@ -1 +1 @@ -{{#isPathParam}}@retrofit.http.Path("{{baseName}}") {{{dataType}}} {{paramName}}{{/isPathParam}} +{{#isPathParam}}@retrofit.http.Path("{{baseName}}") {{{dataType}}} {{paramName}}{{/isPathParam}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/queryParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/queryParams.mustache index 913efbd82b8..2a580ab34ec 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/queryParams.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit/queryParams.mustache @@ -1 +1 @@ -{{#isQueryParam}}@retrofit.http.Query("{{baseName}}") {{#collectionFormat}}{{#isCollectionFormatMulti}}{{{dataType}}}{{/isCollectionFormatMulti}}{{^isCollectionFormatMulti}}{{{collectionFormat.toUpperCase}}}Params{{/isCollectionFormatMulti}}{{/collectionFormat}}{{^collectionFormat}}{{{dataType}}}{{/collectionFormat}} {{paramName}}{{/isQueryParam}} +{{#isQueryParam}}@retrofit.http.Query("{{baseName}}") {{#collectionFormat}}{{#isCollectionFormatMulti}}{{{dataType}}}{{/isCollectionFormatMulti}}{{^isCollectionFormatMulti}}{{{collectionFormat.toUpperCase}}}Params{{/isCollectionFormatMulti}}{{/collectionFormat}}{{^collectionFormat}}{{{dataType}}}{{/collectionFormat}} {{paramName}}{{/isQueryParam}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/bodyParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/bodyParams.mustache index 7a0471dfbd2..97b03fcb717 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/bodyParams.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/bodyParams.mustache @@ -1 +1 @@ -{{#isBodyParam}}@retrofit2.http.Body {{{dataType}}} {{paramName}}{{/isBodyParam}} +{{#isBodyParam}}@retrofit2.http.Body {{{dataType}}} {{paramName}}{{/isBodyParam}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/formParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/formParams.mustache index b29d30d6152..2e237383ee3 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/formParams.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/formParams.mustache @@ -1 +1 @@ -{{#isFormParam}}{{#notFile}}{{#isMultipart}}@retrofit2.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit2.http.Field{{/isMultipart}}("{{baseName}}") {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}{{#isMultipart}}@retrofit2.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit2.http.Field{{/isMultipart}}("{{baseName}}\"; filename=\"{{baseName}}") RequestBody {{paramName}}{{/isFile}}{{/isFormParam}} +{{#isFormParam}}{{#notFile}}{{#isMultipart}}@retrofit2.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit2.http.Field{{/isMultipart}}("{{baseName}}") {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}{{#isMultipart}}@retrofit2.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit2.http.Field{{/isMultipart}}("{{baseName}}\"; filename=\"{{baseName}}") RequestBody {{paramName}}{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/formParams.mustache.save b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/formParams.mustache.save new file mode 100644 index 00000000000..a203e99a223 --- /dev/null +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/formParams.mustache.save @@ -0,0 +1 @@ +{{#isFormParam}}{{#notFile}}{{#isMultipart}}retrofit.http@retrofit2.http.Part{{/isMultipart}}{{^isMultipart}}@Field{{/isMultipart}}("{{baseName}}") {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}{{#isMultipart}}@Part{{/isMultipart}}{{^isMultipart}}@Field{{/isMultipart}}("{{baseName}}\"; filename=\"{{baseName}}") RequestBody {{paramName}}{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/headerParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/headerParams.mustache index 9d1ac8e0631..c7748f3bf27 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/headerParams.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/headerParams.mustache @@ -1 +1 @@ -{{#isHeaderParam}}@retrofit2.http.Header("{{baseName}}") {{{dataType}}} {{paramName}}{{/isHeaderParam}} +{{#isHeaderParam}}@retrofit2.http.Header("{{baseName}}") {{{dataType}}} {{paramName}}{{/isHeaderParam}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pathParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pathParams.mustache index ea0e85de5d8..8fe7c380c41 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pathParams.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pathParams.mustache @@ -1 +1 @@ -{{#isPathParam}}@retrofit2.http.Path("{{baseName}}") {{{dataType}}} {{paramName}}{{/isPathParam}} +{{#isPathParam}}@retrofit2.http.Path("{{baseName}}") {{{dataType}}} {{paramName}}{{/isPathParam}} \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/queryParams.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/queryParams.mustache index f8d3d48ebd9..abb87510ecf 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/queryParams.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/queryParams.mustache @@ -1 +1 @@ -{{#isQueryParam}}@retrofit2.http.Query("{{baseName}}") {{#collectionFormat}}{{#isCollectionFormatMulti}}{{{dataType}}}{{/isCollectionFormatMulti}}{{^isCollectionFormatMulti}}{{{collectionFormat.toUpperCase}}}Params{{/isCollectionFormatMulti}}{{/collectionFormat}}{{^collectionFormat}}{{{dataType}}}{{/collectionFormat}} {{paramName}}{{/isQueryParam}} +{{#isQueryParam}}@retrofit2.http.Query("{{baseName}}") {{#collectionFormat}}{{#isCollectionFormatMulti}}{{{dataType}}}{{/isCollectionFormatMulti}}{{^isCollectionFormatMulti}}{{{collectionFormat.toUpperCase}}}Params{{/isCollectionFormatMulti}}{{/collectionFormat}}{{^collectionFormat}}{{{dataType}}}{{/collectionFormat}} {{paramName}}{{/isQueryParam}} \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java index fb02bbde690..e1c4644feea 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java @@ -27,7 +27,12 @@ public interface FakeApi { @PATCH("/fake") Client testClientModel( - @Body Client body + + + +@retrofit.http.Body Client body + + ); /** @@ -40,7 +45,12 @@ public interface FakeApi { @PATCH("/fake") void testClientModel( - @Body Client body, Callback cb + + + +@retrofit.http.Body Client body + +, Callback cb ); /** * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -59,13 +69,84 @@ public interface FakeApi { * @param date None (optional) * @param dateTime None (optional) * @param password None (optional) + * @param paramCallback None (optional) * @return Void */ - @FormUrlEncoded + @retrofit.http.FormUrlEncoded @POST("/fake") Void testEndpointParameters( - @Field("number") BigDecimal number, @Field("double") Double _double, @Field("pattern_without_delimiter") String patternWithoutDelimiter, @Field("byte") byte[] _byte, @Field("integer") Integer integer, @Field("int32") Integer int32, @Field("int64") Long int64, @Field("float") Float _float, @Field("string") String string, @Field("binary") byte[] binary, @Field("date") LocalDate date, @Field("dateTime") DateTime dateTime, @Field("password") String password + + + + +@retrofit.http.Field("number") BigDecimal number +, + + + +@retrofit.http.Field("double") Double _double +, + + + +@retrofit.http.Field("pattern_without_delimiter") String patternWithoutDelimiter +, + + + +@retrofit.http.Field("byte") byte[] _byte +, + + + +@retrofit.http.Field("integer") Integer integer +, + + + +@retrofit.http.Field("int32") Integer int32 +, + + + +@retrofit.http.Field("int64") Long int64 +, + + + +@retrofit.http.Field("float") Float _float +, + + + +@retrofit.http.Field("string") String string +, + + + +@retrofit.http.Field("binary") byte[] binary +, + + + +@retrofit.http.Field("date") LocalDate date +, + + + +@retrofit.http.Field("dateTime") DateTime dateTime +, + + + +@retrofit.http.Field("password") String password +, + + + +@retrofit.http.Field("callback") String paramCallback + ); /** @@ -84,14 +165,85 @@ public interface FakeApi { * @param date None (optional) * @param dateTime None (optional) * @param password None (optional) + * @param paramCallback None (optional) * @param cb callback method * @return void */ - @FormUrlEncoded + @retrofit.http.FormUrlEncoded @POST("/fake") void testEndpointParameters( - @Field("number") BigDecimal number, @Field("double") Double _double, @Field("pattern_without_delimiter") String patternWithoutDelimiter, @Field("byte") byte[] _byte, @Field("integer") Integer integer, @Field("int32") Integer int32, @Field("int64") Long int64, @Field("float") Float _float, @Field("string") String string, @Field("binary") byte[] binary, @Field("date") LocalDate date, @Field("dateTime") DateTime dateTime, @Field("password") String password, Callback cb + + + + +@retrofit.http.Field("number") BigDecimal number +, + + + +@retrofit.http.Field("double") Double _double +, + + + +@retrofit.http.Field("pattern_without_delimiter") String patternWithoutDelimiter +, + + + +@retrofit.http.Field("byte") byte[] _byte +, + + + +@retrofit.http.Field("integer") Integer integer +, + + + +@retrofit.http.Field("int32") Integer int32 +, + + + +@retrofit.http.Field("int64") Long int64 +, + + + +@retrofit.http.Field("float") Float _float +, + + + +@retrofit.http.Field("string") String string +, + + + +@retrofit.http.Field("binary") byte[] binary +, + + + +@retrofit.http.Field("date") LocalDate date +, + + + +@retrofit.http.Field("dateTime") DateTime dateTime +, + + + +@retrofit.http.Field("password") String password +, + + + +@retrofit.http.Field("callback") String paramCallback +, Callback cb ); /** * To test enum parameters @@ -108,10 +260,50 @@ public interface FakeApi { * @return Void */ - @FormUrlEncoded + @retrofit.http.FormUrlEncoded @GET("/fake") Void testEnumParameters( - @Field("enum_form_string_array") List enumFormStringArray, @Field("enum_form_string") String enumFormString, @Header("enum_header_string_array") List enumHeaderStringArray, @Header("enum_header_string") String enumHeaderString, @Query("enum_query_string_array") CSVParams enumQueryStringArray, @Query("enum_query_string") String enumQueryString, @Query("enum_query_integer") BigDecimal enumQueryInteger, @Field("enum_query_double") Double enumQueryDouble + + + + +@retrofit.http.Field("enum_form_string_array") List enumFormStringArray +, + + + +@retrofit.http.Field("enum_form_string") String enumFormString +, + +@retrofit.http.Header("enum_header_string_array") List enumHeaderStringArray + + +, + +@retrofit.http.Header("enum_header_string") String enumHeaderString + + +, @retrofit.http.Query("enum_query_string_array") CSVParams enumQueryStringArray + + + + +, @retrofit.http.Query("enum_query_string") String enumQueryString + + + + +, @retrofit.http.Query("enum_query_integer") BigDecimal enumQueryInteger + + + + +, + + + +@retrofit.http.Field("enum_query_double") Double enumQueryDouble + ); /** @@ -129,9 +321,49 @@ public interface FakeApi { * @return void */ - @FormUrlEncoded + @retrofit.http.FormUrlEncoded @GET("/fake") void testEnumParameters( - @Field("enum_form_string_array") List enumFormStringArray, @Field("enum_form_string") String enumFormString, @Header("enum_header_string_array") List enumHeaderStringArray, @Header("enum_header_string") String enumHeaderString, @Query("enum_query_string_array") CSVParams enumQueryStringArray, @Query("enum_query_string") String enumQueryString, @Query("enum_query_integer") BigDecimal enumQueryInteger, @Field("enum_query_double") Double enumQueryDouble, Callback cb + + + + +@retrofit.http.Field("enum_form_string_array") List enumFormStringArray +, + + + +@retrofit.http.Field("enum_form_string") String enumFormString +, + +@retrofit.http.Header("enum_header_string_array") List enumHeaderStringArray + + +, + +@retrofit.http.Header("enum_header_string") String enumHeaderString + + +, @retrofit.http.Query("enum_query_string_array") CSVParams enumQueryStringArray + + + + +, @retrofit.http.Query("enum_query_string") String enumQueryString + + + + +, @retrofit.http.Query("enum_query_integer") BigDecimal enumQueryInteger + + + + +, + + + +@retrofit.http.Field("enum_query_double") Double enumQueryDouble +, Callback cb ); } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java index a019a4bf886..eaeb49ffba4 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java @@ -26,7 +26,12 @@ public interface PetApi { @POST("/pet") Void addPet( - @Body Pet body + + + +@retrofit.http.Body Pet body + + ); /** @@ -39,7 +44,12 @@ public interface PetApi { @POST("/pet") void addPet( - @Body Pet body, Callback cb + + + +@retrofit.http.Body Pet body + +, Callback cb ); /** * Deletes a pet @@ -52,7 +62,17 @@ public interface PetApi { @DELETE("/pet/{petId}") Void deletePet( - @Path("petId") Long petId, @Header("api_key") String apiKey + +@retrofit.http.Path("petId") Long petId + + + +, + +@retrofit.http.Header("api_key") String apiKey + + + ); /** @@ -66,7 +86,17 @@ public interface PetApi { @DELETE("/pet/{petId}") void deletePet( - @Path("petId") Long petId, @Header("api_key") String apiKey, Callback cb + +@retrofit.http.Path("petId") Long petId + + + +, + +@retrofit.http.Header("api_key") String apiKey + + +, Callback cb ); /** * Finds Pets by status @@ -78,7 +108,12 @@ public interface PetApi { @GET("/pet/findByStatus") List findPetsByStatus( - @Query("status") CSVParams status + @retrofit.http.Query("status") CSVParams status + + + + + ); /** @@ -91,7 +126,12 @@ public interface PetApi { @GET("/pet/findByStatus") void findPetsByStatus( - @Query("status") CSVParams status, Callback> cb + @retrofit.http.Query("status") CSVParams status + + + + +, Callback> cb ); /** * Finds Pets by tags @@ -103,7 +143,12 @@ public interface PetApi { @GET("/pet/findByTags") List findPetsByTags( - @Query("tags") CSVParams tags + @retrofit.http.Query("tags") CSVParams tags + + + + + ); /** @@ -116,7 +161,12 @@ public interface PetApi { @GET("/pet/findByTags") void findPetsByTags( - @Query("tags") CSVParams tags, Callback> cb + @retrofit.http.Query("tags") CSVParams tags + + + + +, Callback> cb ); /** * Find pet by ID @@ -128,7 +178,12 @@ public interface PetApi { @GET("/pet/{petId}") Pet getPetById( - @Path("petId") Long petId + +@retrofit.http.Path("petId") Long petId + + + + ); /** @@ -141,7 +196,12 @@ public interface PetApi { @GET("/pet/{petId}") void getPetById( - @Path("petId") Long petId, Callback cb + +@retrofit.http.Path("petId") Long petId + + + +, Callback cb ); /** * Update an existing pet @@ -153,7 +213,12 @@ public interface PetApi { @PUT("/pet") Void updatePet( - @Body Pet body + + + +@retrofit.http.Body Pet body + + ); /** @@ -166,7 +231,12 @@ public interface PetApi { @PUT("/pet") void updatePet( - @Body Pet body, Callback cb + + + +@retrofit.http.Body Pet body + +, Callback cb ); /** * Updates a pet in the store with form data @@ -178,10 +248,25 @@ public interface PetApi { * @return Void */ - @FormUrlEncoded + @retrofit.http.FormUrlEncoded @POST("/pet/{petId}") Void updatePetWithForm( - @Path("petId") Long petId, @Field("name") String name, @Field("status") String status + +@retrofit.http.Path("petId") Long petId + + + +, + + + +@retrofit.http.Field("name") String name +, + + + +@retrofit.http.Field("status") String status + ); /** @@ -194,10 +279,25 @@ public interface PetApi { * @return void */ - @FormUrlEncoded + @retrofit.http.FormUrlEncoded @POST("/pet/{petId}") void updatePetWithForm( - @Path("petId") Long petId, @Field("name") String name, @Field("status") String status, Callback cb + +@retrofit.http.Path("petId") Long petId + + + +, + + + +@retrofit.http.Field("name") String name +, + + + +@retrofit.http.Field("status") String status +, Callback cb ); /** * uploads an image @@ -209,10 +309,25 @@ public interface PetApi { * @return ModelApiResponse */ - @Multipart + @retrofit.http.Multipart @POST("/pet/{petId}/uploadImage") ModelApiResponse uploadFile( - @Path("petId") Long petId, @Part("additionalMetadata") String additionalMetadata, @Part("file") TypedFile file + +@retrofit.http.Path("petId") Long petId + + + +, + + + +@retrofit.http.Part("additionalMetadata") String additionalMetadata +, + + + +@retrofit.http.Part("file") TypedFile file + ); /** @@ -225,9 +340,24 @@ public interface PetApi { * @return void */ - @Multipart + @retrofit.http.Multipart @POST("/pet/{petId}/uploadImage") void uploadFile( - @Path("petId") Long petId, @Part("additionalMetadata") String additionalMetadata, @Part("file") TypedFile file, Callback cb + +@retrofit.http.Path("petId") Long petId + + + +, + + + +@retrofit.http.Part("additionalMetadata") String additionalMetadata +, + + + +@retrofit.http.Part("file") TypedFile file +, Callback cb ); } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java index def4aa2efc7..f9fed4bd1ce 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java @@ -24,7 +24,12 @@ public interface StoreApi { @DELETE("/store/order/{orderId}") Void deleteOrder( - @Path("orderId") String orderId + +@retrofit.http.Path("orderId") String orderId + + + + ); /** @@ -37,7 +42,12 @@ public interface StoreApi { @DELETE("/store/order/{orderId}") void deleteOrder( - @Path("orderId") String orderId, Callback cb + +@retrofit.http.Path("orderId") String orderId + + + +, Callback cb ); /** * Returns pet inventories by status @@ -71,7 +81,12 @@ public interface StoreApi { @GET("/store/order/{orderId}") Order getOrderById( - @Path("orderId") Long orderId + +@retrofit.http.Path("orderId") Long orderId + + + + ); /** @@ -84,7 +99,12 @@ public interface StoreApi { @GET("/store/order/{orderId}") void getOrderById( - @Path("orderId") Long orderId, Callback cb + +@retrofit.http.Path("orderId") Long orderId + + + +, Callback cb ); /** * Place an order for a pet @@ -96,7 +116,12 @@ public interface StoreApi { @POST("/store/order") Order placeOrder( - @Body Order body + + + +@retrofit.http.Body Order body + + ); /** @@ -109,6 +134,11 @@ public interface StoreApi { @POST("/store/order") void placeOrder( - @Body Order body, Callback cb + + + +@retrofit.http.Body Order body + +, Callback cb ); } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java index 8c3380d07d4..7de0bc3fb1a 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java @@ -24,7 +24,12 @@ public interface UserApi { @POST("/user") Void createUser( - @Body User body + + + +@retrofit.http.Body User body + + ); /** @@ -37,7 +42,12 @@ public interface UserApi { @POST("/user") void createUser( - @Body User body, Callback cb + + + +@retrofit.http.Body User body + +, Callback cb ); /** * Creates list of users with given input array @@ -49,7 +59,12 @@ public interface UserApi { @POST("/user/createWithArray") Void createUsersWithArrayInput( - @Body List body + + + +@retrofit.http.Body List body + + ); /** @@ -62,7 +77,12 @@ public interface UserApi { @POST("/user/createWithArray") void createUsersWithArrayInput( - @Body List body, Callback cb + + + +@retrofit.http.Body List body + +, Callback cb ); /** * Creates list of users with given input array @@ -74,7 +94,12 @@ public interface UserApi { @POST("/user/createWithList") Void createUsersWithListInput( - @Body List body + + + +@retrofit.http.Body List body + + ); /** @@ -87,7 +112,12 @@ public interface UserApi { @POST("/user/createWithList") void createUsersWithListInput( - @Body List body, Callback cb + + + +@retrofit.http.Body List body + +, Callback cb ); /** * Delete user @@ -99,7 +129,12 @@ public interface UserApi { @DELETE("/user/{username}") Void deleteUser( - @Path("username") String username + +@retrofit.http.Path("username") String username + + + + ); /** @@ -112,7 +147,12 @@ public interface UserApi { @DELETE("/user/{username}") void deleteUser( - @Path("username") String username, Callback cb + +@retrofit.http.Path("username") String username + + + +, Callback cb ); /** * Get user by user name @@ -124,7 +164,12 @@ public interface UserApi { @GET("/user/{username}") User getUserByName( - @Path("username") String username + +@retrofit.http.Path("username") String username + + + + ); /** @@ -137,7 +182,12 @@ public interface UserApi { @GET("/user/{username}") void getUserByName( - @Path("username") String username, Callback cb + +@retrofit.http.Path("username") String username + + + +, Callback cb ); /** * Logs user into the system @@ -150,7 +200,17 @@ public interface UserApi { @GET("/user/login") String loginUser( - @Query("username") String username, @Query("password") String password + @retrofit.http.Query("username") String username + + + + +, @retrofit.http.Query("password") String password + + + + + ); /** @@ -164,7 +224,17 @@ public interface UserApi { @GET("/user/login") void loginUser( - @Query("username") String username, @Query("password") String password, Callback cb + @retrofit.http.Query("username") String username + + + + +, @retrofit.http.Query("password") String password + + + + +, Callback cb ); /** * Logs out current logged in user session @@ -199,7 +269,17 @@ public interface UserApi { @PUT("/user/{username}") Void updateUser( - @Path("username") String username, @Body User body + +@retrofit.http.Path("username") String username + + + +, + + +@retrofit.http.Body User body + + ); /** @@ -213,6 +293,16 @@ public interface UserApi { @PUT("/user/{username}") void updateUser( - @Path("username") String username, @Body User body, Callback cb + +@retrofit.http.Path("username") String username + + + +, + + +@retrofit.http.Body User body + +, Callback cb ); } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java index d20b1402ce2..81d139e630b 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java @@ -33,12 +33,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - /** * AdditionalPropertiesClass */ -public class AdditionalPropertiesClass { +public class AdditionalPropertiesClass { @SerializedName("map_property") private Map mapProperty = new HashMap(); @@ -131,5 +130,6 @@ public class AdditionalPropertiesClass { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Animal.java index 9b1ff3df1c5..bc73c4f93cb 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Animal.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Animal.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * Animal */ -public class Animal { +public class Animal { @SerializedName("className") private String className = null; @@ -118,5 +117,6 @@ public class Animal { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/AnimalFarm.java index 563476ccb3d..8a50c9c6cb5 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/AnimalFarm.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/AnimalFarm.java @@ -30,12 +30,11 @@ import io.swagger.client.model.Animal; import java.util.ArrayList; import java.util.List; - /** * AnimalFarm */ -public class AnimalFarm extends ArrayList { +public class AnimalFarm extends ArrayList { @Override public boolean equals(java.lang.Object o) { @@ -72,5 +71,6 @@ public class AnimalFarm extends ArrayList { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java index 4c2fa22800f..e0dde620ab4 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java @@ -33,12 +33,11 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; - /** * ArrayOfArrayOfNumberOnly */ -public class ArrayOfArrayOfNumberOnly { +public class ArrayOfArrayOfNumberOnly { @SerializedName("ArrayArrayNumber") private List> arrayArrayNumber = new ArrayList>(); @@ -103,5 +102,6 @@ public class ArrayOfArrayOfNumberOnly { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java index 3c7d74dc3b5..e529ebc4fa8 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java @@ -33,12 +33,11 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; - /** * ArrayOfNumberOnly */ -public class ArrayOfNumberOnly { +public class ArrayOfNumberOnly { @SerializedName("ArrayNumber") private List arrayNumber = new ArrayList(); @@ -103,5 +102,6 @@ public class ArrayOfNumberOnly { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayTest.java index 7e08b24fa6e..80df1b341f5 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayTest.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ArrayTest.java @@ -33,12 +33,11 @@ import io.swagger.client.model.ReadOnlyFirst; import java.util.ArrayList; import java.util.List; - /** * ArrayTest */ -public class ArrayTest { +public class ArrayTest { @SerializedName("array_of_string") private List arrayOfString = new ArrayList(); @@ -159,5 +158,6 @@ public class ArrayTest { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Cat.java index 9c5cb39f648..10a2f2c5c8d 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Cat.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Cat.java @@ -31,12 +31,11 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import io.swagger.client.model.Animal; - /** * Cat */ -public class Cat extends Animal { +public class Cat extends Animal { @SerializedName("declawed") private Boolean declawed = null; @@ -97,5 +96,6 @@ public class Cat extends Animal { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Category.java index 44e76030eff..153df9edbfa 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Category.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Category.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * Category */ -public class Category { +public class Category { @SerializedName("id") private Long id = null; @@ -118,5 +117,6 @@ public class Category { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Client.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Client.java index 54a54647918..1eb9e755db3 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Client.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Client.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * Client */ -public class Client { +public class Client { @SerializedName("client") private String client = null; @@ -95,5 +94,6 @@ public class Client { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Dog.java index 880c159616c..079def9ecc6 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Dog.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Dog.java @@ -31,12 +31,11 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import io.swagger.client.model.Animal; - /** * Dog */ -public class Dog extends Animal { +public class Dog extends Animal { @SerializedName("breed") private String breed = null; @@ -97,5 +96,6 @@ public class Dog extends Animal { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumArrays.java index c5096738755..7eea2d2a911 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumArrays.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumArrays.java @@ -32,12 +32,11 @@ import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.List; - /** * EnumArrays */ -public class EnumArrays { +public class EnumArrays { /** * Gets or Sets justSymbol */ @@ -169,5 +168,6 @@ public class EnumArrays { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumClass.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumClass.java index 7862a8b8952..a6072c381c4 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumClass.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumClass.java @@ -29,7 +29,6 @@ import java.util.Objects; import com.google.gson.annotations.SerializedName; - /** * Gets or Sets EnumClass */ diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumTest.java index 83896fbd849..bdd3a40bb28 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/EnumTest.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * EnumTest */ -public class EnumTest { +public class EnumTest { /** * Gets or Sets enumString */ @@ -207,5 +206,6 @@ public class EnumTest { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/FormatTest.java index a05f1d5c811..023042b8d96 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/FormatTest.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/FormatTest.java @@ -33,12 +33,11 @@ import java.math.BigDecimal; import org.joda.time.DateTime; import org.joda.time.LocalDate; - /** * FormatTest */ -public class FormatTest { +public class FormatTest { @SerializedName("integer") private Integer integer = null; @@ -384,5 +383,6 @@ public class FormatTest { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java index e53b1a0d8be..43a5b6a6c92 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * HasOnlyReadOnly */ -public class HasOnlyReadOnly { +public class HasOnlyReadOnly { @SerializedName("bar") private String bar = null; @@ -100,5 +99,6 @@ public class HasOnlyReadOnly { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MapTest.java index e7d394ed035..75586c606c9 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MapTest.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MapTest.java @@ -33,12 +33,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - /** * MapTest */ -public class MapTest { +public class MapTest { @SerializedName("map_map_of_string") private Map> mapMapOfString = new HashMap>(); @@ -153,5 +152,6 @@ public class MapTest { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 887ba516d72..e6b8987656a 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -35,12 +35,11 @@ import java.util.List; import java.util.Map; import org.joda.time.DateTime; - /** * MixedPropertiesAndAdditionalPropertiesClass */ -public class MixedPropertiesAndAdditionalPropertiesClass { +public class MixedPropertiesAndAdditionalPropertiesClass { @SerializedName("uuid") private String uuid = null; @@ -151,5 +150,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Model200Response.java index 980bc83e869..eabc63cd389 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Model200Response.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Model200Response.java @@ -30,13 +30,12 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * Model for testing model name starting with number */ @ApiModel(description = "Model for testing model name starting with number") -public class Model200Response { +public class Model200Response { @SerializedName("name") private Integer name = null; @@ -119,5 +118,6 @@ public class Model200Response { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelApiResponse.java index f9c162a7934..e410a24757f 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelApiResponse.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * ModelApiResponse */ -public class ModelApiResponse { +public class ModelApiResponse { @SerializedName("code") private Integer code = null; @@ -141,5 +140,6 @@ public class ModelApiResponse { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelReturn.java index bbe7780055c..01d69fecb68 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelReturn.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelReturn.java @@ -30,13 +30,12 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * Model for testing reserved words */ @ApiModel(description = "Model for testing reserved words") -public class ModelReturn { +public class ModelReturn { @SerializedName("return") private Integer _return = null; @@ -96,5 +95,6 @@ public class ModelReturn { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Name.java index d51354ceffa..c50f477abc3 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Name.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Name.java @@ -30,13 +30,12 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * Model for testing model name same as property name */ @ApiModel(description = "Model for testing model name same as property name") -public class Name { +public class Name { @SerializedName("name") private Integer name = null; @@ -147,5 +146,6 @@ public class Name { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/NumberOnly.java index 2b1817300a9..0653baec68b 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/NumberOnly.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/NumberOnly.java @@ -31,12 +31,11 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; - /** * NumberOnly */ -public class NumberOnly { +public class NumberOnly { @SerializedName("JustNumber") private BigDecimal justNumber = null; @@ -96,5 +95,6 @@ public class NumberOnly { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java index f52e7bd5db4..d15cca81e05 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Order.java @@ -31,12 +31,11 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.joda.time.DateTime; - /** * Order */ -public class Order { +public class Order { @SerializedName("id") private Long id = null; @@ -236,5 +235,6 @@ public class Order { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java index 06443e56915..2363e9ed02e 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Pet.java @@ -34,12 +34,11 @@ import io.swagger.client.model.Tag; import java.util.ArrayList; import java.util.List; - /** * Pet */ -public class Pet { +public class Pet { @SerializedName("id") private Long id = null; @@ -249,5 +248,6 @@ public class Pet { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ReadOnlyFirst.java index 75dbc55f9f5..f9f1503366f 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ReadOnlyFirst.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * ReadOnlyFirst */ -public class ReadOnlyFirst { +public class ReadOnlyFirst { @SerializedName("bar") private String bar = null; @@ -109,5 +108,6 @@ public class ReadOnlyFirst { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/SpecialModelName.java index 9744ad08268..10d56096dea 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/SpecialModelName.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * SpecialModelName */ -public class SpecialModelName { +public class SpecialModelName { @SerializedName("$special[property.name]") private Long specialPropertyName = null; @@ -95,5 +94,6 @@ public class SpecialModelName { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Tag.java index 9eef0141c71..11870f0f0a8 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Tag.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Tag.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * Tag */ -public class Tag { +public class Tag { @SerializedName("id") private Long id = null; @@ -118,5 +117,6 @@ public class Tag { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/User.java index 73584bfdccb..b04dc861682 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/User.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/User.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * User */ -public class User { +public class User { @SerializedName("id") private Long id = null; @@ -256,5 +255,6 @@ public class User { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/docs/FakeApi.md b/samples/client/petstore/java/retrofit2/docs/FakeApi.md index f4cfc7e19cc..2e2b792d8d3 100644 --- a/samples/client/petstore/java/retrofit2/docs/FakeApi.md +++ b/samples/client/petstore/java/retrofit2/docs/FakeApi.md @@ -54,7 +54,7 @@ No authorization required # **testEndpointParameters** -> Void testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password) +> Void testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -90,8 +90,9 @@ byte[] binary = B; // byte[] | None LocalDate date = new LocalDate(); // LocalDate | None DateTime dateTime = new DateTime(); // DateTime | None String password = "password_example"; // String | None +String paramCallback = "paramCallback_example"; // String | None try { - Void result = apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password); + Void result = apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); @@ -116,6 +117,7 @@ Name | Type | Description | Notes **date** | **LocalDate**| None | [optional] **dateTime** | **DateTime**| None | [optional] **password** | **String**| None | [optional] + **paramCallback** | **String**| None | [optional] ### Return type diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java index 25bde1256dc..7479e230574 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java @@ -28,7 +28,12 @@ public interface FakeApi { @PATCH("fake") Call testClientModel( - @Body Client body + + + +@retrofit2.http.Body Client body + + ); /** @@ -47,13 +52,84 @@ public interface FakeApi { * @param date None (optional) * @param dateTime None (optional) * @param password None (optional) + * @param paramCallback None (optional) * @return Call<Void> */ - @FormUrlEncoded + @retrofit2.http.FormUrlEncoded @POST("fake") Call testEndpointParameters( - @Field("number") BigDecimal number, @Field("double") Double _double, @Field("pattern_without_delimiter") String patternWithoutDelimiter, @Field("byte") byte[] _byte, @Field("integer") Integer integer, @Field("int32") Integer int32, @Field("int64") Long int64, @Field("float") Float _float, @Field("string") String string, @Field("binary") byte[] binary, @Field("date") LocalDate date, @Field("dateTime") DateTime dateTime, @Field("password") String password + + + + +@retrofit2.http.Field("number") BigDecimal number +, + + + +@retrofit2.http.Field("double") Double _double +, + + + +@retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter +, + + + +@retrofit2.http.Field("byte") byte[] _byte +, + + + +@retrofit2.http.Field("integer") Integer integer +, + + + +@retrofit2.http.Field("int32") Integer int32 +, + + + +@retrofit2.http.Field("int64") Long int64 +, + + + +@retrofit2.http.Field("float") Float _float +, + + + +@retrofit2.http.Field("string") String string +, + + + +@retrofit2.http.Field("binary") byte[] binary +, + + + +@retrofit2.http.Field("date") LocalDate date +, + + + +@retrofit2.http.Field("dateTime") DateTime dateTime +, + + + +@retrofit2.http.Field("password") String password +, + + + +@retrofit2.http.Field("callback") String paramCallback + ); /** @@ -70,10 +146,50 @@ public interface FakeApi { * @return Call<Void> */ - @FormUrlEncoded + @retrofit2.http.FormUrlEncoded @GET("fake") Call testEnumParameters( - @Field("enum_form_string_array") List enumFormStringArray, @Field("enum_form_string") String enumFormString, @Header("enum_header_string_array") List enumHeaderStringArray, @Header("enum_header_string") String enumHeaderString, @Query("enum_query_string_array") CSVParams enumQueryStringArray, @Query("enum_query_string") String enumQueryString, @Query("enum_query_integer") BigDecimal enumQueryInteger, @Field("enum_query_double") Double enumQueryDouble + + + + +@retrofit2.http.Field("enum_form_string_array") List enumFormStringArray +, + + + +@retrofit2.http.Field("enum_form_string") String enumFormString +, + +@retrofit2.http.Header("enum_header_string_array") List enumHeaderStringArray + + +, + +@retrofit2.http.Header("enum_header_string") String enumHeaderString + + +, @retrofit2.http.Query("enum_query_string_array") CSVParams enumQueryStringArray + + + + +, @retrofit2.http.Query("enum_query_string") String enumQueryString + + + + +, @retrofit2.http.Query("enum_query_integer") BigDecimal enumQueryInteger + + + + +, + + + +@retrofit2.http.Field("enum_query_double") Double enumQueryDouble + ); } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java index d5c574fbd3e..bd13312f581 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java @@ -27,7 +27,12 @@ public interface PetApi { @POST("pet") Call addPet( - @Body Pet body + + + +@retrofit2.http.Body Pet body + + ); /** @@ -40,7 +45,17 @@ public interface PetApi { @DELETE("pet/{petId}") Call deletePet( - @Path("petId") Long petId, @Header("api_key") String apiKey + +@retrofit2.http.Path("petId") Long petId + + + +, + +@retrofit2.http.Header("api_key") String apiKey + + + ); /** @@ -52,7 +67,12 @@ public interface PetApi { @GET("pet/findByStatus") Call> findPetsByStatus( - @Query("status") CSVParams status + @retrofit2.http.Query("status") CSVParams status + + + + + ); /** @@ -64,7 +84,12 @@ public interface PetApi { @GET("pet/findByTags") Call> findPetsByTags( - @Query("tags") CSVParams tags + @retrofit2.http.Query("tags") CSVParams tags + + + + + ); /** @@ -76,7 +101,12 @@ public interface PetApi { @GET("pet/{petId}") Call getPetById( - @Path("petId") Long petId + +@retrofit2.http.Path("petId") Long petId + + + + ); /** @@ -88,7 +118,12 @@ public interface PetApi { @PUT("pet") Call updatePet( - @Body Pet body + + + +@retrofit2.http.Body Pet body + + ); /** @@ -100,10 +135,25 @@ public interface PetApi { * @return Call<Void> */ - @FormUrlEncoded + @retrofit2.http.FormUrlEncoded @POST("pet/{petId}") Call updatePetWithForm( - @Path("petId") Long petId, @Field("name") String name, @Field("status") String status + +@retrofit2.http.Path("petId") Long petId + + + +, + + + +@retrofit2.http.Field("name") String name +, + + + +@retrofit2.http.Field("status") String status + ); /** @@ -115,10 +165,25 @@ public interface PetApi { * @return Call<ModelApiResponse> */ - @Multipart + @retrofit2.http.Multipart @POST("pet/{petId}/uploadImage") Call uploadFile( - @Path("petId") Long petId, @Part("additionalMetadata") String additionalMetadata, @Part("file\"; filename=\"file") RequestBody file + +@retrofit2.http.Path("petId") Long petId + + + +, + + + +@retrofit2.http.Part("additionalMetadata") String additionalMetadata +, + + + +@retrofit2.http.Part("file\"; filename=\"file") RequestBody file + ); } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java index 3e19600bedb..ebed8da8f52 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java @@ -25,7 +25,12 @@ public interface StoreApi { @DELETE("store/order/{orderId}") Call deleteOrder( - @Path("orderId") String orderId + +@retrofit2.http.Path("orderId") String orderId + + + + ); /** @@ -47,7 +52,12 @@ public interface StoreApi { @GET("store/order/{orderId}") Call getOrderById( - @Path("orderId") Long orderId + +@retrofit2.http.Path("orderId") Long orderId + + + + ); /** @@ -59,7 +69,12 @@ public interface StoreApi { @POST("store/order") Call placeOrder( - @Body Order body + + + +@retrofit2.http.Body Order body + + ); } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java index 3fc76b6a1b2..1bf7d34d73c 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java @@ -25,7 +25,12 @@ public interface UserApi { @POST("user") Call createUser( - @Body User body + + + +@retrofit2.http.Body User body + + ); /** @@ -37,7 +42,12 @@ public interface UserApi { @POST("user/createWithArray") Call createUsersWithArrayInput( - @Body List body + + + +@retrofit2.http.Body List body + + ); /** @@ -49,7 +59,12 @@ public interface UserApi { @POST("user/createWithList") Call createUsersWithListInput( - @Body List body + + + +@retrofit2.http.Body List body + + ); /** @@ -61,7 +76,12 @@ public interface UserApi { @DELETE("user/{username}") Call deleteUser( - @Path("username") String username + +@retrofit2.http.Path("username") String username + + + + ); /** @@ -73,7 +93,12 @@ public interface UserApi { @GET("user/{username}") Call getUserByName( - @Path("username") String username + +@retrofit2.http.Path("username") String username + + + + ); /** @@ -86,7 +111,17 @@ public interface UserApi { @GET("user/login") Call loginUser( - @Query("username") String username, @Query("password") String password + @retrofit2.http.Query("username") String username + + + + +, @retrofit2.http.Query("password") String password + + + + + ); /** @@ -109,7 +144,17 @@ public interface UserApi { @PUT("user/{username}") Call updateUser( - @Path("username") String username, @Body User body + +@retrofit2.http.Path("username") String username + + + +, + + +@retrofit2.http.Body User body + + ); } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java index d20b1402ce2..81d139e630b 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java @@ -33,12 +33,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - /** * AdditionalPropertiesClass */ -public class AdditionalPropertiesClass { +public class AdditionalPropertiesClass { @SerializedName("map_property") private Map mapProperty = new HashMap(); @@ -131,5 +130,6 @@ public class AdditionalPropertiesClass { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Animal.java index 9b1ff3df1c5..bc73c4f93cb 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Animal.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Animal.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * Animal */ -public class Animal { +public class Animal { @SerializedName("className") private String className = null; @@ -118,5 +117,6 @@ public class Animal { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/AnimalFarm.java index 563476ccb3d..8a50c9c6cb5 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/AnimalFarm.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/AnimalFarm.java @@ -30,12 +30,11 @@ import io.swagger.client.model.Animal; import java.util.ArrayList; import java.util.List; - /** * AnimalFarm */ -public class AnimalFarm extends ArrayList { +public class AnimalFarm extends ArrayList { @Override public boolean equals(java.lang.Object o) { @@ -72,5 +71,6 @@ public class AnimalFarm extends ArrayList { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java index 4c2fa22800f..e0dde620ab4 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java @@ -33,12 +33,11 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; - /** * ArrayOfArrayOfNumberOnly */ -public class ArrayOfArrayOfNumberOnly { +public class ArrayOfArrayOfNumberOnly { @SerializedName("ArrayArrayNumber") private List> arrayArrayNumber = new ArrayList>(); @@ -103,5 +102,6 @@ public class ArrayOfArrayOfNumberOnly { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java index 3c7d74dc3b5..e529ebc4fa8 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java @@ -33,12 +33,11 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; - /** * ArrayOfNumberOnly */ -public class ArrayOfNumberOnly { +public class ArrayOfNumberOnly { @SerializedName("ArrayNumber") private List arrayNumber = new ArrayList(); @@ -103,5 +102,6 @@ public class ArrayOfNumberOnly { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayTest.java index 7e08b24fa6e..80df1b341f5 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayTest.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ArrayTest.java @@ -33,12 +33,11 @@ import io.swagger.client.model.ReadOnlyFirst; import java.util.ArrayList; import java.util.List; - /** * ArrayTest */ -public class ArrayTest { +public class ArrayTest { @SerializedName("array_of_string") private List arrayOfString = new ArrayList(); @@ -159,5 +158,6 @@ public class ArrayTest { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Cat.java index 9c5cb39f648..10a2f2c5c8d 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Cat.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Cat.java @@ -31,12 +31,11 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import io.swagger.client.model.Animal; - /** * Cat */ -public class Cat extends Animal { +public class Cat extends Animal { @SerializedName("declawed") private Boolean declawed = null; @@ -97,5 +96,6 @@ public class Cat extends Animal { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java index 44e76030eff..153df9edbfa 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Category.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * Category */ -public class Category { +public class Category { @SerializedName("id") private Long id = null; @@ -118,5 +117,6 @@ public class Category { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Client.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Client.java index 54a54647918..1eb9e755db3 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Client.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Client.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * Client */ -public class Client { +public class Client { @SerializedName("client") private String client = null; @@ -95,5 +94,6 @@ public class Client { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Dog.java index 880c159616c..079def9ecc6 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Dog.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Dog.java @@ -31,12 +31,11 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import io.swagger.client.model.Animal; - /** * Dog */ -public class Dog extends Animal { +public class Dog extends Animal { @SerializedName("breed") private String breed = null; @@ -97,5 +96,6 @@ public class Dog extends Animal { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumArrays.java index c5096738755..7eea2d2a911 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumArrays.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumArrays.java @@ -32,12 +32,11 @@ import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.List; - /** * EnumArrays */ -public class EnumArrays { +public class EnumArrays { /** * Gets or Sets justSymbol */ @@ -169,5 +168,6 @@ public class EnumArrays { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumClass.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumClass.java index 7862a8b8952..a6072c381c4 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumClass.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumClass.java @@ -29,7 +29,6 @@ import java.util.Objects; import com.google.gson.annotations.SerializedName; - /** * Gets or Sets EnumClass */ diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumTest.java index 83896fbd849..bdd3a40bb28 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/EnumTest.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * EnumTest */ -public class EnumTest { +public class EnumTest { /** * Gets or Sets enumString */ @@ -207,5 +206,6 @@ public class EnumTest { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/FormatTest.java index a05f1d5c811..023042b8d96 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/FormatTest.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/FormatTest.java @@ -33,12 +33,11 @@ import java.math.BigDecimal; import org.joda.time.DateTime; import org.joda.time.LocalDate; - /** * FormatTest */ -public class FormatTest { +public class FormatTest { @SerializedName("integer") private Integer integer = null; @@ -384,5 +383,6 @@ public class FormatTest { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java index e53b1a0d8be..43a5b6a6c92 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * HasOnlyReadOnly */ -public class HasOnlyReadOnly { +public class HasOnlyReadOnly { @SerializedName("bar") private String bar = null; @@ -100,5 +99,6 @@ public class HasOnlyReadOnly { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MapTest.java index e7d394ed035..75586c606c9 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MapTest.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MapTest.java @@ -33,12 +33,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - /** * MapTest */ -public class MapTest { +public class MapTest { @SerializedName("map_map_of_string") private Map> mapMapOfString = new HashMap>(); @@ -153,5 +152,6 @@ public class MapTest { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 887ba516d72..e6b8987656a 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -35,12 +35,11 @@ import java.util.List; import java.util.Map; import org.joda.time.DateTime; - /** * MixedPropertiesAndAdditionalPropertiesClass */ -public class MixedPropertiesAndAdditionalPropertiesClass { +public class MixedPropertiesAndAdditionalPropertiesClass { @SerializedName("uuid") private String uuid = null; @@ -151,5 +150,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Model200Response.java index 980bc83e869..eabc63cd389 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Model200Response.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Model200Response.java @@ -30,13 +30,12 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * Model for testing model name starting with number */ @ApiModel(description = "Model for testing model name starting with number") -public class Model200Response { +public class Model200Response { @SerializedName("name") private Integer name = null; @@ -119,5 +118,6 @@ public class Model200Response { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelApiResponse.java index f9c162a7934..e410a24757f 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelApiResponse.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * ModelApiResponse */ -public class ModelApiResponse { +public class ModelApiResponse { @SerializedName("code") private Integer code = null; @@ -141,5 +140,6 @@ public class ModelApiResponse { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelReturn.java index bbe7780055c..01d69fecb68 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelReturn.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelReturn.java @@ -30,13 +30,12 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * Model for testing reserved words */ @ApiModel(description = "Model for testing reserved words") -public class ModelReturn { +public class ModelReturn { @SerializedName("return") private Integer _return = null; @@ -96,5 +95,6 @@ public class ModelReturn { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Name.java index d51354ceffa..c50f477abc3 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Name.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Name.java @@ -30,13 +30,12 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * Model for testing model name same as property name */ @ApiModel(description = "Model for testing model name same as property name") -public class Name { +public class Name { @SerializedName("name") private Integer name = null; @@ -147,5 +146,6 @@ public class Name { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/NumberOnly.java index 2b1817300a9..0653baec68b 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/NumberOnly.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/NumberOnly.java @@ -31,12 +31,11 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; - /** * NumberOnly */ -public class NumberOnly { +public class NumberOnly { @SerializedName("JustNumber") private BigDecimal justNumber = null; @@ -96,5 +95,6 @@ public class NumberOnly { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java index f52e7bd5db4..d15cca81e05 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Order.java @@ -31,12 +31,11 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.joda.time.DateTime; - /** * Order */ -public class Order { +public class Order { @SerializedName("id") private Long id = null; @@ -236,5 +235,6 @@ public class Order { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java index 06443e56915..2363e9ed02e 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Pet.java @@ -34,12 +34,11 @@ import io.swagger.client.model.Tag; import java.util.ArrayList; import java.util.List; - /** * Pet */ -public class Pet { +public class Pet { @SerializedName("id") private Long id = null; @@ -249,5 +248,6 @@ public class Pet { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java index 75dbc55f9f5..f9f1503366f 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ReadOnlyFirst.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * ReadOnlyFirst */ -public class ReadOnlyFirst { +public class ReadOnlyFirst { @SerializedName("bar") private String bar = null; @@ -109,5 +108,6 @@ public class ReadOnlyFirst { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/SpecialModelName.java index 9744ad08268..10d56096dea 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/SpecialModelName.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * SpecialModelName */ -public class SpecialModelName { +public class SpecialModelName { @SerializedName("$special[property.name]") private Long specialPropertyName = null; @@ -95,5 +94,6 @@ public class SpecialModelName { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java index 9eef0141c71..11870f0f0a8 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Tag.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * Tag */ -public class Tag { +public class Tag { @SerializedName("id") private Long id = null; @@ -118,5 +117,6 @@ public class Tag { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java index 73584bfdccb..b04dc861682 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/User.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * User */ -public class User { +public class User { @SerializedName("id") private Long id = null; @@ -256,5 +255,6 @@ public class User { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java index 2bf3ea9e839..924c81ff6dc 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java @@ -28,7 +28,12 @@ public interface FakeApi { @PATCH("fake") Observable testClientModel( - @Body Client body + + + +@retrofit2.http.Body Client body + + ); /** @@ -47,13 +52,84 @@ public interface FakeApi { * @param date None (optional) * @param dateTime None (optional) * @param password None (optional) + * @param paramCallback None (optional) * @return Call<Void> */ - @FormUrlEncoded + @retrofit2.http.FormUrlEncoded @POST("fake") Observable testEndpointParameters( - @Field("number") BigDecimal number, @Field("double") Double _double, @Field("pattern_without_delimiter") String patternWithoutDelimiter, @Field("byte") byte[] _byte, @Field("integer") Integer integer, @Field("int32") Integer int32, @Field("int64") Long int64, @Field("float") Float _float, @Field("string") String string, @Field("binary") byte[] binary, @Field("date") LocalDate date, @Field("dateTime") DateTime dateTime, @Field("password") String password + + + + +@retrofit2.http.Field("number") BigDecimal number +, + + + +@retrofit2.http.Field("double") Double _double +, + + + +@retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter +, + + + +@retrofit2.http.Field("byte") byte[] _byte +, + + + +@retrofit2.http.Field("integer") Integer integer +, + + + +@retrofit2.http.Field("int32") Integer int32 +, + + + +@retrofit2.http.Field("int64") Long int64 +, + + + +@retrofit2.http.Field("float") Float _float +, + + + +@retrofit2.http.Field("string") String string +, + + + +@retrofit2.http.Field("binary") byte[] binary +, + + + +@retrofit2.http.Field("date") LocalDate date +, + + + +@retrofit2.http.Field("dateTime") DateTime dateTime +, + + + +@retrofit2.http.Field("password") String password +, + + + +@retrofit2.http.Field("callback") String paramCallback + ); /** @@ -70,10 +146,50 @@ public interface FakeApi { * @return Call<Void> */ - @FormUrlEncoded + @retrofit2.http.FormUrlEncoded @GET("fake") Observable testEnumParameters( - @Field("enum_form_string_array") List enumFormStringArray, @Field("enum_form_string") String enumFormString, @Header("enum_header_string_array") List enumHeaderStringArray, @Header("enum_header_string") String enumHeaderString, @Query("enum_query_string_array") CSVParams enumQueryStringArray, @Query("enum_query_string") String enumQueryString, @Query("enum_query_integer") BigDecimal enumQueryInteger, @Field("enum_query_double") Double enumQueryDouble + + + + +@retrofit2.http.Field("enum_form_string_array") List enumFormStringArray +, + + + +@retrofit2.http.Field("enum_form_string") String enumFormString +, + +@retrofit2.http.Header("enum_header_string_array") List enumHeaderStringArray + + +, + +@retrofit2.http.Header("enum_header_string") String enumHeaderString + + +, @retrofit2.http.Query("enum_query_string_array") CSVParams enumQueryStringArray + + + + +, @retrofit2.http.Query("enum_query_string") String enumQueryString + + + + +, @retrofit2.http.Query("enum_query_integer") BigDecimal enumQueryInteger + + + + +, + + + +@retrofit2.http.Field("enum_query_double") Double enumQueryDouble + ); } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java index 77cfd8ae3de..cc6a867c755 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java @@ -27,7 +27,12 @@ public interface PetApi { @POST("pet") Observable addPet( - @Body Pet body + + + +@retrofit2.http.Body Pet body + + ); /** @@ -40,7 +45,17 @@ public interface PetApi { @DELETE("pet/{petId}") Observable deletePet( - @Path("petId") Long petId, @Header("api_key") String apiKey + +@retrofit2.http.Path("petId") Long petId + + + +, + +@retrofit2.http.Header("api_key") String apiKey + + + ); /** @@ -52,7 +67,12 @@ public interface PetApi { @GET("pet/findByStatus") Observable> findPetsByStatus( - @Query("status") CSVParams status + @retrofit2.http.Query("status") CSVParams status + + + + + ); /** @@ -64,7 +84,12 @@ public interface PetApi { @GET("pet/findByTags") Observable> findPetsByTags( - @Query("tags") CSVParams tags + @retrofit2.http.Query("tags") CSVParams tags + + + + + ); /** @@ -76,7 +101,12 @@ public interface PetApi { @GET("pet/{petId}") Observable getPetById( - @Path("petId") Long petId + +@retrofit2.http.Path("petId") Long petId + + + + ); /** @@ -88,7 +118,12 @@ public interface PetApi { @PUT("pet") Observable updatePet( - @Body Pet body + + + +@retrofit2.http.Body Pet body + + ); /** @@ -100,10 +135,25 @@ public interface PetApi { * @return Call<Void> */ - @FormUrlEncoded + @retrofit2.http.FormUrlEncoded @POST("pet/{petId}") Observable updatePetWithForm( - @Path("petId") Long petId, @Field("name") String name, @Field("status") String status + +@retrofit2.http.Path("petId") Long petId + + + +, + + + +@retrofit2.http.Field("name") String name +, + + + +@retrofit2.http.Field("status") String status + ); /** @@ -115,10 +165,25 @@ public interface PetApi { * @return Call<ModelApiResponse> */ - @Multipart + @retrofit2.http.Multipart @POST("pet/{petId}/uploadImage") Observable uploadFile( - @Path("petId") Long petId, @Part("additionalMetadata") String additionalMetadata, @Part("file\"; filename=\"file") RequestBody file + +@retrofit2.http.Path("petId") Long petId + + + +, + + + +@retrofit2.http.Part("additionalMetadata") String additionalMetadata +, + + + +@retrofit2.http.Part("file\"; filename=\"file") RequestBody file + ); } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java index 4e93813692d..f763e317070 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java @@ -25,7 +25,12 @@ public interface StoreApi { @DELETE("store/order/{orderId}") Observable deleteOrder( - @Path("orderId") String orderId + +@retrofit2.http.Path("orderId") String orderId + + + + ); /** @@ -47,7 +52,12 @@ public interface StoreApi { @GET("store/order/{orderId}") Observable getOrderById( - @Path("orderId") Long orderId + +@retrofit2.http.Path("orderId") Long orderId + + + + ); /** @@ -59,7 +69,12 @@ public interface StoreApi { @POST("store/order") Observable placeOrder( - @Body Order body + + + +@retrofit2.http.Body Order body + + ); } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/UserApi.java index 24a05ec40b8..4f13893a8f8 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/UserApi.java @@ -25,7 +25,12 @@ public interface UserApi { @POST("user") Observable createUser( - @Body User body + + + +@retrofit2.http.Body User body + + ); /** @@ -37,7 +42,12 @@ public interface UserApi { @POST("user/createWithArray") Observable createUsersWithArrayInput( - @Body List body + + + +@retrofit2.http.Body List body + + ); /** @@ -49,7 +59,12 @@ public interface UserApi { @POST("user/createWithList") Observable createUsersWithListInput( - @Body List body + + + +@retrofit2.http.Body List body + + ); /** @@ -61,7 +76,12 @@ public interface UserApi { @DELETE("user/{username}") Observable deleteUser( - @Path("username") String username + +@retrofit2.http.Path("username") String username + + + + ); /** @@ -73,7 +93,12 @@ public interface UserApi { @GET("user/{username}") Observable getUserByName( - @Path("username") String username + +@retrofit2.http.Path("username") String username + + + + ); /** @@ -86,7 +111,17 @@ public interface UserApi { @GET("user/login") Observable loginUser( - @Query("username") String username, @Query("password") String password + @retrofit2.http.Query("username") String username + + + + +, @retrofit2.http.Query("password") String password + + + + + ); /** @@ -109,7 +144,17 @@ public interface UserApi { @PUT("user/{username}") Observable updateUser( - @Path("username") String username, @Body User body + +@retrofit2.http.Path("username") String username + + + +, + + +@retrofit2.http.Body User body + + ); } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java index d20b1402ce2..81d139e630b 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java @@ -33,12 +33,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - /** * AdditionalPropertiesClass */ -public class AdditionalPropertiesClass { +public class AdditionalPropertiesClass { @SerializedName("map_property") private Map mapProperty = new HashMap(); @@ -131,5 +130,6 @@ public class AdditionalPropertiesClass { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Animal.java index 9b1ff3df1c5..bc73c4f93cb 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Animal.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Animal.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * Animal */ -public class Animal { +public class Animal { @SerializedName("className") private String className = null; @@ -118,5 +117,6 @@ public class Animal { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/AnimalFarm.java index 563476ccb3d..8a50c9c6cb5 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/AnimalFarm.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/AnimalFarm.java @@ -30,12 +30,11 @@ import io.swagger.client.model.Animal; import java.util.ArrayList; import java.util.List; - /** * AnimalFarm */ -public class AnimalFarm extends ArrayList { +public class AnimalFarm extends ArrayList { @Override public boolean equals(java.lang.Object o) { @@ -72,5 +71,6 @@ public class AnimalFarm extends ArrayList { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java index 4c2fa22800f..e0dde620ab4 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java @@ -33,12 +33,11 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; - /** * ArrayOfArrayOfNumberOnly */ -public class ArrayOfArrayOfNumberOnly { +public class ArrayOfArrayOfNumberOnly { @SerializedName("ArrayArrayNumber") private List> arrayArrayNumber = new ArrayList>(); @@ -103,5 +102,6 @@ public class ArrayOfArrayOfNumberOnly { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java index 3c7d74dc3b5..e529ebc4fa8 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java @@ -33,12 +33,11 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; - /** * ArrayOfNumberOnly */ -public class ArrayOfNumberOnly { +public class ArrayOfNumberOnly { @SerializedName("ArrayNumber") private List arrayNumber = new ArrayList(); @@ -103,5 +102,6 @@ public class ArrayOfNumberOnly { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayTest.java index 7e08b24fa6e..80df1b341f5 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayTest.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ArrayTest.java @@ -33,12 +33,11 @@ import io.swagger.client.model.ReadOnlyFirst; import java.util.ArrayList; import java.util.List; - /** * ArrayTest */ -public class ArrayTest { +public class ArrayTest { @SerializedName("array_of_string") private List arrayOfString = new ArrayList(); @@ -159,5 +158,6 @@ public class ArrayTest { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Cat.java index 9c5cb39f648..10a2f2c5c8d 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Cat.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Cat.java @@ -31,12 +31,11 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import io.swagger.client.model.Animal; - /** * Cat */ -public class Cat extends Animal { +public class Cat extends Animal { @SerializedName("declawed") private Boolean declawed = null; @@ -97,5 +96,6 @@ public class Cat extends Animal { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Category.java index 44e76030eff..153df9edbfa 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Category.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Category.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * Category */ -public class Category { +public class Category { @SerializedName("id") private Long id = null; @@ -118,5 +117,6 @@ public class Category { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Client.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Client.java index 54a54647918..1eb9e755db3 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Client.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Client.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * Client */ -public class Client { +public class Client { @SerializedName("client") private String client = null; @@ -95,5 +94,6 @@ public class Client { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Dog.java index 880c159616c..079def9ecc6 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Dog.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Dog.java @@ -31,12 +31,11 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import io.swagger.client.model.Animal; - /** * Dog */ -public class Dog extends Animal { +public class Dog extends Animal { @SerializedName("breed") private String breed = null; @@ -97,5 +96,6 @@ public class Dog extends Animal { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumArrays.java index c5096738755..7eea2d2a911 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumArrays.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumArrays.java @@ -32,12 +32,11 @@ import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.List; - /** * EnumArrays */ -public class EnumArrays { +public class EnumArrays { /** * Gets or Sets justSymbol */ @@ -169,5 +168,6 @@ public class EnumArrays { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumClass.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumClass.java index 7862a8b8952..a6072c381c4 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumClass.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumClass.java @@ -29,7 +29,6 @@ import java.util.Objects; import com.google.gson.annotations.SerializedName; - /** * Gets or Sets EnumClass */ diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumTest.java index 83896fbd849..bdd3a40bb28 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/EnumTest.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * EnumTest */ -public class EnumTest { +public class EnumTest { /** * Gets or Sets enumString */ @@ -207,5 +206,6 @@ public class EnumTest { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/FormatTest.java index a05f1d5c811..023042b8d96 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/FormatTest.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/FormatTest.java @@ -33,12 +33,11 @@ import java.math.BigDecimal; import org.joda.time.DateTime; import org.joda.time.LocalDate; - /** * FormatTest */ -public class FormatTest { +public class FormatTest { @SerializedName("integer") private Integer integer = null; @@ -384,5 +383,6 @@ public class FormatTest { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java index e53b1a0d8be..43a5b6a6c92 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * HasOnlyReadOnly */ -public class HasOnlyReadOnly { +public class HasOnlyReadOnly { @SerializedName("bar") private String bar = null; @@ -100,5 +99,6 @@ public class HasOnlyReadOnly { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MapTest.java index e7d394ed035..75586c606c9 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MapTest.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MapTest.java @@ -33,12 +33,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - /** * MapTest */ -public class MapTest { +public class MapTest { @SerializedName("map_map_of_string") private Map> mapMapOfString = new HashMap>(); @@ -153,5 +152,6 @@ public class MapTest { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 887ba516d72..e6b8987656a 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -35,12 +35,11 @@ import java.util.List; import java.util.Map; import org.joda.time.DateTime; - /** * MixedPropertiesAndAdditionalPropertiesClass */ -public class MixedPropertiesAndAdditionalPropertiesClass { +public class MixedPropertiesAndAdditionalPropertiesClass { @SerializedName("uuid") private String uuid = null; @@ -151,5 +150,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Model200Response.java index 980bc83e869..eabc63cd389 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Model200Response.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Model200Response.java @@ -30,13 +30,12 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * Model for testing model name starting with number */ @ApiModel(description = "Model for testing model name starting with number") -public class Model200Response { +public class Model200Response { @SerializedName("name") private Integer name = null; @@ -119,5 +118,6 @@ public class Model200Response { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelApiResponse.java index f9c162a7934..e410a24757f 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelApiResponse.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * ModelApiResponse */ -public class ModelApiResponse { +public class ModelApiResponse { @SerializedName("code") private Integer code = null; @@ -141,5 +140,6 @@ public class ModelApiResponse { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelReturn.java index bbe7780055c..01d69fecb68 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelReturn.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelReturn.java @@ -30,13 +30,12 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * Model for testing reserved words */ @ApiModel(description = "Model for testing reserved words") -public class ModelReturn { +public class ModelReturn { @SerializedName("return") private Integer _return = null; @@ -96,5 +95,6 @@ public class ModelReturn { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Name.java index d51354ceffa..c50f477abc3 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Name.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Name.java @@ -30,13 +30,12 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * Model for testing model name same as property name */ @ApiModel(description = "Model for testing model name same as property name") -public class Name { +public class Name { @SerializedName("name") private Integer name = null; @@ -147,5 +146,6 @@ public class Name { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/NumberOnly.java index 2b1817300a9..0653baec68b 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/NumberOnly.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/NumberOnly.java @@ -31,12 +31,11 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; - /** * NumberOnly */ -public class NumberOnly { +public class NumberOnly { @SerializedName("JustNumber") private BigDecimal justNumber = null; @@ -96,5 +95,6 @@ public class NumberOnly { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Order.java index f52e7bd5db4..d15cca81e05 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Order.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Order.java @@ -31,12 +31,11 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.joda.time.DateTime; - /** * Order */ -public class Order { +public class Order { @SerializedName("id") private Long id = null; @@ -236,5 +235,6 @@ public class Order { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Pet.java index 06443e56915..2363e9ed02e 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Pet.java @@ -34,12 +34,11 @@ import io.swagger.client.model.Tag; import java.util.ArrayList; import java.util.List; - /** * Pet */ -public class Pet { +public class Pet { @SerializedName("id") private Long id = null; @@ -249,5 +248,6 @@ public class Pet { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ReadOnlyFirst.java index 75dbc55f9f5..f9f1503366f 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ReadOnlyFirst.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * ReadOnlyFirst */ -public class ReadOnlyFirst { +public class ReadOnlyFirst { @SerializedName("bar") private String bar = null; @@ -109,5 +108,6 @@ public class ReadOnlyFirst { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/SpecialModelName.java index 9744ad08268..10d56096dea 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/SpecialModelName.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * SpecialModelName */ -public class SpecialModelName { +public class SpecialModelName { @SerializedName("$special[property.name]") private Long specialPropertyName = null; @@ -95,5 +94,6 @@ public class SpecialModelName { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Tag.java index 9eef0141c71..11870f0f0a8 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Tag.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Tag.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * Tag */ -public class Tag { +public class Tag { @SerializedName("id") private Long id = null; @@ -118,5 +117,6 @@ public class Tag { } return o.toString().replace("\n", "\n "); } + } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/User.java index 73584bfdccb..b04dc861682 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/User.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/User.java @@ -30,12 +30,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - /** * User */ -public class User { +public class User { @SerializedName("id") private Long id = null; @@ -256,5 +255,6 @@ public class User { } return o.toString().replace("\n", "\n "); } + } From 47d3c3a7678ccd92d829f09d2b8b95a49a38f263 Mon Sep 17 00:00:00 2001 From: wing328 Date: Wed, 12 Oct 2016 15:48:34 +0800 Subject: [PATCH 3/3] update retrofit1,2 samples --- .../client/petstore/java/retrofit/gradlew.bat | 180 ++++++------- .../java/io/swagger/client/api/FakeApi.java | 244 +----------------- .../java/io/swagger/client/api/PetApi.java | 160 ++---------- .../java/io/swagger/client/api/StoreApi.java | 42 +-- .../java/io/swagger/client/api/UserApi.java | 118 +-------- .../petstore/java/retrofit2/gradlew.bat | 180 ++++++------- .../java/io/swagger/client/api/FakeApi.java | 123 +-------- .../java/io/swagger/client/api/PetApi.java | 79 +----- .../java/io/swagger/client/api/StoreApi.java | 21 +- .../java/io/swagger/client/api/UserApi.java | 59 +---- .../petstore/java/retrofit2rx/docs/FakeApi.md | 6 +- .../petstore/java/retrofit2rx/gradlew.bat | 180 ++++++------- .../java/io/swagger/client/api/FakeApi.java | 123 +-------- .../java/io/swagger/client/api/PetApi.java | 79 +----- .../java/io/swagger/client/api/StoreApi.java | 21 +- .../java/io/swagger/client/api/UserApi.java | 59 +---- 16 files changed, 358 insertions(+), 1316 deletions(-) diff --git a/samples/client/petstore/java/retrofit/gradlew.bat b/samples/client/petstore/java/retrofit/gradlew.bat index 72d362dafd8..5f192121eb4 100644 --- a/samples/client/petstore/java/retrofit/gradlew.bat +++ b/samples/client/petstore/java/retrofit/gradlew.bat @@ -1,90 +1,90 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java index e1c4644feea..0f8f3975814 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java @@ -8,8 +8,8 @@ import retrofit.mime.*; import io.swagger.client.model.Client; import org.joda.time.LocalDate; -import java.math.BigDecimal; import org.joda.time.DateTime; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; @@ -27,12 +27,7 @@ public interface FakeApi { @PATCH("/fake") Client testClientModel( - - - -@retrofit.http.Body Client body - - + @retrofit.http.Body Client body ); /** @@ -45,12 +40,7 @@ public interface FakeApi { @PATCH("/fake") void testClientModel( - - - -@retrofit.http.Body Client body - -, Callback cb + @retrofit.http.Body Client body, Callback cb ); /** * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -76,77 +66,7 @@ public interface FakeApi { @retrofit.http.FormUrlEncoded @POST("/fake") Void testEndpointParameters( - - - - -@retrofit.http.Field("number") BigDecimal number -, - - - -@retrofit.http.Field("double") Double _double -, - - - -@retrofit.http.Field("pattern_without_delimiter") String patternWithoutDelimiter -, - - - -@retrofit.http.Field("byte") byte[] _byte -, - - - -@retrofit.http.Field("integer") Integer integer -, - - - -@retrofit.http.Field("int32") Integer int32 -, - - - -@retrofit.http.Field("int64") Long int64 -, - - - -@retrofit.http.Field("float") Float _float -, - - - -@retrofit.http.Field("string") String string -, - - - -@retrofit.http.Field("binary") byte[] binary -, - - - -@retrofit.http.Field("date") LocalDate date -, - - - -@retrofit.http.Field("dateTime") DateTime dateTime -, - - - -@retrofit.http.Field("password") String password -, - - - -@retrofit.http.Field("callback") String paramCallback - + @retrofit.http.Field("number") BigDecimal number, @retrofit.http.Field("double") Double _double, @retrofit.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit.http.Field("byte") byte[] _byte, @retrofit.http.Field("integer") Integer integer, @retrofit.http.Field("int32") Integer int32, @retrofit.http.Field("int64") Long int64, @retrofit.http.Field("float") Float _float, @retrofit.http.Field("string") String string, @retrofit.http.Field("binary") byte[] binary, @retrofit.http.Field("date") LocalDate date, @retrofit.http.Field("dateTime") DateTime dateTime, @retrofit.http.Field("password") String password, @retrofit.http.Field("callback") String paramCallback ); /** @@ -173,77 +93,7 @@ public interface FakeApi { @retrofit.http.FormUrlEncoded @POST("/fake") void testEndpointParameters( - - - - -@retrofit.http.Field("number") BigDecimal number -, - - - -@retrofit.http.Field("double") Double _double -, - - - -@retrofit.http.Field("pattern_without_delimiter") String patternWithoutDelimiter -, - - - -@retrofit.http.Field("byte") byte[] _byte -, - - - -@retrofit.http.Field("integer") Integer integer -, - - - -@retrofit.http.Field("int32") Integer int32 -, - - - -@retrofit.http.Field("int64") Long int64 -, - - - -@retrofit.http.Field("float") Float _float -, - - - -@retrofit.http.Field("string") String string -, - - - -@retrofit.http.Field("binary") byte[] binary -, - - - -@retrofit.http.Field("date") LocalDate date -, - - - -@retrofit.http.Field("dateTime") DateTime dateTime -, - - - -@retrofit.http.Field("password") String password -, - - - -@retrofit.http.Field("callback") String paramCallback -, Callback cb + @retrofit.http.Field("number") BigDecimal number, @retrofit.http.Field("double") Double _double, @retrofit.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit.http.Field("byte") byte[] _byte, @retrofit.http.Field("integer") Integer integer, @retrofit.http.Field("int32") Integer int32, @retrofit.http.Field("int64") Long int64, @retrofit.http.Field("float") Float _float, @retrofit.http.Field("string") String string, @retrofit.http.Field("binary") byte[] binary, @retrofit.http.Field("date") LocalDate date, @retrofit.http.Field("dateTime") DateTime dateTime, @retrofit.http.Field("password") String password, @retrofit.http.Field("callback") String paramCallback, Callback cb ); /** * To test enum parameters @@ -263,47 +113,7 @@ public interface FakeApi { @retrofit.http.FormUrlEncoded @GET("/fake") Void testEnumParameters( - - - - -@retrofit.http.Field("enum_form_string_array") List enumFormStringArray -, - - - -@retrofit.http.Field("enum_form_string") String enumFormString -, - -@retrofit.http.Header("enum_header_string_array") List enumHeaderStringArray - - -, - -@retrofit.http.Header("enum_header_string") String enumHeaderString - - -, @retrofit.http.Query("enum_query_string_array") CSVParams enumQueryStringArray - - - - -, @retrofit.http.Query("enum_query_string") String enumQueryString - - - - -, @retrofit.http.Query("enum_query_integer") BigDecimal enumQueryInteger - - - - -, - - - -@retrofit.http.Field("enum_query_double") Double enumQueryDouble - + @retrofit.http.Field("enum_form_string_array") List enumFormStringArray, @retrofit.http.Field("enum_form_string") String enumFormString, @retrofit.http.Header("enum_header_string_array") List enumHeaderStringArray, @retrofit.http.Header("enum_header_string") String enumHeaderString, @retrofit.http.Query("enum_query_string_array") CSVParams enumQueryStringArray, @retrofit.http.Query("enum_query_string") String enumQueryString, @retrofit.http.Query("enum_query_integer") BigDecimal enumQueryInteger, @retrofit.http.Field("enum_query_double") Double enumQueryDouble ); /** @@ -324,46 +134,6 @@ public interface FakeApi { @retrofit.http.FormUrlEncoded @GET("/fake") void testEnumParameters( - - - - -@retrofit.http.Field("enum_form_string_array") List enumFormStringArray -, - - - -@retrofit.http.Field("enum_form_string") String enumFormString -, - -@retrofit.http.Header("enum_header_string_array") List enumHeaderStringArray - - -, - -@retrofit.http.Header("enum_header_string") String enumHeaderString - - -, @retrofit.http.Query("enum_query_string_array") CSVParams enumQueryStringArray - - - - -, @retrofit.http.Query("enum_query_string") String enumQueryString - - - - -, @retrofit.http.Query("enum_query_integer") BigDecimal enumQueryInteger - - - - -, - - - -@retrofit.http.Field("enum_query_double") Double enumQueryDouble -, Callback cb + @retrofit.http.Field("enum_form_string_array") List enumFormStringArray, @retrofit.http.Field("enum_form_string") String enumFormString, @retrofit.http.Header("enum_header_string_array") List enumHeaderStringArray, @retrofit.http.Header("enum_header_string") String enumHeaderString, @retrofit.http.Query("enum_query_string_array") CSVParams enumQueryStringArray, @retrofit.http.Query("enum_query_string") String enumQueryString, @retrofit.http.Query("enum_query_integer") BigDecimal enumQueryInteger, @retrofit.http.Field("enum_query_double") Double enumQueryDouble, Callback cb ); } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java index eaeb49ffba4..eaaac18845f 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java @@ -7,8 +7,8 @@ import retrofit.http.*; import retrofit.mime.*; import io.swagger.client.model.Pet; -import io.swagger.client.model.ModelApiResponse; import java.io.File; +import io.swagger.client.model.ModelApiResponse; import java.util.ArrayList; import java.util.HashMap; @@ -26,12 +26,7 @@ public interface PetApi { @POST("/pet") Void addPet( - - - -@retrofit.http.Body Pet body - - + @retrofit.http.Body Pet body ); /** @@ -44,12 +39,7 @@ public interface PetApi { @POST("/pet") void addPet( - - - -@retrofit.http.Body Pet body - -, Callback cb + @retrofit.http.Body Pet body, Callback cb ); /** * Deletes a pet @@ -62,17 +52,7 @@ public interface PetApi { @DELETE("/pet/{petId}") Void deletePet( - -@retrofit.http.Path("petId") Long petId - - - -, - -@retrofit.http.Header("api_key") String apiKey - - - + @retrofit.http.Path("petId") Long petId, @retrofit.http.Header("api_key") String apiKey ); /** @@ -86,17 +66,7 @@ public interface PetApi { @DELETE("/pet/{petId}") void deletePet( - -@retrofit.http.Path("petId") Long petId - - - -, - -@retrofit.http.Header("api_key") String apiKey - - -, Callback cb + @retrofit.http.Path("petId") Long petId, @retrofit.http.Header("api_key") String apiKey, Callback cb ); /** * Finds Pets by status @@ -109,11 +79,6 @@ public interface PetApi { @GET("/pet/findByStatus") List findPetsByStatus( @retrofit.http.Query("status") CSVParams status - - - - - ); /** @@ -126,12 +91,7 @@ public interface PetApi { @GET("/pet/findByStatus") void findPetsByStatus( - @retrofit.http.Query("status") CSVParams status - - - - -, Callback> cb + @retrofit.http.Query("status") CSVParams status, Callback> cb ); /** * Finds Pets by tags @@ -144,11 +104,6 @@ public interface PetApi { @GET("/pet/findByTags") List findPetsByTags( @retrofit.http.Query("tags") CSVParams tags - - - - - ); /** @@ -161,12 +116,7 @@ public interface PetApi { @GET("/pet/findByTags") void findPetsByTags( - @retrofit.http.Query("tags") CSVParams tags - - - - -, Callback> cb + @retrofit.http.Query("tags") CSVParams tags, Callback> cb ); /** * Find pet by ID @@ -178,12 +128,7 @@ public interface PetApi { @GET("/pet/{petId}") Pet getPetById( - -@retrofit.http.Path("petId") Long petId - - - - + @retrofit.http.Path("petId") Long petId ); /** @@ -196,12 +141,7 @@ public interface PetApi { @GET("/pet/{petId}") void getPetById( - -@retrofit.http.Path("petId") Long petId - - - -, Callback cb + @retrofit.http.Path("petId") Long petId, Callback cb ); /** * Update an existing pet @@ -213,12 +153,7 @@ public interface PetApi { @PUT("/pet") Void updatePet( - - - -@retrofit.http.Body Pet body - - + @retrofit.http.Body Pet body ); /** @@ -231,12 +166,7 @@ public interface PetApi { @PUT("/pet") void updatePet( - - - -@retrofit.http.Body Pet body - -, Callback cb + @retrofit.http.Body Pet body, Callback cb ); /** * Updates a pet in the store with form data @@ -251,22 +181,7 @@ public interface PetApi { @retrofit.http.FormUrlEncoded @POST("/pet/{petId}") Void updatePetWithForm( - -@retrofit.http.Path("petId") Long petId - - - -, - - - -@retrofit.http.Field("name") String name -, - - - -@retrofit.http.Field("status") String status - + @retrofit.http.Path("petId") Long petId, @retrofit.http.Field("name") String name, @retrofit.http.Field("status") String status ); /** @@ -282,22 +197,7 @@ public interface PetApi { @retrofit.http.FormUrlEncoded @POST("/pet/{petId}") void updatePetWithForm( - -@retrofit.http.Path("petId") Long petId - - - -, - - - -@retrofit.http.Field("name") String name -, - - - -@retrofit.http.Field("status") String status -, Callback cb + @retrofit.http.Path("petId") Long petId, @retrofit.http.Field("name") String name, @retrofit.http.Field("status") String status, Callback cb ); /** * uploads an image @@ -312,22 +212,7 @@ public interface PetApi { @retrofit.http.Multipart @POST("/pet/{petId}/uploadImage") ModelApiResponse uploadFile( - -@retrofit.http.Path("petId") Long petId - - - -, - - - -@retrofit.http.Part("additionalMetadata") String additionalMetadata -, - - - -@retrofit.http.Part("file") TypedFile file - + @retrofit.http.Path("petId") Long petId, @retrofit.http.Part("additionalMetadata") String additionalMetadata, @retrofit.http.Part("file") TypedFile file ); /** @@ -343,21 +228,6 @@ public interface PetApi { @retrofit.http.Multipart @POST("/pet/{petId}/uploadImage") void uploadFile( - -@retrofit.http.Path("petId") Long petId - - - -, - - - -@retrofit.http.Part("additionalMetadata") String additionalMetadata -, - - - -@retrofit.http.Part("file") TypedFile file -, Callback cb + @retrofit.http.Path("petId") Long petId, @retrofit.http.Part("additionalMetadata") String additionalMetadata, @retrofit.http.Part("file") TypedFile file, Callback cb ); } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java index f9fed4bd1ce..c29f87ef9cc 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java @@ -24,12 +24,7 @@ public interface StoreApi { @DELETE("/store/order/{orderId}") Void deleteOrder( - -@retrofit.http.Path("orderId") String orderId - - - - + @retrofit.http.Path("orderId") String orderId ); /** @@ -42,12 +37,7 @@ public interface StoreApi { @DELETE("/store/order/{orderId}") void deleteOrder( - -@retrofit.http.Path("orderId") String orderId - - - -, Callback cb + @retrofit.http.Path("orderId") String orderId, Callback cb ); /** * Returns pet inventories by status @@ -81,12 +71,7 @@ public interface StoreApi { @GET("/store/order/{orderId}") Order getOrderById( - -@retrofit.http.Path("orderId") Long orderId - - - - + @retrofit.http.Path("orderId") Long orderId ); /** @@ -99,12 +84,7 @@ public interface StoreApi { @GET("/store/order/{orderId}") void getOrderById( - -@retrofit.http.Path("orderId") Long orderId - - - -, Callback cb + @retrofit.http.Path("orderId") Long orderId, Callback cb ); /** * Place an order for a pet @@ -116,12 +96,7 @@ public interface StoreApi { @POST("/store/order") Order placeOrder( - - - -@retrofit.http.Body Order body - - + @retrofit.http.Body Order body ); /** @@ -134,11 +109,6 @@ public interface StoreApi { @POST("/store/order") void placeOrder( - - - -@retrofit.http.Body Order body - -, Callback cb + @retrofit.http.Body Order body, Callback cb ); } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java index 7de0bc3fb1a..43876970c3f 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java @@ -24,12 +24,7 @@ public interface UserApi { @POST("/user") Void createUser( - - - -@retrofit.http.Body User body - - + @retrofit.http.Body User body ); /** @@ -42,12 +37,7 @@ public interface UserApi { @POST("/user") void createUser( - - - -@retrofit.http.Body User body - -, Callback cb + @retrofit.http.Body User body, Callback cb ); /** * Creates list of users with given input array @@ -59,12 +49,7 @@ public interface UserApi { @POST("/user/createWithArray") Void createUsersWithArrayInput( - - - -@retrofit.http.Body List body - - + @retrofit.http.Body List body ); /** @@ -77,12 +62,7 @@ public interface UserApi { @POST("/user/createWithArray") void createUsersWithArrayInput( - - - -@retrofit.http.Body List body - -, Callback cb + @retrofit.http.Body List body, Callback cb ); /** * Creates list of users with given input array @@ -94,12 +74,7 @@ public interface UserApi { @POST("/user/createWithList") Void createUsersWithListInput( - - - -@retrofit.http.Body List body - - + @retrofit.http.Body List body ); /** @@ -112,12 +87,7 @@ public interface UserApi { @POST("/user/createWithList") void createUsersWithListInput( - - - -@retrofit.http.Body List body - -, Callback cb + @retrofit.http.Body List body, Callback cb ); /** * Delete user @@ -129,12 +99,7 @@ public interface UserApi { @DELETE("/user/{username}") Void deleteUser( - -@retrofit.http.Path("username") String username - - - - + @retrofit.http.Path("username") String username ); /** @@ -147,12 +112,7 @@ public interface UserApi { @DELETE("/user/{username}") void deleteUser( - -@retrofit.http.Path("username") String username - - - -, Callback cb + @retrofit.http.Path("username") String username, Callback cb ); /** * Get user by user name @@ -164,12 +124,7 @@ public interface UserApi { @GET("/user/{username}") User getUserByName( - -@retrofit.http.Path("username") String username - - - - + @retrofit.http.Path("username") String username ); /** @@ -182,12 +137,7 @@ public interface UserApi { @GET("/user/{username}") void getUserByName( - -@retrofit.http.Path("username") String username - - - -, Callback cb + @retrofit.http.Path("username") String username, Callback cb ); /** * Logs user into the system @@ -200,17 +150,7 @@ public interface UserApi { @GET("/user/login") String loginUser( - @retrofit.http.Query("username") String username - - - - -, @retrofit.http.Query("password") String password - - - - - + @retrofit.http.Query("username") String username, @retrofit.http.Query("password") String password ); /** @@ -224,17 +164,7 @@ public interface UserApi { @GET("/user/login") void loginUser( - @retrofit.http.Query("username") String username - - - - -, @retrofit.http.Query("password") String password - - - - -, Callback cb + @retrofit.http.Query("username") String username, @retrofit.http.Query("password") String password, Callback cb ); /** * Logs out current logged in user session @@ -269,17 +199,7 @@ public interface UserApi { @PUT("/user/{username}") Void updateUser( - -@retrofit.http.Path("username") String username - - - -, - - -@retrofit.http.Body User body - - + @retrofit.http.Path("username") String username, @retrofit.http.Body User body ); /** @@ -293,16 +213,6 @@ public interface UserApi { @PUT("/user/{username}") void updateUser( - -@retrofit.http.Path("username") String username - - - -, - - -@retrofit.http.Body User body - -, Callback cb + @retrofit.http.Path("username") String username, @retrofit.http.Body User body, Callback cb ); } diff --git a/samples/client/petstore/java/retrofit2/gradlew.bat b/samples/client/petstore/java/retrofit2/gradlew.bat index 72d362dafd8..5f192121eb4 100644 --- a/samples/client/petstore/java/retrofit2/gradlew.bat +++ b/samples/client/petstore/java/retrofit2/gradlew.bat @@ -1,90 +1,90 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java index 7479e230574..d1068513f0e 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java @@ -10,8 +10,8 @@ import okhttp3.RequestBody; import io.swagger.client.model.Client; import org.joda.time.LocalDate; -import java.math.BigDecimal; import org.joda.time.DateTime; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; @@ -28,12 +28,7 @@ public interface FakeApi { @PATCH("fake") Call testClientModel( - - - -@retrofit2.http.Body Client body - - + @retrofit2.http.Body Client body ); /** @@ -59,77 +54,7 @@ public interface FakeApi { @retrofit2.http.FormUrlEncoded @POST("fake") Call testEndpointParameters( - - - - -@retrofit2.http.Field("number") BigDecimal number -, - - - -@retrofit2.http.Field("double") Double _double -, - - - -@retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter -, - - - -@retrofit2.http.Field("byte") byte[] _byte -, - - - -@retrofit2.http.Field("integer") Integer integer -, - - - -@retrofit2.http.Field("int32") Integer int32 -, - - - -@retrofit2.http.Field("int64") Long int64 -, - - - -@retrofit2.http.Field("float") Float _float -, - - - -@retrofit2.http.Field("string") String string -, - - - -@retrofit2.http.Field("binary") byte[] binary -, - - - -@retrofit2.http.Field("date") LocalDate date -, - - - -@retrofit2.http.Field("dateTime") DateTime dateTime -, - - - -@retrofit2.http.Field("password") String password -, - - - -@retrofit2.http.Field("callback") String paramCallback - + @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String string, @retrofit2.http.Field("binary") byte[] binary, @retrofit2.http.Field("date") LocalDate date, @retrofit2.http.Field("dateTime") DateTime dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback ); /** @@ -149,47 +74,7 @@ public interface FakeApi { @retrofit2.http.FormUrlEncoded @GET("fake") Call testEnumParameters( - - - - -@retrofit2.http.Field("enum_form_string_array") List enumFormStringArray -, - - - -@retrofit2.http.Field("enum_form_string") String enumFormString -, - -@retrofit2.http.Header("enum_header_string_array") List enumHeaderStringArray - - -, - -@retrofit2.http.Header("enum_header_string") String enumHeaderString - - -, @retrofit2.http.Query("enum_query_string_array") CSVParams enumQueryStringArray - - - - -, @retrofit2.http.Query("enum_query_string") String enumQueryString - - - - -, @retrofit2.http.Query("enum_query_integer") BigDecimal enumQueryInteger - - - - -, - - - -@retrofit2.http.Field("enum_query_double") Double enumQueryDouble - + @retrofit2.http.Field("enum_form_string_array") List enumFormStringArray, @retrofit2.http.Field("enum_form_string") String enumFormString, @retrofit2.http.Header("enum_header_string_array") List enumHeaderStringArray, @retrofit2.http.Header("enum_header_string") String enumHeaderString, @retrofit2.http.Query("enum_query_string_array") CSVParams enumQueryStringArray, @retrofit2.http.Query("enum_query_string") String enumQueryString, @retrofit2.http.Query("enum_query_integer") BigDecimal enumQueryInteger, @retrofit2.http.Field("enum_query_double") Double enumQueryDouble ); } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java index bd13312f581..3f61279a66b 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java @@ -9,8 +9,8 @@ import retrofit2.http.*; import okhttp3.RequestBody; import io.swagger.client.model.Pet; -import io.swagger.client.model.ModelApiResponse; import java.io.File; +import io.swagger.client.model.ModelApiResponse; import java.util.ArrayList; import java.util.HashMap; @@ -27,12 +27,7 @@ public interface PetApi { @POST("pet") Call addPet( - - - -@retrofit2.http.Body Pet body - - + @retrofit2.http.Body Pet body ); /** @@ -45,17 +40,7 @@ public interface PetApi { @DELETE("pet/{petId}") Call deletePet( - -@retrofit2.http.Path("petId") Long petId - - - -, - -@retrofit2.http.Header("api_key") String apiKey - - - + @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Header("api_key") String apiKey ); /** @@ -68,11 +53,6 @@ public interface PetApi { @GET("pet/findByStatus") Call> findPetsByStatus( @retrofit2.http.Query("status") CSVParams status - - - - - ); /** @@ -85,11 +65,6 @@ public interface PetApi { @GET("pet/findByTags") Call> findPetsByTags( @retrofit2.http.Query("tags") CSVParams tags - - - - - ); /** @@ -101,12 +76,7 @@ public interface PetApi { @GET("pet/{petId}") Call getPetById( - -@retrofit2.http.Path("petId") Long petId - - - - + @retrofit2.http.Path("petId") Long petId ); /** @@ -118,12 +88,7 @@ public interface PetApi { @PUT("pet") Call updatePet( - - - -@retrofit2.http.Body Pet body - - + @retrofit2.http.Body Pet body ); /** @@ -138,22 +103,7 @@ public interface PetApi { @retrofit2.http.FormUrlEncoded @POST("pet/{petId}") Call updatePetWithForm( - -@retrofit2.http.Path("petId") Long petId - - - -, - - - -@retrofit2.http.Field("name") String name -, - - - -@retrofit2.http.Field("status") String status - + @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Field("name") String name, @retrofit2.http.Field("status") String status ); /** @@ -168,22 +118,7 @@ public interface PetApi { @retrofit2.http.Multipart @POST("pet/{petId}/uploadImage") Call uploadFile( - -@retrofit2.http.Path("petId") Long petId - - - -, - - - -@retrofit2.http.Part("additionalMetadata") String additionalMetadata -, - - - -@retrofit2.http.Part("file\"; filename=\"file") RequestBody file - + @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part("file\"; filename=\"file") RequestBody file ); } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java index ebed8da8f52..f9df7d8e8d6 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java @@ -25,12 +25,7 @@ public interface StoreApi { @DELETE("store/order/{orderId}") Call deleteOrder( - -@retrofit2.http.Path("orderId") String orderId - - - - + @retrofit2.http.Path("orderId") String orderId ); /** @@ -52,12 +47,7 @@ public interface StoreApi { @GET("store/order/{orderId}") Call getOrderById( - -@retrofit2.http.Path("orderId") Long orderId - - - - + @retrofit2.http.Path("orderId") Long orderId ); /** @@ -69,12 +59,7 @@ public interface StoreApi { @POST("store/order") Call placeOrder( - - - -@retrofit2.http.Body Order body - - + @retrofit2.http.Body Order body ); } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java index 1bf7d34d73c..ee1114dc2dc 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java @@ -25,12 +25,7 @@ public interface UserApi { @POST("user") Call createUser( - - - -@retrofit2.http.Body User body - - + @retrofit2.http.Body User body ); /** @@ -42,12 +37,7 @@ public interface UserApi { @POST("user/createWithArray") Call createUsersWithArrayInput( - - - -@retrofit2.http.Body List body - - + @retrofit2.http.Body List body ); /** @@ -59,12 +49,7 @@ public interface UserApi { @POST("user/createWithList") Call createUsersWithListInput( - - - -@retrofit2.http.Body List body - - + @retrofit2.http.Body List body ); /** @@ -76,12 +61,7 @@ public interface UserApi { @DELETE("user/{username}") Call deleteUser( - -@retrofit2.http.Path("username") String username - - - - + @retrofit2.http.Path("username") String username ); /** @@ -93,12 +73,7 @@ public interface UserApi { @GET("user/{username}") Call getUserByName( - -@retrofit2.http.Path("username") String username - - - - + @retrofit2.http.Path("username") String username ); /** @@ -111,17 +86,7 @@ public interface UserApi { @GET("user/login") Call loginUser( - @retrofit2.http.Query("username") String username - - - - -, @retrofit2.http.Query("password") String password - - - - - + @retrofit2.http.Query("username") String username, @retrofit2.http.Query("password") String password ); /** @@ -144,17 +109,7 @@ public interface UserApi { @PUT("user/{username}") Call updateUser( - -@retrofit2.http.Path("username") String username - - - -, - - -@retrofit2.http.Body User body - - + @retrofit2.http.Path("username") String username, @retrofit2.http.Body User body ); } diff --git a/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md b/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md index f4cfc7e19cc..2e2b792d8d3 100644 --- a/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md +++ b/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md @@ -54,7 +54,7 @@ No authorization required # **testEndpointParameters** -> Void testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password) +> Void testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -90,8 +90,9 @@ byte[] binary = B; // byte[] | None LocalDate date = new LocalDate(); // LocalDate | None DateTime dateTime = new DateTime(); // DateTime | None String password = "password_example"; // String | None +String paramCallback = "paramCallback_example"; // String | None try { - Void result = apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password); + Void result = apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); @@ -116,6 +117,7 @@ Name | Type | Description | Notes **date** | **LocalDate**| None | [optional] **dateTime** | **DateTime**| None | [optional] **password** | **String**| None | [optional] + **paramCallback** | **String**| None | [optional] ### Return type diff --git a/samples/client/petstore/java/retrofit2rx/gradlew.bat b/samples/client/petstore/java/retrofit2rx/gradlew.bat index 72d362dafd8..5f192121eb4 100644 --- a/samples/client/petstore/java/retrofit2rx/gradlew.bat +++ b/samples/client/petstore/java/retrofit2rx/gradlew.bat @@ -1,90 +1,90 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java index 924c81ff6dc..2b832afd1ef 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java @@ -10,8 +10,8 @@ import okhttp3.RequestBody; import io.swagger.client.model.Client; import org.joda.time.LocalDate; -import java.math.BigDecimal; import org.joda.time.DateTime; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; @@ -28,12 +28,7 @@ public interface FakeApi { @PATCH("fake") Observable testClientModel( - - - -@retrofit2.http.Body Client body - - + @retrofit2.http.Body Client body ); /** @@ -59,77 +54,7 @@ public interface FakeApi { @retrofit2.http.FormUrlEncoded @POST("fake") Observable testEndpointParameters( - - - - -@retrofit2.http.Field("number") BigDecimal number -, - - - -@retrofit2.http.Field("double") Double _double -, - - - -@retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter -, - - - -@retrofit2.http.Field("byte") byte[] _byte -, - - - -@retrofit2.http.Field("integer") Integer integer -, - - - -@retrofit2.http.Field("int32") Integer int32 -, - - - -@retrofit2.http.Field("int64") Long int64 -, - - - -@retrofit2.http.Field("float") Float _float -, - - - -@retrofit2.http.Field("string") String string -, - - - -@retrofit2.http.Field("binary") byte[] binary -, - - - -@retrofit2.http.Field("date") LocalDate date -, - - - -@retrofit2.http.Field("dateTime") DateTime dateTime -, - - - -@retrofit2.http.Field("password") String password -, - - - -@retrofit2.http.Field("callback") String paramCallback - + @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String string, @retrofit2.http.Field("binary") byte[] binary, @retrofit2.http.Field("date") LocalDate date, @retrofit2.http.Field("dateTime") DateTime dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback ); /** @@ -149,47 +74,7 @@ public interface FakeApi { @retrofit2.http.FormUrlEncoded @GET("fake") Observable testEnumParameters( - - - - -@retrofit2.http.Field("enum_form_string_array") List enumFormStringArray -, - - - -@retrofit2.http.Field("enum_form_string") String enumFormString -, - -@retrofit2.http.Header("enum_header_string_array") List enumHeaderStringArray - - -, - -@retrofit2.http.Header("enum_header_string") String enumHeaderString - - -, @retrofit2.http.Query("enum_query_string_array") CSVParams enumQueryStringArray - - - - -, @retrofit2.http.Query("enum_query_string") String enumQueryString - - - - -, @retrofit2.http.Query("enum_query_integer") BigDecimal enumQueryInteger - - - - -, - - - -@retrofit2.http.Field("enum_query_double") Double enumQueryDouble - + @retrofit2.http.Field("enum_form_string_array") List enumFormStringArray, @retrofit2.http.Field("enum_form_string") String enumFormString, @retrofit2.http.Header("enum_header_string_array") List enumHeaderStringArray, @retrofit2.http.Header("enum_header_string") String enumHeaderString, @retrofit2.http.Query("enum_query_string_array") CSVParams enumQueryStringArray, @retrofit2.http.Query("enum_query_string") String enumQueryString, @retrofit2.http.Query("enum_query_integer") BigDecimal enumQueryInteger, @retrofit2.http.Field("enum_query_double") Double enumQueryDouble ); } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java index cc6a867c755..3c183bb08f9 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java @@ -9,8 +9,8 @@ import retrofit2.http.*; import okhttp3.RequestBody; import io.swagger.client.model.Pet; -import io.swagger.client.model.ModelApiResponse; import java.io.File; +import io.swagger.client.model.ModelApiResponse; import java.util.ArrayList; import java.util.HashMap; @@ -27,12 +27,7 @@ public interface PetApi { @POST("pet") Observable addPet( - - - -@retrofit2.http.Body Pet body - - + @retrofit2.http.Body Pet body ); /** @@ -45,17 +40,7 @@ public interface PetApi { @DELETE("pet/{petId}") Observable deletePet( - -@retrofit2.http.Path("petId") Long petId - - - -, - -@retrofit2.http.Header("api_key") String apiKey - - - + @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Header("api_key") String apiKey ); /** @@ -68,11 +53,6 @@ public interface PetApi { @GET("pet/findByStatus") Observable> findPetsByStatus( @retrofit2.http.Query("status") CSVParams status - - - - - ); /** @@ -85,11 +65,6 @@ public interface PetApi { @GET("pet/findByTags") Observable> findPetsByTags( @retrofit2.http.Query("tags") CSVParams tags - - - - - ); /** @@ -101,12 +76,7 @@ public interface PetApi { @GET("pet/{petId}") Observable getPetById( - -@retrofit2.http.Path("petId") Long petId - - - - + @retrofit2.http.Path("petId") Long petId ); /** @@ -118,12 +88,7 @@ public interface PetApi { @PUT("pet") Observable updatePet( - - - -@retrofit2.http.Body Pet body - - + @retrofit2.http.Body Pet body ); /** @@ -138,22 +103,7 @@ public interface PetApi { @retrofit2.http.FormUrlEncoded @POST("pet/{petId}") Observable updatePetWithForm( - -@retrofit2.http.Path("petId") Long petId - - - -, - - - -@retrofit2.http.Field("name") String name -, - - - -@retrofit2.http.Field("status") String status - + @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Field("name") String name, @retrofit2.http.Field("status") String status ); /** @@ -168,22 +118,7 @@ public interface PetApi { @retrofit2.http.Multipart @POST("pet/{petId}/uploadImage") Observable uploadFile( - -@retrofit2.http.Path("petId") Long petId - - - -, - - - -@retrofit2.http.Part("additionalMetadata") String additionalMetadata -, - - - -@retrofit2.http.Part("file\"; filename=\"file") RequestBody file - + @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part("file\"; filename=\"file") RequestBody file ); } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java index f763e317070..e8eac3c525b 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java @@ -25,12 +25,7 @@ public interface StoreApi { @DELETE("store/order/{orderId}") Observable deleteOrder( - -@retrofit2.http.Path("orderId") String orderId - - - - + @retrofit2.http.Path("orderId") String orderId ); /** @@ -52,12 +47,7 @@ public interface StoreApi { @GET("store/order/{orderId}") Observable getOrderById( - -@retrofit2.http.Path("orderId") Long orderId - - - - + @retrofit2.http.Path("orderId") Long orderId ); /** @@ -69,12 +59,7 @@ public interface StoreApi { @POST("store/order") Observable placeOrder( - - - -@retrofit2.http.Body Order body - - + @retrofit2.http.Body Order body ); } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/UserApi.java index 4f13893a8f8..579134971f8 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/UserApi.java @@ -25,12 +25,7 @@ public interface UserApi { @POST("user") Observable createUser( - - - -@retrofit2.http.Body User body - - + @retrofit2.http.Body User body ); /** @@ -42,12 +37,7 @@ public interface UserApi { @POST("user/createWithArray") Observable createUsersWithArrayInput( - - - -@retrofit2.http.Body List body - - + @retrofit2.http.Body List body ); /** @@ -59,12 +49,7 @@ public interface UserApi { @POST("user/createWithList") Observable createUsersWithListInput( - - - -@retrofit2.http.Body List body - - + @retrofit2.http.Body List body ); /** @@ -76,12 +61,7 @@ public interface UserApi { @DELETE("user/{username}") Observable deleteUser( - -@retrofit2.http.Path("username") String username - - - - + @retrofit2.http.Path("username") String username ); /** @@ -93,12 +73,7 @@ public interface UserApi { @GET("user/{username}") Observable getUserByName( - -@retrofit2.http.Path("username") String username - - - - + @retrofit2.http.Path("username") String username ); /** @@ -111,17 +86,7 @@ public interface UserApi { @GET("user/login") Observable loginUser( - @retrofit2.http.Query("username") String username - - - - -, @retrofit2.http.Query("password") String password - - - - - + @retrofit2.http.Query("username") String username, @retrofit2.http.Query("password") String password ); /** @@ -144,17 +109,7 @@ public interface UserApi { @PUT("user/{username}") Observable updateUser( - -@retrofit2.http.Path("username") String username - - - -, - - -@retrofit2.http.Body User body - - + @retrofit2.http.Path("username") String username, @retrofit2.http.Body User body ); }