diff --git a/README.md b/README.md index 3e2ab6fbab..b1fa433f81 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ ## Overview This is the swagger codegen project, which allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an [OpenAPI Spec](https://github.com/OAI/OpenAPI-Specification). Currently, the following languages/frameworks are supported: -- **API clients**: **ActionScript**, **Bash**, **C#** (.net 2.0, 4.0 or later), **C++** (cpprest, Qt5, Tizen), **Clojure**, **Dart**, **Elixir**, **Go**, **Groovy**, **Haskell**, **Java** (Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign), **Node.js** (ES5, ES6, AngularJS with Google Closure Compiler annotations) **Objective-C**, **Perl**, **PHP**, **Python**, **Ruby**, **Scala**, **Swift** (2.x, 3.x), **Typescript** (Angular1.x, Angular2.x, Fetch, jQuery, Node) +- **API clients**: **ActionScript**, **Apex**, **Bash**, **C#** (.net 2.0, 4.0 or later), **C++** (cpprest, Qt5, Tizen), **Clojure**, **Dart**, **Elixir**, **Go**, **Groovy**, **Haskell**, **Java** (Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign), **Node.js** (ES5, ES6, AngularJS with Google Closure Compiler annotations) **Objective-C**, **Perl**, **PHP**, **Python**, **Ruby**, **Scala**, **Swift** (2.x, 3.x), **Typescript** (Angular1.x, Angular2.x, Fetch, jQuery, Node) - **Server stubs**: **C#** (ASP.NET Core, NancyFx), **Erlang**, **Go**, **Haskell**, **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, RestEasy), **PHP** (Lumen, Slim, Silex, [Zend Expressive](https://github.com/zendframework/zend-expressive)), **Python** (Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Scala** ([Finch](https://github.com/finagle/finch), Scalatra) - **API documentation generators**: **HTML**, **Confluence Wiki** - **Others**: **JMeter** @@ -822,14 +822,16 @@ Presentations/Videos/Tutorials/Books - 2016/01/12 - [Generate client side code using Swagger Codegen](http://rnavagamuwa.com/open-source/generate-client-side-code-using-swagger-codegen/) by [RNAVAGAMUWA](http://rnavagamuwa.com/author/admin/) - 2016/01/15 - [How to end manual REST-API client coding](https://www.youtube.com/watch?v=RzZRdqZp6Oo) by [Johannes Fiala](https://github.com/jfiala) @ dotJS 2015 - 2016/04/27 - [Automated REST API Development](https://yos.io/2016/04/27/automated-api-development/) by [Yos Riady](https://www.linkedin.com/in/yosriady) -- 2016/05/29 - [Generating Java Spring-MVC code from Swagger Spec](https://www.clianz.com/2016/05/29/java-mvc-swagger-gen/) by @icha024 +- 2016/05/29 - [Generating Java Spring-MVC code from Swagger Spec](https://www.clianz.com/2016/05/29/java-mvc-swagger-gen/) by [@icha024](https://github.com/icha024) - 2016/11/05 - [How to generate a REST Application](https://www.youtube.com/watch?v=iyC9BWMe75Q) by [Johannes Fiala](https://github.com/jfiala) @ DevFest Vienna 2016 - 2016/11/10 - [Building an AEM API clients ecosystem](http://blog.cliffano.com/2016/11/10/adobe-marketing-cloud-community-expo/) by Cliffano Subagio, Michael Diender, Stephen Shim from Shine Solutions @ [Adobe Marketing Cloud Community Expo (AMCCE)](https://www.meetup.com/Melbourne-AEM-CQ-Meetup/events/233363101/) - 2016/11/18 - [How to generate a REST CXF3 application from Swagger-Contract](https://www.slideshare.net/johannes_fiala/how-to-generate-a-rest-cxf3-application-from-swagger-apacheconeu-2016) by [Johannes Fiala](https://github.com/jfiala) @ ApacheConEU 2016 - 2016/11/25 - [Swagger Codegen for Swift3 and NodeJS](https://normand1.github.io/blog/swift/swagger/codegen/2016/11/25/Swagger-Codegen-for-Swift3-and-NodeJS.html) by [David Norman](https://github.com/normand1) - 2017/03/03 - [Swagger Codegen の使い方の簡単な説明です](https://speakerdeck.com/wagyu298/swagger-codegen) by [wagyu298](https://github.com/wagyu298) +- 2017/03/24 - [Using Open API Specification To Put Lyft SDK Support in the Fast Lane](https://medium.com/lyft-developer-platform/using-open-api-specification-to-put-lyft-sdk-support-in-the-fast-lane-7b623218e4ee) by [Val Polouchkine](https://github.com/vpolouchkine) - 2017/04/27 - [Swagger Codegen のPHP実装があまりにアレだったので、ライブラリ自作して公開してみた](http://qiita.com/imunew/items/2e9c472e0097e329f2cd) by [imunew](http://qiita.com/imunew) - 2017/05/17 - [Diseño de APIs con OpenAPI](https://www.slideshare.net/pjmolina/diseo-de-apis-con-openapi) by [Pedro J. Molina](https://github.com/pjmolina) @ [JSDayES 2017](http://2017.jsday.es/) +- 2017/05/22 - [Presentation of the Vert.x-Swagger project](http://vertx.io/blog/presentation-of-the-vert-x-swagger-project/) by [@phiz71](http://github.com/phiz71) # Swagger Codegen Core Team diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java index c341cdb3cd..e5d7db8170 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java @@ -38,6 +38,7 @@ public class CodegenOperation { public String nickname; // legacy support public String operationIdLowerCase; // for markdown documentation public String operationIdCamelCase; // for class names + public String operationIdSnakeCase; /** * Check if there's at least one parameter diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java index a0ed7e6343..4e1d67a5bb 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java @@ -2887,6 +2887,7 @@ public class DefaultCodegen { co.operationId = uniqueName; co.operationIdLowerCase = uniqueName.toLowerCase(); co.operationIdCamelCase = DefaultCodegen.camelize(uniqueName); + co.operationIdSnakeCase = DefaultCodegen.underscore(uniqueName); opList.add(co); co.baseName = tag; } diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtml2Generator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtml2Generator.java index dba87bf44c..4f8ea21c83 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtml2Generator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtml2Generator.java @@ -190,6 +190,8 @@ public class StaticHtml2Generator extends DefaultCodegen implements CodegenConfi } op.vendorExtensions.put("x-codegen-hasRequiredParams", lastRequired != null); + op.vendorExtensions.put("x-codegen-httpMethodUpperCase", httpMethod.toUpperCase()); + return op; } diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs2/index.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs2/index.mustache index 89fbb66260..12fe0d3b57 100644 --- a/modules/swagger-codegen/src/main/resources/htmlDocs2/index.mustache +++ b/modules/swagger-codegen/src/main/resources/htmlDocs2/index.mustache @@ -224,7 +224,7 @@
- 
curl -X {{httpMethod}}{{#authMethods}}{{#isApiKey}}{{#isKeyInHeader}} -H "{{keyParamName}}: [[apiKey]]"{{/isKeyInHeader}}{{/isApiKey}}{{#isBasic}}{{#hasProduces}} -H "Accept: {{#produces}}{{{mediaType}}}{{#hasMore}},{{/hasMore}}{{/produces}}"{{/hasProduces}}{{#hasConsumes}} -H "Content-Type: {{#consumes}}{{{mediaType}}}{{#hasMore}},{{/hasMore}}{{/consumes}}"{{/hasConsumes}} -H "Authorization: Basic [[basicHash]]"{{/isBasic}}{{/authMethods}} "{{basePath}}{{path}}{{#hasQueryParams}}?{{#queryParams}}{{^-first}}&{{/-first}}{{baseName}}={{vendorExtensions.x-eg}}{{/queryParams}}{{/hasQueryParams}}"
+ 
curl -X {{vendorExtensions.x-codegen-httpMethodUpperCase}}{{#authMethods}}{{#isApiKey}}{{#isKeyInHeader}} -H "{{keyParamName}}: [[apiKey]]"{{/isKeyInHeader}}{{/isApiKey}}{{#isBasic}}{{#hasProduces}} -H "Accept: {{#produces}}{{{mediaType}}}{{#hasMore}},{{/hasMore}}{{/produces}}"{{/hasProduces}}{{#hasConsumes}} -H "Content-Type: {{#consumes}}{{{mediaType}}}{{#hasMore}},{{/hasMore}}{{/consumes}}"{{/hasConsumes}} -H "Authorization: Basic [[basicHash]]"{{/isBasic}}{{/authMethods}} "{{basePath}}{{path}}{{#hasQueryParams}}?{{#queryParams}}{{^-first}}&{{/-first}}{{baseName}}={{vendorExtensions.x-eg}}{{/queryParams}}{{/hasQueryParams}}"
{{>sample_java}}
diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs2/sample_python.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs2/sample_python.mustache index cb6c550919..0afe46abce 100644 --- a/modules/swagger-codegen/src/main/resources/htmlDocs2/sample_python.mustache +++ b/modules/swagger-codegen/src/main/resources/htmlDocs2/sample_python.mustache @@ -22,7 +22,7 @@ api_instance = {{{pythonPackageName}}}.{{{classname}}}() try: {{#summary}} # {{{.}}} -{{/summary}} {{#returnType}}api_response = {{/returnType}}api_instance.{{{operationId}}}({{#allParams}}{{#required}}{{paramName}}{{/required}}{{^required}}{{paramName}}={{paramName}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}){{#returnType}} +{{/summary}} {{#returnType}}api_response = {{/returnType}}api_instance.{{{operationIdSnakeCase}}}({{#allParams}}{{#required}}{{paramName}}{{/required}}{{^required}}{{paramName}}={{paramName}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}){{#returnType}} pprint(api_response){{/returnType}} except ApiException as e: print("Exception when calling {{classname}}->{{operationId}}: %s\n" % e) \ No newline at end of file diff --git a/modules/swagger-codegen/src/main/resources/python/api_doc.mustache b/modules/swagger-codegen/src/main/resources/python/api_doc.mustache index 2f00740ab4..a496f63bfd 100644 --- a/modules/swagger-codegen/src/main/resources/python/api_doc.mustache +++ b/modules/swagger-codegen/src/main/resources/python/api_doc.mustache @@ -19,7 +19,7 @@ Method | HTTP request | Description ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import {{{packageName}}} from {{{packageName}}}.rest import ApiException diff --git a/samples/client/petstore-security-test/python/docs/FakeApi.md b/samples/client/petstore-security-test/python/docs/FakeApi.md index c3f15c2b4b..e35d744ef3 100644 --- a/samples/client/petstore-security-test/python/docs/FakeApi.md +++ b/samples/client/petstore-security-test/python/docs/FakeApi.md @@ -14,7 +14,7 @@ To test code injection */ ' \" =end -- \\r\\n \\n \\r ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException diff --git a/samples/client/petstore-security-test/python/petstore_api/api_client.py b/samples/client/petstore-security-test/python/petstore_api/api_client.py index bcf87a0363..bfc88fd41d 100644 --- a/samples/client/petstore-security-test/python/petstore_api/api_client.py +++ b/samples/client/petstore-security-test/python/petstore_api/api_client.py @@ -610,16 +610,17 @@ class ApiClient(object): :param klass: class literal. :return: model object. """ - instance = klass() - - if not instance.swagger_types: + if not klass.swagger_types: return data - for attr, attr_type in iteritems(instance.swagger_types): + kwargs = {} + for attr, attr_type in iteritems(klass.swagger_types): if data is not None \ - and instance.attribute_map[attr] in data \ + and klass.attribute_map[attr] in data \ and isinstance(data, (list, dict)): - value = data[instance.attribute_map[attr]] - setattr(instance, attr, self.__deserialize(value, attr_type)) + value = data[klass.attribute_map[attr]] + kwargs[attr] = self.__deserialize(value, attr_type) + + instance = klass(**kwargs) return instance diff --git a/samples/client/petstore-security-test/python/petstore_api/models/model_return.py b/samples/client/petstore-security-test/python/petstore_api/models/model_return.py index 80673374e7..6a57ba570a 100644 --- a/samples/client/petstore-security-test/python/petstore_api/models/model_return.py +++ b/samples/client/petstore-security-test/python/petstore_api/models/model_return.py @@ -21,28 +21,30 @@ class ModelReturn(object): NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. """ + + + """ + Attributes: + swagger_types (dict): The key is attribute name + and the value is attribute type. + attribute_map (dict): The key is attribute name + and the value is json key in definition. + """ + swagger_types = { + '_return': 'int' + } + + attribute_map = { + '_return': 'return' + } + def __init__(self, _return=None): """ ModelReturn - a model defined in Swagger - - :param dict swaggerTypes: The key is attribute name - and the value is attribute type. - :param dict attributeMap: The key is attribute name - and the value is json key in definition. """ - self.swagger_types = { - '_return': 'int' - } - - self.attribute_map = { - '_return': 'return' - } self.__return = None - # TODO: let required properties as mandatory parameter in the constructor. - # - to check if required property is not None (e.g. by calling setter) - # - ApiClient.__deserialize_model has to be adapted as well if _return is not None: self._return = _return diff --git a/samples/client/petstore/java/feign/src/main/gen/io/swagger/client/BuildConfig.java b/samples/client/petstore/java/feign/src/main/gen/io/swagger/client/BuildConfig.java new file mode 100644 index 0000000000..720765940d --- /dev/null +++ b/samples/client/petstore/java/feign/src/main/gen/io/swagger/client/BuildConfig.java @@ -0,0 +1,8 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */ +public final class BuildConfig { + public final static boolean DEBUG = Boolean.parseBoolean(null); +} \ No newline at end of file diff --git a/samples/client/petstore/java/feign/src/main/gen/io/swagger/client/Manifest.java b/samples/client/petstore/java/feign/src/main/gen/io/swagger/client/Manifest.java new file mode 100644 index 0000000000..41e0523a20 --- /dev/null +++ b/samples/client/petstore/java/feign/src/main/gen/io/swagger/client/Manifest.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */ +public final class Manifest { +} \ No newline at end of file diff --git a/samples/client/petstore/java/feign/src/main/gen/io/swagger/client/R.java b/samples/client/petstore/java/feign/src/main/gen/io/swagger/client/R.java new file mode 100644 index 0000000000..cd0683364d --- /dev/null +++ b/samples/client/petstore/java/feign/src/main/gen/io/swagger/client/R.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */ +public final class R { +} \ No newline at end of file diff --git a/samples/client/petstore/java/jersey1/src/main/gen/io/swagger/client/BuildConfig.java b/samples/client/petstore/java/jersey1/src/main/gen/io/swagger/client/BuildConfig.java new file mode 100644 index 0000000000..720765940d --- /dev/null +++ b/samples/client/petstore/java/jersey1/src/main/gen/io/swagger/client/BuildConfig.java @@ -0,0 +1,8 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */ +public final class BuildConfig { + public final static boolean DEBUG = Boolean.parseBoolean(null); +} \ No newline at end of file diff --git a/samples/client/petstore/java/jersey1/src/main/gen/io/swagger/client/Manifest.java b/samples/client/petstore/java/jersey1/src/main/gen/io/swagger/client/Manifest.java new file mode 100644 index 0000000000..41e0523a20 --- /dev/null +++ b/samples/client/petstore/java/jersey1/src/main/gen/io/swagger/client/Manifest.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */ +public final class Manifest { +} \ No newline at end of file diff --git a/samples/client/petstore/java/jersey1/src/main/gen/io/swagger/client/R.java b/samples/client/petstore/java/jersey1/src/main/gen/io/swagger/client/R.java new file mode 100644 index 0000000000..cd0683364d --- /dev/null +++ b/samples/client/petstore/java/jersey1/src/main/gen/io/swagger/client/R.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */ +public final class R { +} \ No newline at end of file diff --git a/samples/client/petstore/java/jersey2-java6/src/main/gen/io/swagger/client/BuildConfig.java b/samples/client/petstore/java/jersey2-java6/src/main/gen/io/swagger/client/BuildConfig.java new file mode 100644 index 0000000000..720765940d --- /dev/null +++ b/samples/client/petstore/java/jersey2-java6/src/main/gen/io/swagger/client/BuildConfig.java @@ -0,0 +1,8 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */ +public final class BuildConfig { + public final static boolean DEBUG = Boolean.parseBoolean(null); +} \ No newline at end of file diff --git a/samples/client/petstore/java/jersey2-java6/src/main/gen/io/swagger/client/Manifest.java b/samples/client/petstore/java/jersey2-java6/src/main/gen/io/swagger/client/Manifest.java new file mode 100644 index 0000000000..41e0523a20 --- /dev/null +++ b/samples/client/petstore/java/jersey2-java6/src/main/gen/io/swagger/client/Manifest.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */ +public final class Manifest { +} \ No newline at end of file diff --git a/samples/client/petstore/java/jersey2-java6/src/main/gen/io/swagger/client/R.java b/samples/client/petstore/java/jersey2-java6/src/main/gen/io/swagger/client/R.java new file mode 100644 index 0000000000..cd0683364d --- /dev/null +++ b/samples/client/petstore/java/jersey2-java6/src/main/gen/io/swagger/client/R.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */ +public final class R { +} \ No newline at end of file diff --git a/samples/client/petstore/java/jersey2-java8/src/main/gen/io/swagger/client/BuildConfig.java b/samples/client/petstore/java/jersey2-java8/src/main/gen/io/swagger/client/BuildConfig.java new file mode 100644 index 0000000000..720765940d --- /dev/null +++ b/samples/client/petstore/java/jersey2-java8/src/main/gen/io/swagger/client/BuildConfig.java @@ -0,0 +1,8 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */ +public final class BuildConfig { + public final static boolean DEBUG = Boolean.parseBoolean(null); +} \ No newline at end of file diff --git a/samples/client/petstore/java/jersey2-java8/src/main/gen/io/swagger/client/Manifest.java b/samples/client/petstore/java/jersey2-java8/src/main/gen/io/swagger/client/Manifest.java new file mode 100644 index 0000000000..41e0523a20 --- /dev/null +++ b/samples/client/petstore/java/jersey2-java8/src/main/gen/io/swagger/client/Manifest.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */ +public final class Manifest { +} \ No newline at end of file diff --git a/samples/client/petstore/java/jersey2-java8/src/main/gen/io/swagger/client/R.java b/samples/client/petstore/java/jersey2-java8/src/main/gen/io/swagger/client/R.java new file mode 100644 index 0000000000..cd0683364d --- /dev/null +++ b/samples/client/petstore/java/jersey2-java8/src/main/gen/io/swagger/client/R.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */ +public final class R { +} \ No newline at end of file diff --git a/samples/client/petstore/java/jersey2/src/main/gen/io/swagger/client/BuildConfig.java b/samples/client/petstore/java/jersey2/src/main/gen/io/swagger/client/BuildConfig.java new file mode 100644 index 0000000000..720765940d --- /dev/null +++ b/samples/client/petstore/java/jersey2/src/main/gen/io/swagger/client/BuildConfig.java @@ -0,0 +1,8 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */ +public final class BuildConfig { + public final static boolean DEBUG = Boolean.parseBoolean(null); +} \ No newline at end of file diff --git a/samples/client/petstore/java/jersey2/src/main/gen/io/swagger/client/Manifest.java b/samples/client/petstore/java/jersey2/src/main/gen/io/swagger/client/Manifest.java new file mode 100644 index 0000000000..41e0523a20 --- /dev/null +++ b/samples/client/petstore/java/jersey2/src/main/gen/io/swagger/client/Manifest.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */ +public final class Manifest { +} \ No newline at end of file diff --git a/samples/client/petstore/java/jersey2/src/main/gen/io/swagger/client/R.java b/samples/client/petstore/java/jersey2/src/main/gen/io/swagger/client/R.java new file mode 100644 index 0000000000..cd0683364d --- /dev/null +++ b/samples/client/petstore/java/jersey2/src/main/gen/io/swagger/client/R.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */ +public final class R { +} \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/gen/io/swagger/client/BuildConfig.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/gen/io/swagger/client/BuildConfig.java new file mode 100644 index 0000000000..720765940d --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/gen/io/swagger/client/BuildConfig.java @@ -0,0 +1,8 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */ +public final class BuildConfig { + public final static boolean DEBUG = Boolean.parseBoolean(null); +} \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/gen/io/swagger/client/Manifest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/gen/io/swagger/client/Manifest.java new file mode 100644 index 0000000000..41e0523a20 --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/gen/io/swagger/client/Manifest.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */ +public final class Manifest { +} \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/gen/io/swagger/client/R.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/gen/io/swagger/client/R.java new file mode 100644 index 0000000000..cd0683364d --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/gen/io/swagger/client/R.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */ +public final class R { +} \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson/src/main/gen/io/swagger/client/BuildConfig.java b/samples/client/petstore/java/okhttp-gson/src/main/gen/io/swagger/client/BuildConfig.java new file mode 100644 index 0000000000..720765940d --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson/src/main/gen/io/swagger/client/BuildConfig.java @@ -0,0 +1,8 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */ +public final class BuildConfig { + public final static boolean DEBUG = Boolean.parseBoolean(null); +} \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson/src/main/gen/io/swagger/client/Manifest.java b/samples/client/petstore/java/okhttp-gson/src/main/gen/io/swagger/client/Manifest.java new file mode 100644 index 0000000000..41e0523a20 --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson/src/main/gen/io/swagger/client/Manifest.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */ +public final class Manifest { +} \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson/src/main/gen/io/swagger/client/R.java b/samples/client/petstore/java/okhttp-gson/src/main/gen/io/swagger/client/R.java new file mode 100644 index 0000000000..cd0683364d --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson/src/main/gen/io/swagger/client/R.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */ +public final class R { +} \ No newline at end of file diff --git a/samples/client/petstore/java/resteasy/src/main/gen/io/swagger/client/BuildConfig.java b/samples/client/petstore/java/resteasy/src/main/gen/io/swagger/client/BuildConfig.java new file mode 100644 index 0000000000..720765940d --- /dev/null +++ b/samples/client/petstore/java/resteasy/src/main/gen/io/swagger/client/BuildConfig.java @@ -0,0 +1,8 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */ +public final class BuildConfig { + public final static boolean DEBUG = Boolean.parseBoolean(null); +} \ No newline at end of file diff --git a/samples/client/petstore/java/resteasy/src/main/gen/io/swagger/client/Manifest.java b/samples/client/petstore/java/resteasy/src/main/gen/io/swagger/client/Manifest.java new file mode 100644 index 0000000000..41e0523a20 --- /dev/null +++ b/samples/client/petstore/java/resteasy/src/main/gen/io/swagger/client/Manifest.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */ +public final class Manifest { +} \ No newline at end of file diff --git a/samples/client/petstore/java/resteasy/src/main/gen/io/swagger/client/R.java b/samples/client/petstore/java/resteasy/src/main/gen/io/swagger/client/R.java new file mode 100644 index 0000000000..cd0683364d --- /dev/null +++ b/samples/client/petstore/java/resteasy/src/main/gen/io/swagger/client/R.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */ +public final class R { +} \ No newline at end of file diff --git a/samples/client/petstore/java/resttemplate/src/main/gen/io/swagger/client/BuildConfig.java b/samples/client/petstore/java/resttemplate/src/main/gen/io/swagger/client/BuildConfig.java new file mode 100644 index 0000000000..720765940d --- /dev/null +++ b/samples/client/petstore/java/resttemplate/src/main/gen/io/swagger/client/BuildConfig.java @@ -0,0 +1,8 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */ +public final class BuildConfig { + public final static boolean DEBUG = Boolean.parseBoolean(null); +} \ No newline at end of file diff --git a/samples/client/petstore/java/resttemplate/src/main/gen/io/swagger/client/Manifest.java b/samples/client/petstore/java/resttemplate/src/main/gen/io/swagger/client/Manifest.java new file mode 100644 index 0000000000..41e0523a20 --- /dev/null +++ b/samples/client/petstore/java/resttemplate/src/main/gen/io/swagger/client/Manifest.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */ +public final class Manifest { +} \ No newline at end of file diff --git a/samples/client/petstore/java/resttemplate/src/main/gen/io/swagger/client/R.java b/samples/client/petstore/java/resttemplate/src/main/gen/io/swagger/client/R.java new file mode 100644 index 0000000000..cd0683364d --- /dev/null +++ b/samples/client/petstore/java/resttemplate/src/main/gen/io/swagger/client/R.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */ +public final class R { +} \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit/src/main/gen/io/swagger/client/BuildConfig.java b/samples/client/petstore/java/retrofit/src/main/gen/io/swagger/client/BuildConfig.java new file mode 100644 index 0000000000..720765940d --- /dev/null +++ b/samples/client/petstore/java/retrofit/src/main/gen/io/swagger/client/BuildConfig.java @@ -0,0 +1,8 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */ +public final class BuildConfig { + public final static boolean DEBUG = Boolean.parseBoolean(null); +} \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit/src/main/gen/io/swagger/client/Manifest.java b/samples/client/petstore/java/retrofit/src/main/gen/io/swagger/client/Manifest.java new file mode 100644 index 0000000000..41e0523a20 --- /dev/null +++ b/samples/client/petstore/java/retrofit/src/main/gen/io/swagger/client/Manifest.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */ +public final class Manifest { +} \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit/src/main/gen/io/swagger/client/R.java b/samples/client/petstore/java/retrofit/src/main/gen/io/swagger/client/R.java new file mode 100644 index 0000000000..cd0683364d --- /dev/null +++ b/samples/client/petstore/java/retrofit/src/main/gen/io/swagger/client/R.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */ +public final class R { +} \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/gen/io/swagger/client/BuildConfig.java b/samples/client/petstore/java/retrofit2-play24/src/main/gen/io/swagger/client/BuildConfig.java new file mode 100644 index 0000000000..720765940d --- /dev/null +++ b/samples/client/petstore/java/retrofit2-play24/src/main/gen/io/swagger/client/BuildConfig.java @@ -0,0 +1,8 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */ +public final class BuildConfig { + public final static boolean DEBUG = Boolean.parseBoolean(null); +} \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/gen/io/swagger/client/Manifest.java b/samples/client/petstore/java/retrofit2-play24/src/main/gen/io/swagger/client/Manifest.java new file mode 100644 index 0000000000..41e0523a20 --- /dev/null +++ b/samples/client/petstore/java/retrofit2-play24/src/main/gen/io/swagger/client/Manifest.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */ +public final class Manifest { +} \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/gen/io/swagger/client/R.java b/samples/client/petstore/java/retrofit2-play24/src/main/gen/io/swagger/client/R.java new file mode 100644 index 0000000000..cd0683364d --- /dev/null +++ b/samples/client/petstore/java/retrofit2-play24/src/main/gen/io/swagger/client/R.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */ +public final class R { +} \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2/src/main/gen/io/swagger/client/BuildConfig.java b/samples/client/petstore/java/retrofit2/src/main/gen/io/swagger/client/BuildConfig.java new file mode 100644 index 0000000000..720765940d --- /dev/null +++ b/samples/client/petstore/java/retrofit2/src/main/gen/io/swagger/client/BuildConfig.java @@ -0,0 +1,8 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */ +public final class BuildConfig { + public final static boolean DEBUG = Boolean.parseBoolean(null); +} \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2/src/main/gen/io/swagger/client/Manifest.java b/samples/client/petstore/java/retrofit2/src/main/gen/io/swagger/client/Manifest.java new file mode 100644 index 0000000000..41e0523a20 --- /dev/null +++ b/samples/client/petstore/java/retrofit2/src/main/gen/io/swagger/client/Manifest.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */ +public final class Manifest { +} \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2/src/main/gen/io/swagger/client/R.java b/samples/client/petstore/java/retrofit2/src/main/gen/io/swagger/client/R.java new file mode 100644 index 0000000000..cd0683364d --- /dev/null +++ b/samples/client/petstore/java/retrofit2/src/main/gen/io/swagger/client/R.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */ +public final class R { +} \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2rx/src/main/gen/io/swagger/client/BuildConfig.java b/samples/client/petstore/java/retrofit2rx/src/main/gen/io/swagger/client/BuildConfig.java new file mode 100644 index 0000000000..720765940d --- /dev/null +++ b/samples/client/petstore/java/retrofit2rx/src/main/gen/io/swagger/client/BuildConfig.java @@ -0,0 +1,8 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */ +public final class BuildConfig { + public final static boolean DEBUG = Boolean.parseBoolean(null); +} \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2rx/src/main/gen/io/swagger/client/Manifest.java b/samples/client/petstore/java/retrofit2rx/src/main/gen/io/swagger/client/Manifest.java new file mode 100644 index 0000000000..41e0523a20 --- /dev/null +++ b/samples/client/petstore/java/retrofit2rx/src/main/gen/io/swagger/client/Manifest.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */ +public final class Manifest { +} \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2rx/src/main/gen/io/swagger/client/R.java b/samples/client/petstore/java/retrofit2rx/src/main/gen/io/swagger/client/R.java new file mode 100644 index 0000000000..cd0683364d --- /dev/null +++ b/samples/client/petstore/java/retrofit2rx/src/main/gen/io/swagger/client/R.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */ +public final class R { +} \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/gen/io/swagger/client/BuildConfig.java b/samples/client/petstore/java/retrofit2rx2/src/main/gen/io/swagger/client/BuildConfig.java new file mode 100644 index 0000000000..720765940d --- /dev/null +++ b/samples/client/petstore/java/retrofit2rx2/src/main/gen/io/swagger/client/BuildConfig.java @@ -0,0 +1,8 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */ +public final class BuildConfig { + public final static boolean DEBUG = Boolean.parseBoolean(null); +} \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/gen/io/swagger/client/Manifest.java b/samples/client/petstore/java/retrofit2rx2/src/main/gen/io/swagger/client/Manifest.java new file mode 100644 index 0000000000..41e0523a20 --- /dev/null +++ b/samples/client/petstore/java/retrofit2rx2/src/main/gen/io/swagger/client/Manifest.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */ +public final class Manifest { +} \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/gen/io/swagger/client/R.java b/samples/client/petstore/java/retrofit2rx2/src/main/gen/io/swagger/client/R.java new file mode 100644 index 0000000000..cd0683364d --- /dev/null +++ b/samples/client/petstore/java/retrofit2rx2/src/main/gen/io/swagger/client/R.java @@ -0,0 +1,7 @@ +/*___Generated_by_IDEA___*/ + +package io.swagger.client; + +/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */ +public final class R { +} \ No newline at end of file diff --git a/samples/client/petstore/python/README.md b/samples/client/petstore/python/README.md index 75d091a24d..c7d83142d8 100644 --- a/samples/client/petstore/python/README.md +++ b/samples/client/petstore/python/README.md @@ -108,11 +108,9 @@ Class | Method | HTTP request | Description - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md) - [ArrayTest](docs/ArrayTest.md) - [Capitalization](docs/Capitalization.md) - - [Cat](docs/Cat.md) - [Category](docs/Category.md) - [ClassModel](docs/ClassModel.md) - [Client](docs/Client.md) - - [Dog](docs/Dog.md) - [EnumArrays](docs/EnumArrays.md) - [EnumClass](docs/EnumClass.md) - [EnumTest](docs/EnumTest.md) @@ -136,6 +134,8 @@ Class | Method | HTTP request | Description - [SpecialModelName](docs/SpecialModelName.md) - [Tag](docs/Tag.md) - [User](docs/User.md) + - [Cat](docs/Cat.md) + - [Dog](docs/Dog.md) ## Documentation For Authorization diff --git a/samples/client/petstore/python/docs/FakeApi.md b/samples/client/petstore/python/docs/FakeApi.md index e9c5f515e9..e8bbda38d6 100644 --- a/samples/client/petstore/python/docs/FakeApi.md +++ b/samples/client/petstore/python/docs/FakeApi.md @@ -22,7 +22,7 @@ Test serialization of outer boolean types ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -69,7 +69,7 @@ Test serialization of object with outer number type ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -116,7 +116,7 @@ Test serialization of outer number types ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -163,7 +163,7 @@ Test serialization of outer string types ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -210,7 +210,7 @@ To test \"client\" model ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -258,7 +258,7 @@ Fake endpoint for testing various parameters 假端點 偽のエンドポイン ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -336,7 +336,7 @@ To test enum parameters ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException diff --git a/samples/client/petstore/python/docs/PetApi.md b/samples/client/petstore/python/docs/PetApi.md index 4614137194..74c6a5196f 100644 --- a/samples/client/petstore/python/docs/PetApi.md +++ b/samples/client/petstore/python/docs/PetApi.md @@ -23,7 +23,7 @@ Add a new pet to the store ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -74,7 +74,7 @@ Deletes a pet ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -127,7 +127,7 @@ Multiple status values can be provided with comma separated strings ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -179,7 +179,7 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -231,7 +231,7 @@ Returns a single pet ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -285,7 +285,7 @@ Update an existing pet ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -336,7 +336,7 @@ Updates a pet in the store with form data ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -391,7 +391,7 @@ uploads an image ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException diff --git a/samples/client/petstore/python/docs/StoreApi.md b/samples/client/petstore/python/docs/StoreApi.md index 5b766d0cfd..fca66f6524 100644 --- a/samples/client/petstore/python/docs/StoreApi.md +++ b/samples/client/petstore/python/docs/StoreApi.md @@ -19,7 +19,7 @@ For valid response try integer IDs with value < 1000. Anything above 1000 or non ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -66,7 +66,7 @@ Returns a map of status codes to quantities ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -116,7 +116,7 @@ For valid response try integer IDs with value <= 5 or > 10. Other values will ge ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -164,7 +164,7 @@ Place an order for a pet ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException diff --git a/samples/client/petstore/python/docs/UserApi.md b/samples/client/petstore/python/docs/UserApi.md index 9662031318..5b73179dce 100644 --- a/samples/client/petstore/python/docs/UserApi.md +++ b/samples/client/petstore/python/docs/UserApi.md @@ -23,7 +23,7 @@ This can only be done by the logged in user. ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -70,7 +70,7 @@ Creates list of users with given input array ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -117,7 +117,7 @@ Creates list of users with given input array ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -164,7 +164,7 @@ This can only be done by the logged in user. ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -211,7 +211,7 @@ Get user by user name ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -259,7 +259,7 @@ Logs user into the system ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -309,7 +309,7 @@ Logs out current logged in user session ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException @@ -352,7 +352,7 @@ This can only be done by the logged in user. ### Example ```python -from __future__ import print_statement +from __future__ import print_function import time import petstore_api from petstore_api.rest import ApiException diff --git a/samples/client/petstore/python/petstore_api/__init__.py b/samples/client/petstore/python/petstore_api/__init__.py index 1aa7992ff2..f045195c88 100644 --- a/samples/client/petstore/python/petstore_api/__init__.py +++ b/samples/client/petstore/python/petstore_api/__init__.py @@ -22,11 +22,9 @@ from .models.array_of_array_of_number_only import ArrayOfArrayOfNumberOnly from .models.array_of_number_only import ArrayOfNumberOnly from .models.array_test import ArrayTest from .models.capitalization import Capitalization -from .models.cat import Cat from .models.category import Category from .models.class_model import ClassModel from .models.client import Client -from .models.dog import Dog from .models.enum_arrays import EnumArrays from .models.enum_class import EnumClass from .models.enum_test import EnumTest @@ -50,6 +48,8 @@ from .models.read_only_first import ReadOnlyFirst from .models.special_model_name import SpecialModelName from .models.tag import Tag from .models.user import User +from .models.cat import Cat +from .models.dog import Dog # import apis into sdk package from .apis.fake_api import FakeApi diff --git a/samples/client/petstore/python/petstore_api/apis/fake_api.py b/samples/client/petstore/python/petstore_api/apis/fake_api.py index d2524dfae3..628ed03c05 100644 --- a/samples/client/petstore/python/petstore_api/apis/fake_api.py +++ b/samples/client/petstore/python/petstore_api/apis/fake_api.py @@ -100,7 +100,7 @@ class FakeApi(object): path_params = {} - query_params = {} + query_params = [] header_params = {} @@ -193,7 +193,7 @@ class FakeApi(object): path_params = {} - query_params = {} + query_params = [] header_params = {} @@ -286,7 +286,7 @@ class FakeApi(object): path_params = {} - query_params = {} + query_params = [] header_params = {} @@ -379,7 +379,7 @@ class FakeApi(object): path_params = {} - query_params = {} + query_params = [] header_params = {} diff --git a/samples/client/petstore/python/petstore_api/models/__init__.py b/samples/client/petstore/python/petstore_api/models/__init__.py index ea4684d548..21b5d20fa3 100644 --- a/samples/client/petstore/python/petstore_api/models/__init__.py +++ b/samples/client/petstore/python/petstore_api/models/__init__.py @@ -22,11 +22,9 @@ from .array_of_array_of_number_only import ArrayOfArrayOfNumberOnly from .array_of_number_only import ArrayOfNumberOnly from .array_test import ArrayTest from .capitalization import Capitalization -from .cat import Cat from .category import Category from .class_model import ClassModel from .client import Client -from .dog import Dog from .enum_arrays import EnumArrays from .enum_class import EnumClass from .enum_test import EnumTest @@ -50,3 +48,5 @@ from .read_only_first import ReadOnlyFirst from .special_model_name import SpecialModelName from .tag import Tag from .user import User +from .cat import Cat +from .dog import Dog diff --git a/samples/client/petstore/python/petstore_api/models/outer_boolean.py b/samples/client/petstore/python/petstore_api/models/outer_boolean.py index c3d04c856b..8d2e12e921 100644 --- a/samples/client/petstore/python/petstore_api/models/outer_boolean.py +++ b/samples/client/petstore/python/petstore_api/models/outer_boolean.py @@ -21,22 +21,28 @@ class OuterBoolean(object): NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. """ + + + """ + Attributes: + swagger_types (dict): The key is attribute name + and the value is attribute type. + attribute_map (dict): The key is attribute name + and the value is json key in definition. + """ + swagger_types = { + + } + + attribute_map = { + + } + def __init__(self): """ OuterBoolean - a model defined in Swagger - - :param dict swaggerTypes: The key is attribute name - and the value is attribute type. - :param dict attributeMap: The key is attribute name - and the value is json key in definition. """ - self.swagger_types = { - - } - self.attribute_map = { - - } def to_dict(self): diff --git a/samples/client/petstore/python/petstore_api/models/outer_composite.py b/samples/client/petstore/python/petstore_api/models/outer_composite.py index 8861eb354d..f8faa39bc3 100644 --- a/samples/client/petstore/python/petstore_api/models/outer_composite.py +++ b/samples/client/petstore/python/petstore_api/models/outer_composite.py @@ -21,30 +21,42 @@ class OuterComposite(object): NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. """ + + + """ + Attributes: + swagger_types (dict): The key is attribute name + and the value is attribute type. + attribute_map (dict): The key is attribute name + and the value is json key in definition. + """ + swagger_types = { + 'my_number': 'OuterNumber', + 'my_string': 'OuterString', + 'my_boolean': 'OuterBoolean' + } + + attribute_map = { + 'my_number': 'my_number', + 'my_string': 'my_string', + 'my_boolean': 'my_boolean' + } + def __init__(self, my_number=None, my_string=None, my_boolean=None): """ OuterComposite - a model defined in Swagger - - :param dict swaggerTypes: The key is attribute name - and the value is attribute type. - :param dict attributeMap: The key is attribute name - and the value is json key in definition. """ - self.swagger_types = { - 'my_number': 'OuterNumber', - 'my_string': 'OuterString', - 'my_boolean': 'OuterBoolean' - } - self.attribute_map = { - 'my_number': 'my_number', - 'my_string': 'my_string', - 'my_boolean': 'my_boolean' - } + self._my_number = None + self._my_string = None + self._my_boolean = None - self._my_number = my_number - self._my_string = my_string - self._my_boolean = my_boolean + if my_number is not None: + self.my_number = my_number + if my_string is not None: + self.my_string = my_string + if my_boolean is not None: + self.my_boolean = my_boolean @property def my_number(self): diff --git a/samples/client/petstore/python/petstore_api/models/outer_number.py b/samples/client/petstore/python/petstore_api/models/outer_number.py index 93087bff27..946e0ab069 100644 --- a/samples/client/petstore/python/petstore_api/models/outer_number.py +++ b/samples/client/petstore/python/petstore_api/models/outer_number.py @@ -21,22 +21,28 @@ class OuterNumber(object): NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. """ + + + """ + Attributes: + swagger_types (dict): The key is attribute name + and the value is attribute type. + attribute_map (dict): The key is attribute name + and the value is json key in definition. + """ + swagger_types = { + + } + + attribute_map = { + + } + def __init__(self): """ OuterNumber - a model defined in Swagger - - :param dict swaggerTypes: The key is attribute name - and the value is attribute type. - :param dict attributeMap: The key is attribute name - and the value is json key in definition. """ - self.swagger_types = { - - } - self.attribute_map = { - - } def to_dict(self): diff --git a/samples/client/petstore/python/petstore_api/models/outer_string.py b/samples/client/petstore/python/petstore_api/models/outer_string.py index dab30f6aca..a92ba3984c 100644 --- a/samples/client/petstore/python/petstore_api/models/outer_string.py +++ b/samples/client/petstore/python/petstore_api/models/outer_string.py @@ -21,22 +21,28 @@ class OuterString(object): NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. """ + + + """ + Attributes: + swagger_types (dict): The key is attribute name + and the value is attribute type. + attribute_map (dict): The key is attribute name + and the value is json key in definition. + """ + swagger_types = { + + } + + attribute_map = { + + } + def __init__(self): """ OuterString - a model defined in Swagger - - :param dict swaggerTypes: The key is attribute name - and the value is attribute type. - :param dict attributeMap: The key is attribute name - and the value is json key in definition. """ - self.swagger_types = { - - } - self.attribute_map = { - - } def to_dict(self): diff --git a/samples/html2/.swagger-codegen/VERSION b/samples/html2/.swagger-codegen/VERSION new file mode 100644 index 0000000000..7fea99011a --- /dev/null +++ b/samples/html2/.swagger-codegen/VERSION @@ -0,0 +1 @@ +2.2.3-SNAPSHOT \ No newline at end of file diff --git a/samples/html2/index.html b/samples/html2/index.html index 61c99f981e..4f854bc990 100644 --- a/samples/html2/index.html +++ b/samples/html2/index.html @@ -1012,7 +1012,7 @@ margin-bottom: 20px;
- 
curl -X post "http://petstore.swagger.io/v2/pet"
+ 
curl -X POST "http://petstore.swagger.io/v2/pet"
import io.swagger.client.*;
@@ -1143,7 +1143,8 @@ namespace Example
             }
         }
     }
-}
+} +
@@ -1199,7 +1200,7 @@ body = # Pet | Pet object that needs to be added to the store try: # Add a new pet to the store - api_instance.addPet(body) + api_instance.add_pet(body) except ApiException as e: print("Exception when calling PetApi->addPet: %s\n" % e)
@@ -1298,7 +1299,7 @@ $(document).ready(function() {
- 
curl -X delete "http://petstore.swagger.io/v2/pet/{petId}"
+ 
curl -X DELETE "http://petstore.swagger.io/v2/pet/{petId}"
import io.swagger.client.*;
@@ -1437,7 +1438,8 @@ namespace Example
             }
         }
     }
-}
+} +
@@ -1496,7 +1498,7 @@ apiKey = apiKey_example # String | (optional) try: # Deletes a pet - api_instance.deletePet(petId, apiKey=apiKey) + api_instance.delete_pet(petId, apiKey=apiKey) except ApiException as e: print("Exception when calling PetApi->deletePet: %s\n" % e)
@@ -1633,7 +1635,7 @@ except ApiException as e:
- 
curl -X get "http://petstore.swagger.io/v2/pet/findByStatus?status="
+ 
curl -X GET "http://petstore.swagger.io/v2/pet/findByStatus?status="
import io.swagger.client.*;
@@ -1770,7 +1772,8 @@ namespace Example
             }
         }
     }
-}
+} +
@@ -1828,7 +1831,7 @@ status = # array[String] | Status values that need to be considered for filter try: # Finds Pets by status - api_response = api_instance.findPetsByStatus(status) + api_response = api_instance.find_pets_by_status(status) pprint(api_response) except ApiException as e: print("Exception when calling PetApi->findPetsByStatus: %s\n" % e) @@ -1861,8 +1864,8 @@ except ApiException as e: "type" : "array", "items" : { "type" : "string", - "default" : "available", - "enum" : [ "available", "pending", "sold" ] + "enum" : [ "available", "pending", "sold" ], + "default" : "available" }, "collectionFormat" : "csv" }; @@ -1978,7 +1981,7 @@ except ApiException as e:
- 
curl -X get "http://petstore.swagger.io/v2/pet/findByTags?tags="
+ 
curl -X GET "http://petstore.swagger.io/v2/pet/findByTags?tags="
import io.swagger.client.*;
@@ -2115,7 +2118,8 @@ namespace Example
             }
         }
     }
-}
+} +
@@ -2173,7 +2177,7 @@ tags = # array[String] | Tags to filter by try: # Finds Pets by tags - api_response = api_instance.findPetsByTags(tags) + api_response = api_instance.find_pets_by_tags(tags) pprint(api_response) except ApiException as e: print("Exception when calling PetApi->findPetsByTags: %s\n" % e) @@ -2321,7 +2325,7 @@ except ApiException as e:
- 
curl -X get -H "api_key: [[apiKey]]" "http://petstore.swagger.io/v2/pet/{petId}"
+ 
curl -X GET -H "api_key: [[apiKey]]" "http://petstore.swagger.io/v2/pet/{petId}"
import io.swagger.client.*;
@@ -2466,7 +2470,8 @@ namespace Example
             }
         }
     }
-}
+} +
@@ -2530,7 +2535,7 @@ petId = 789 # Long | ID of pet to return try: # Find pet by ID - api_response = api_instance.getPetById(petId) + api_response = api_instance.get_pet_by_id(petId) pprint(api_response) except ApiException as e: print("Exception when calling PetApi->getPetById: %s\n" % e) @@ -2680,7 +2685,7 @@ except ApiException as e:
- 
curl -X put "http://petstore.swagger.io/v2/pet"
+ 
curl -X PUT "http://petstore.swagger.io/v2/pet"
import io.swagger.client.*;
@@ -2811,7 +2816,8 @@ namespace Example
             }
         }
     }
-}
+} +
@@ -2867,7 +2873,7 @@ body = # Pet | Pet object that needs to be added to the store try: # Update an existing pet - api_instance.updatePet(body) + api_instance.update_pet(body) except ApiException as e: print("Exception when calling PetApi->updatePet: %s\n" % e)
@@ -2982,7 +2988,7 @@ $(document).ready(function() {
- 
curl -X post "http://petstore.swagger.io/v2/pet/{petId}"
+ 
curl -X POST "http://petstore.swagger.io/v2/pet/{petId}"
import io.swagger.client.*;
@@ -3127,7 +3133,8 @@ namespace Example
             }
         }
     }
-}
+} +
@@ -3189,7 +3196,7 @@ status = status_example # String | Updated status of the pet (optional) try: # Updates a pet in the store with form data - api_instance.updatePetWithForm(petId, name=name, status=status) + api_instance.update_pet_with_form(petId, name=name, status=status) except ApiException as e: print("Exception when calling PetApi->updatePetWithForm: %s\n" % e)
@@ -3360,7 +3367,7 @@ except ApiException as e:
- 
curl -X post "http://petstore.swagger.io/v2/pet/{petId}/uploadImage"
+ 
curl -X POST "http://petstore.swagger.io/v2/pet/{petId}/uploadImage"
import io.swagger.client.*;
@@ -3511,7 +3518,8 @@ namespace Example
             }
         }
     }
-}
+} +
@@ -3575,7 +3583,7 @@ file = /path/to/file.txt # File | file to upload (optional) try: # uploads an image - api_response = api_instance.uploadFile(petId, additionalMetadata=additionalMetadata, file=file) + api_response = api_instance.upload_file(petId, additionalMetadata=additionalMetadata, file=file) pprint(api_response) except ApiException as e: print("Exception when calling PetApi->uploadFile: %s\n" % e) @@ -3785,7 +3793,7 @@ except ApiException as e:
- 
curl -X delete "http://petstore.swagger.io/v2/store/order/{orderId}"
+ 
curl -X DELETE "http://petstore.swagger.io/v2/store/order/{orderId}"
import io.swagger.client.*;
@@ -3898,7 +3906,8 @@ namespace Example
             }
         }
     }
-}
+} +
@@ -3945,7 +3954,7 @@ orderId = orderId_example # String | ID of the order that needs to be deleted try: # Delete purchase order by ID - api_instance.deleteOrder(orderId) + api_instance.delete_order(orderId) except ApiException as e: print("Exception when calling StoreApi->deleteOrder: %s\n" % e)
@@ -4050,7 +4059,7 @@ except ApiException as e:
- 
curl -X get -H "api_key: [[apiKey]]" "http://petstore.swagger.io/v2/store/inventory"
+ 
curl -X GET -H "api_key: [[apiKey]]" "http://petstore.swagger.io/v2/store/inventory"
import io.swagger.client.*;
@@ -4188,7 +4197,8 @@ namespace Example
             }
         }
     }
-}
+} +
@@ -4249,7 +4259,7 @@ api_instance = swagger_client.StoreApi() try: # Returns pet inventories by status - api_response = api_instance.getInventory() + api_response = api_instance.get_inventory() pprint(api_response) except ApiException as e: print("Exception when calling StoreApi->getInventory: %s\n" % e) @@ -4346,7 +4356,7 @@ except ApiException as e:
- 
curl -X get "http://petstore.swagger.io/v2/store/order/{orderId}"
+ 
curl -X GET "http://petstore.swagger.io/v2/store/order/{orderId}"
import io.swagger.client.*;
@@ -4465,7 +4475,8 @@ namespace Example
             }
         }
     }
-}
+} +
@@ -4514,7 +4525,7 @@ orderId = 789 # Long | ID of pet that needs to be fetched try: # Find purchase order by ID - api_response = api_instance.getOrderById(orderId) + api_response = api_instance.get_order_by_id(orderId) pprint(api_response) except ApiException as e: print("Exception when calling StoreApi->getOrderById: %s\n" % e) @@ -4666,7 +4677,7 @@ except ApiException as e:
- 
curl -X post "http://petstore.swagger.io/v2/store/order"
+ 
curl -X POST "http://petstore.swagger.io/v2/store/order"
import io.swagger.client.*;
@@ -4785,7 +4796,8 @@ namespace Example
             }
         }
     }
-}
+} +
@@ -4834,7 +4846,7 @@ body = # Order | order placed for purchasing the pet try: # Place an order for a pet - api_response = api_instance.placeOrder(body) + api_response = api_instance.place_order(body) pprint(api_response) except ApiException as e: print("Exception when calling StoreApi->placeOrder: %s\n" % e) @@ -4980,7 +4992,7 @@ $(document).ready(function() {
- 
curl -X post "http://petstore.swagger.io/v2/user"
+ 
curl -X POST "http://petstore.swagger.io/v2/user"
import io.swagger.client.*;
@@ -5093,7 +5105,8 @@ namespace Example
             }
         }
     }
-}
+} +
@@ -5140,7 +5153,7 @@ body = # User | Created user object try: # Create user - api_instance.createUser(body) + api_instance.create_user(body) except ApiException as e: print("Exception when calling UserApi->createUser: %s\n" % e)
@@ -5239,7 +5252,7 @@ $(document).ready(function() {
- 
curl -X post "http://petstore.swagger.io/v2/user/createWithArray"
+ 
curl -X POST "http://petstore.swagger.io/v2/user/createWithArray"
import io.swagger.client.*;
@@ -5352,7 +5365,8 @@ namespace Example
             }
         }
     }
-}
+} +
@@ -5399,7 +5413,7 @@ body = # array[User] | List of user object try: # Creates list of users with given input array - api_instance.createUsersWithArrayInput(body) + api_instance.create_users_with_array_input(body) except ApiException as e: print("Exception when calling UserApi->createUsersWithArrayInput: %s\n" % e)
@@ -5501,7 +5515,7 @@ $(document).ready(function() {
- 
curl -X post "http://petstore.swagger.io/v2/user/createWithList"
+ 
curl -X POST "http://petstore.swagger.io/v2/user/createWithList"
import io.swagger.client.*;
@@ -5614,7 +5628,8 @@ namespace Example
             }
         }
     }
-}
+} +
@@ -5661,7 +5676,7 @@ body = # array[User] | List of user object try: # Creates list of users with given input array - api_instance.createUsersWithListInput(body) + api_instance.create_users_with_list_input(body) except ApiException as e: print("Exception when calling UserApi->createUsersWithListInput: %s\n" % e)
@@ -5763,7 +5778,7 @@ $(document).ready(function() {
- 
curl -X delete "http://petstore.swagger.io/v2/user/{username}"
+ 
curl -X DELETE "http://petstore.swagger.io/v2/user/{username}"
import io.swagger.client.*;
@@ -5876,7 +5891,8 @@ namespace Example
             }
         }
     }
-}
+} +
@@ -5923,7 +5939,7 @@ username = username_example # String | The name that needs to be deleted try: # Delete user - api_instance.deleteUser(username) + api_instance.delete_user(username) except ApiException as e: print("Exception when calling UserApi->deleteUser: %s\n" % e)
@@ -6028,7 +6044,7 @@ except ApiException as e:
- 
curl -X get "http://petstore.swagger.io/v2/user/{username}"
+ 
curl -X GET "http://petstore.swagger.io/v2/user/{username}"
import io.swagger.client.*;
@@ -6147,7 +6163,8 @@ namespace Example
             }
         }
     }
-}
+} +
@@ -6196,7 +6213,7 @@ username = username_example # String | The name that needs to be fetched. Use us try: # Get user by user name - api_response = api_instance.getUserByName(username) + api_response = api_instance.get_user_by_name(username) pprint(api_response) except ApiException as e: print("Exception when calling UserApi->getUserByName: %s\n" % e) @@ -6345,7 +6362,7 @@ except ApiException as e:
- 
curl -X get "http://petstore.swagger.io/v2/user/login?username=&password="
+ 
curl -X GET "http://petstore.swagger.io/v2/user/login?username=&password="
import io.swagger.client.*;
@@ -6471,7 +6488,8 @@ namespace Example
             }
         }
     }
-}
+} +
@@ -6523,7 +6541,7 @@ password = password_example # String | The password for login in clear text try: # Logs user into the system - api_response = api_instance.loginUser(username, password) + api_response = api_instance.login_user(username, password) pprint(api_response) except ApiException as e: print("Exception when calling UserApi->loginUser: %s\n" % e) @@ -6734,7 +6752,7 @@ except ApiException as e:
- 
curl -X get "http://petstore.swagger.io/v2/user/logout"
+ 
curl -X GET "http://petstore.swagger.io/v2/user/logout"
import io.swagger.client.*;
@@ -6840,7 +6858,8 @@ namespace Example
             }
         }
     }
-}
+} +
@@ -6884,7 +6903,7 @@ api_instance = swagger_client.UserApi() try: # Logs out current logged in user session - api_instance.logoutUser() + api_instance.logout_user() except ApiException as e: print("Exception when calling UserApi->logoutUser: %s\n" % e)
@@ -6941,7 +6960,7 @@ except ApiException as e:
- 
curl -X put "http://petstore.swagger.io/v2/user/{username}"
+ 
curl -X PUT "http://petstore.swagger.io/v2/user/{username}"
import io.swagger.client.*;
@@ -7061,7 +7080,8 @@ namespace Example
             }
         }
     }
-}
+} +
@@ -7111,7 +7131,7 @@ body = # User | Updated user object try: # Updated user - api_instance.updateUser(username, body) + api_instance.update_user(username, body) except ApiException as e: print("Exception when calling UserApi->updateUser: %s\n" % e)