diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000000..85134f29aa --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +open_collective: openapi_generator diff --git a/.gitignore b/.gitignore index 942cbf7568..a4ac179d18 100644 --- a/.gitignore +++ b/.gitignore @@ -88,6 +88,9 @@ samples/client/petstore/java/jersey2/build/ samples/client/petstore/java/okhttp-gson/.gradle/ samples/client/petstore/java/okhttp-gson/build/ samples/client/petstore/java/feign/build/ +samples/client/petstore/java/feign10x/build/ +samples/client/petstore/java/feign/project/ +samples/client/petstore/java/feign10x/project/ samples/client/petstore/java/retrofit/build/ samples/client/petstore/java/retrofit2/build/ samples/client/petstore/java/retrofit2/hello.txt @@ -218,6 +221,7 @@ samples/server/petstore/erlang-server/rebar.lock samples/client/petstore/dart/petstore/packages samples/client/petstore/dart/flutter_petstore/test/packages samples/client/petstore/dart/petstore/test/packages +**/.dart_tool # JS samples/client/petstore/javascript/package-lock.json diff --git a/.travis.yml b/.travis.yml index 32cc18325a..5d79028475 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,9 @@ jdk: before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ + # Avoid caching our built dependencies between runs. + - rm -fr $HOME/.m2/repository/org/openapitools/ + cache: directories: - $HOME/.m2 @@ -130,24 +133,32 @@ script: - mvn --quiet --batch-mode --show-version verify -Psamples after_success: # push to maven repo - - if [ $SONATYPE_USERNAME ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then - if [ "$TRAVIS_BRANCH" = "master" ]; then + - if [ $SONATYPE_USERNAME ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then + if [ "$TRAVIS_BRANCH" = "master" ] && [ -z $TRAVIS_TAG ]; then + echo "Publishing from branch $TRAVIS_BRANCH"; mvn clean deploy -DskipTests=true -B -U -P release --settings CI/settings.xml; echo "Finished mvn clean deploy for $TRAVIS_BRANCH"; pushd .; cd modules/openapi-generator-gradle-plugin; - ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/sec.gpg" -PossrhUsername="${SONATYPE_USERNAME}" -PossrhPassword="${SONATYPE_PASSWORD}" uploadArchives --no-daemon; - echo "Finished ./gradlew uploadArchives"; + ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/sec.gpg" -PossrhUsername="${SONATYPE_USERNAME}" -PossrhPassword="${SONATYPE_PASSWORD}" publishMavenJavaPublicationToNexusRepository closeAndReleaseRepository --no-daemon; + echo "Finished ./gradlew publishPluginMavenPublicationToNexusRepository closeAndReleaseRepository"; popd; - elif ([[ "$TRAVIS_BRANCH" =~ ^[0-9]+\.[0-9]+\.x$ ]]) ; then + elif [ -z $TRAVIS_TAG ] && [[ "$TRAVIS_BRANCH" =~ ^[0-9]+\.[0-9]+\.x$ ]]; then + echo "Publishing from branch $TRAVIS_BRANCH"; mvn clean deploy --settings CI/settings.xml; echo "Finished mvn clean deploy for $TRAVIS_BRANCH"; pushd .; cd modules/openapi-generator-gradle-plugin; + ./gradlew -PossrhUsername="${SONATYPE_USERNAME}" -PossrhPassword="${SONATYPE_PASSWORD}" publishPluginMavenPublicationToNexusRepository closeAndReleaseRepository --no-daemon; + echo "Finished ./gradlew publishPluginMavenPublicationToNexusRepository closeAndReleaseRepository"; + popd; + fi; + if [ -n $TRAVIS_TAG ] && [[ "$TRAVIS_TAG" =~ ^[v][0-9]+\.[0-9]+\.[0-9]+$ ]]; then + echo "Publishing the gradle plugin to Gradle Portal on tag $TRAVIS_TAG (only)"; + pushd .; + cd modules/openapi-generator-gradle-plugin; ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/sec.gpg" publishPlugins -Dgradle.publish.key=$GRADLE_PUBLISH_KEY -Dgradle.publish.secret=$GRADLE_PUBLISH_SECRET --no-daemon; echo "Finished ./gradlew publishPlugins (plugin portal)"; - ./gradlew -PossrhUsername="${SONATYPE_USERNAME}" -PossrhPassword="${SONATYPE_PASSWORD}" uploadArchives --no-daemon; - echo "Finished ./gradlew uploadArchives"; popd; fi; fi; diff --git a/README.md b/README.md index ce239e3167..a079e9c601 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@
-[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`4.0.0`): [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator) +[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`4.0.1`): [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator) [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator) [![Run Status](https://api.shippable.com/projects/5af6bf74e790f4070084a115/badge?branch=master)](https://app.shippable.com/github/OpenAPITools/openapi-generator) [![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator-wh2wu) @@ -97,10 +97,10 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20 OpenAPI Generator Version | Release Date | Notes ---------------------------- | ------------ | ----- -5.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.0.0-SNAPSHOT/)| 13.05.2019 | Major release with breaking changes (no fallback) +5.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.0.0-SNAPSHOT/)| 13.05.2020 | Major release with breaking changes (no fallback) 4.1.0 (upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/4.1.0-SNAPSHOT/)| 15.07.2019 | Minor release (breaking changes with fallbacks) -4.0.1 (upcoming patch release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/4.0.1-SNAPSHOT/)| 31.05.2019 | Patch release (minor bug fixes, etc) -[4.0.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v4.0.0) (latest stable release) | 13.05.2019 | Major release with breaking changes (with or without fallback) +4.0.2 (upcoming patch release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/4.0.1-SNAPSHOT/)| 15.06.2019 | Patch release (minor bug fixes, etc) +[4.0.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v4.0.1) (latest stable release) | 31.05.2019 | Patch release (bug fixes, minor enhancements, etc) OpenAPI Spec compatibility: 1.0, 1.1, 1.2, 2.0, 3.0 @@ -156,16 +156,16 @@ See the different versions of the [openapi-generator-cli](https://mvnrepository. If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 8 runtime at a minimum): -JAR location: `http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.0.0/openapi-generator-cli-4.0.0.jar` +JAR location: `http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.0.1/openapi-generator-cli-4.0.1.jar` For **Mac/Linux** users: ```sh -wget http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.0.0/openapi-generator-cli-4.0.0.jar -O openapi-generator-cli.jar +wget http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.0.1/openapi-generator-cli-4.0.1.jar -O openapi-generator-cli.jar ``` For **Windows** users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g. ``` -Invoke-WebRequest -OutFile openapi-generator-cli.jar http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.0.0/openapi-generator-cli-4.0.0.jar +Invoke-WebRequest -OutFile openapi-generator-cli.jar http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.0.1/openapi-generator-cli-4.0.1.jar ``` After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage. @@ -368,10 +368,10 @@ npm install @openapitools/openapi-generator-cli -g openapi-generator version ``` -Or install a particualar OpenAPI Generator version (e.g. v4.0.0): +Or install a particualar OpenAPI Generator version (e.g. v4.0.1): ```sh -npm install @openapitools/openapi-generator-cli@cli-4.0.0 -g +npm install @openapitools/openapi-generator-cli@cli-4.0.1 -g ``` Or install it as dev-dependency: @@ -394,7 +394,7 @@ java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generat ``` (if you're on Windows, replace the last command with `java -jar modules\openapi-generator-cli\target\openapi-generator-cli.jar generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g php -o c:\temp\php_api_client`) -You can also download the JAR (latest release) directly from [maven.org](http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.0.0/openapi-generator-cli-4.0.0.jar) +You can also download the JAR (latest release) directly from [maven.org](http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.0.1/openapi-generator-cli-4.0.1.jar) To get a list of **general** options available, please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar help generate` @@ -554,6 +554,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in - [unblu inc.](https://www.unblu.com/) - [Veamly](https://www.veamly.com/) - [Xero](https://www.xero.com/) +- [Yelp](https://www.yelp.com/) - [Zalando](https://www.zalando.com) ## [5 - Presentations/Videos/Tutorials/Books](#table-of-contents) @@ -583,10 +584,13 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in - 2019-03-25 - [Access any REST service with the SAP S/4HANA Cloud SDK](https://blogs.sap.com/2019/03/25/integrate-sap-s4hana-cloud-sdk-with-open-api/) by [Alexander Duemont](https://people.sap.com/alexander.duemont) - 2019-03-25 - [OpenAPI generatorを試してみる](https://qiita.com/amuyikam/items/e8a45daae59c68be0fc8) by [@amuyikam](https://twitter.com/amuyikam) - 2019-03-27 - [OpenAPI3を使ってみよう！Go言語でクライアントとスタブの自動生成まで！](https://techblog.zozo.com/entry/openapi3/go) by [@gold_kou](https://twitter.com/gold_kou) +- 2019-04-17 - [OpenAPIによるスキーマファースト開発の実施サンプルとCloud Runについて](https://tech-blog.optim.co.jp/entry/2019/04/17/174000) by [@yukey1031](https://twitter.com/yukey1031) - 2019-04-18 - [How to use OpenAPI3 for API developer (RubyKaigi 2019)](https://speakerdeck.com/ota42y/how-to-use-openapi3-for-api-developer) by [@ota42y](https://twitter.com/ota42y) at [RubyKaigi 2019](https://rubykaigi.org/2019) - 2019-04-29 - [A Beginner's Guide to Code Generation for REST APIs (OpenAPI Generator)](https://gum.co/openapi_generator_ebook) by [William Cheng](https://twitter.com/wing328) - 2019-05-01 - [Design and generate a REST API from Swagger / OpenAPI in Java, Python, C# and more](https://simply-how.com/design-and-generate-api-code-from-openapi) by [Simply How](https://simply-how.com/) - 2019-05-17 - [Generate Spring Boot REST API using Swagger/OpenAPI](https://www.47northlabs.com/knowledge-base/generate-spring-boot-rest-api-using-swagger-openapi/) by [Antonie Zafirov](https://www.47northlabs.com/author/antonie-zafirov/) +- 2019-05-22 - [REST APIs代码生成指南(OpenAPI Generator)](https://gum.co/openapi_generator_ebook_gb) by [William Cheng](https://twitter.com/wing328), [Xin Meng](https://github.com/xmeng1) +- 2019-05/24 - [REST API 代碼生成指南 (OpenAPI Generator)](https://gum.co/openapi_generator_ebook_big5) by [William Cheng](https://twitter.com/wing328) ## [6 - About Us](#table-of-contents) @@ -668,6 +672,7 @@ Here is a list of template creators: * TypeScript (jQuery): @bherila * TypeScript (Node): @mhardorf * TypeScript (Rxjs): @denyo + * TypeScript (Inversify): @gualtierim * Server Stubs * Ada: @stcarrez * C# ASP.NET5: @jimschubert [:heart:](https://www.patreon.com/jimschubert) diff --git a/appveyor.yml b/appveyor.yml index 755aab9f92..4b387578e8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,7 +30,6 @@ install: - cmd: SET M2_HOME=C:\maven\apache-maven-3.2.5 - cmd: java -version - cmd: gradle -v - - cmd: gradle -b modules\openapi-generator-gradle-plugin\samples\local-spec\build.gradle buildGoSdk --info - cmd: dir/w - git clone https://github.com/wing328/swagger-samples - ps: Start-Process -FilePath 'C:\maven\apache-maven-3.2.5\bin\mvn' -ArgumentList 'jetty:run' -WorkingDirectory "$env:appveyor_build_folder\swagger-samples\java\java-jersey-jaxrs-ci" @@ -50,6 +49,8 @@ build_script: - msbuild samples\client\petstore\csharp\OpenAPIClientNetStandard\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" # install openapi-generator locally - mvn clean install --quiet + # run the locally installed openapi-generator-gradle-plugin + - gradle -PopenApiGeneratorVersion=4.0.2-SNAPSHOT -b modules\openapi-generator-gradle-plugin\samples\local-spec\build.gradle buildGoSdk --info test_script: # restore test-related files - copy /b/v/y CI\samples.ci\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj diff --git a/bin/java-msf4j-petstore-server.sh b/bin/java-msf4j-petstore-server.sh index 9660c71af4..8df820296c 100755 --- a/bin/java-msf4j-petstore-server.sh +++ b/bin/java-msf4j-petstore-server.sh @@ -27,7 +27,7 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="generate -t modules/openapi-generator/src/main/resources/MSF4J -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java-msf4j -o samples/server/petstore/java-msf4j/ -DhideGenerationTimestamp=true --additional-properties artifactId=java-msf4j-server $@" +ags="generate -t modules/openapi-generator/src/main/resources/java-msf4j-server -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java-msf4j -o samples/server/petstore/java-msf4j/ -DhideGenerationTimestamp=true --additional-properties artifactId=java-msf4j-server $@" echo "Removing files and folders under samples/server/petstore/java-msf4j/src/main" rm -rf samples/server/petstore/java-msf4j/src/main diff --git a/bin/java-undertow-petstore-server.sh b/bin/java-undertow-petstore-server.sh index 8138c5e7a4..957d759252 100755 --- a/bin/java-undertow-petstore-server.sh +++ b/bin/java-undertow-petstore-server.sh @@ -27,6 +27,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="generate -t modules/openapi-generator/src/main/resources/undertow -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g java-undertow-server -o samples/server/petstore/undertow --additional-properties hideGenerationTimestamp=true $@" +ags="generate -t modules/openapi-generator/src/main/resources/java-undertow-server -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g java-undertow-server -o samples/server/petstore/java-undertow --additional-properties hideGenerationTimestamp=true $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/openapi3/finch-petstore-server.sh b/bin/openapi3/finch-petstore-server.sh index 44076a85e7..f6b4a46a42 100755 --- a/bin/openapi3/finch-petstore-server.sh +++ b/bin/openapi3/finch-petstore-server.sh @@ -27,6 +27,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="generate $@ -t modules/openapi-generator/src/main/resources/finch -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g scala-finch -o samples/server/petstore/finch" +ags="generate $@ -t modules/openapi-generator/src/main/resources/scala-finch -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g scala-finch -o samples/server/petstore/scala-finch" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/openapi3/php-ze-ph-petstore-server.sh b/bin/openapi3/php-ze-ph-petstore-server.sh index 569d7c91b9..c37137cd81 100644 --- a/bin/openapi3/php-ze-ph-petstore-server.sh +++ b/bin/openapi3/php-ze-ph-petstore-server.sh @@ -27,7 +27,7 @@ fi input=modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml out_folder=samples/server/openapi3/petstore/php-ze-ph -resources=modules/openapi-generator/src/main/resources/ze-ph +resources=modules/openapi-generator/src/main/resources/php-ze-ph # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties" diff --git a/bin/php-ze-ph-petstore-server.sh b/bin/php-ze-ph-petstore-server.sh index bee84380b0..371e65fe46 100755 --- a/bin/php-ze-ph-petstore-server.sh +++ b/bin/php-ze-ph-petstore-server.sh @@ -27,7 +27,7 @@ fi input=modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml out_folder=samples/server/petstore/php-ze-ph -resources=modules/openapi-generator/src/main/resources/ze-ph +resources=modules/openapi-generator/src/main/resources/php-ze-ph # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties" diff --git a/bin/finch-petstore-server.sh b/bin/scala-finch-petstore-server.sh similarity index 77% rename from bin/finch-petstore-server.sh rename to bin/scala-finch-petstore-server.sh index f346536b26..31d8351808 100755 --- a/bin/finch-petstore-server.sh +++ b/bin/scala-finch-petstore-server.sh @@ -27,6 +27,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="generate -t modules/openapi-generator/src/main/resources/finch -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g scala-finch -o samples/server/petstore/finch $@" +ags="generate -t modules/openapi-generator/src/main/resources/scala-finch -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g scala-finch -o samples/server/petstore/scala-finch $@" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/utils/ensure-up-to-date b/bin/utils/ensure-up-to-date index c2e38093de..3d5909a88d 100755 --- a/bin/utils/ensure-up-to-date +++ b/bin/utils/ensure-up-to-date @@ -48,11 +48,12 @@ declare -a scripts=( "./bin/r-petstore.sh" "./bin/haskell-http-client-petstore.sh" "./bin/csharp-petstore.sh" -"./bin/csharp-netcore-petstore.sh" +"./bin/csharp-netcore-petstore-all.sh" "./bin/elixir-petstore.sh" "./bin/go-petstore.sh" "./bin/go-gin-petstore-server.sh" "./bin/groovy-petstore.sh" +"./bin/apex-petstore.sh" #"./bin/elm-petstore-all.sh" "./bin/meta-codegen.sh" # OTHERS diff --git a/bin/utils/release_version_update.sh b/bin/utils/release_version_update.sh index e2c6f47d8a..c485fc589c 100755 --- a/bin/utils/release_version_update.sh +++ b/bin/utils/release_version_update.sh @@ -33,8 +33,10 @@ fi echo "Release preparation: replacing $FROM with $TO in different files" +# This script assumes the files defined here have a version surrounded by angle brackets within an xml node. +# For example, >4.0.0< becomes >4.0.1-SNAPSHOT<. +# Verify the sed command below against a file before adding here. declare -a files=("modules/openapi-generator-cli/pom.xml" - "modules/openapi-generator-gradle-plugin/gradle.properties" "modules/openapi-generator-gradle-plugin/pom.xml" "modules/openapi-generator-core/pom.xml" "modules/openapi-generator-maven-plugin/pom.xml" diff --git a/bin/utils/release_version_update_docs.sh b/bin/utils/release_version_update_docs.sh index b77ad27c41..a19299f34e 100755 --- a/bin/utils/release_version_update_docs.sh +++ b/bin/utils/release_version_update_docs.sh @@ -34,10 +34,12 @@ fi echo "Release preparation: replacing $FROM with $TO in different files" declare -a files=("modules/openapi-generator-maven-plugin/README.md" + "modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml" "modules/openapi-generator-maven-plugin/examples/java-client.xml" "modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml" "modules/openapi-generator-maven-plugin/examples/non-java.xml" "modules/openapi-generator-gradle-plugin/README.adoc" + "modules/openapi-generator-gradle-plugin/gradle.properties" "modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties" "modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle" "modules/openapi-generator-gradle-plugin/samples/local-spec/README.md" diff --git a/bin/windows/csharp-petstore.bat b/bin/windows/csharp-petstore.bat index b64fd2cabf..f231c5848c 100755 --- a/bin/windows/csharp-petstore.bat +++ b/bin/windows/csharp-petstore.bat @@ -5,7 +5,7 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -set ags=generate -i modules\openapi-generator\src\test/resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples\client\petstore\csharp\SwaggerClient --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C} +set ags=generate -i modules\openapi-generator\src\test/resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples\client\petstore\csharp\OpenAPIClient --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C} java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/ze-ph-petstore.bat b/bin/windows/ze-ph-petstore.bat index eb966aefb7..da5eacc363 100644 --- a/bin/windows/ze-ph-petstore.bat +++ b/bin/windows/ze-ph-petstore.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g php-ze-ph -o samples\server\petstore\ze-ph +set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g php-ze-ph -o samples\server\petstore\php-ze-ph java %JAVA_OPTS% -jar %executable% %ags% diff --git a/docs/generators/csharp.md b/docs/generators/csharp.md index 6bc0fc3a53..0ebac9b677 100644 --- a/docs/generators/csharp.md +++ b/docs/generators/csharp.md @@ -28,3 +28,4 @@ sidebar_label: csharp |netCoreProjectFile|Use the new format (.NET Core) for .NET project files (.csproj).| |false| |validatable|Generates self-validatable models.| |true| |useCompareNetObjects|Use KellermanSoftware.CompareNetObjects for deep recursive object comparison. WARNING: this option incurs potential performance impact.| |false| +|caseInsensitiveResponseHeaders|Make API response's headers case-insensitive| |false| diff --git a/docs/generators/typescript-inversify.md b/docs/generators/typescript-inversify.md index 4a7cbc73c4..21e7c7dd32 100644 --- a/docs/generators/typescript-inversify.md +++ b/docs/generators/typescript-inversify.md @@ -19,4 +19,5 @@ sidebar_label: typescript-inversify |npmRepository|Use this property to set an url your private npmRepo in the package.json| |null| |withInterfaces|Setting this property to true will generate interfaces next to the default class implementations.| |false| |usePromise|Setting this property to use promise instead of observable inside every service.| |false| +|useRxJS6|Setting this property to use rxjs 6 instead of rxjs 5.| |false| |taggedUnions|Use discriminators to create tagged unions instead of extending interfaces.| |false| diff --git a/docs/templating.md b/docs/templating.md index 4ec320d8e7..6452a58c6d 100644 --- a/docs/templating.md +++ b/docs/templating.md @@ -7,7 +7,7 @@ It's easy to work with templates for codegen! The generator workflow has [transforming logic](https://github.com/openapitools/openapi-generator/tree/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages) as well as templates for each generation of code. -Each generator will create a data structure from the OpenAPI document; OpenAPI 2.0 and OpenAPI 3.x documents are normalized into the same API model within the generator. This model is then applied to the templates. While generators do not need to perform transformations, it's often necessary in order to add more advanced support for your language or framework. You may need to refer to the generator implementation to understand some of the logic while creating or customizing templates (see [FinchServerCodegen.java](https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FinchServerCodegen.java) for an advanced example). +Each generator will create a data structure from the OpenAPI document; OpenAPI 2.0 and OpenAPI 3.x documents are normalized into the same API model within the generator. This model is then applied to the templates. While generators do not need to perform transformations, it's often necessary in order to add more advanced support for your language or framework. You may need to refer to the generator implementation to understand some of the logic while creating or customizing templates (see [ScalaFinchServerCodegen.java](https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java) for an advanced example). The transform logic needs to implement [CodegenConfig.java](https://github.com/openapitools/openapi-generator/blob/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java) and is most easily done by extending [DefaultCodegen.java](https://github.com/openapitools/openapi-generator/blob/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java). Take a look at the various implementations as a guideline while the instructions get more complete. diff --git a/modules/openapi-generator-cli/pom.xml b/modules/openapi-generator-cli/pom.xml index 41d48295c0..a66576dd6a 100644 --- a/modules/openapi-generator-cli/pom.xml +++ b/modules/openapi-generator-cli/pom.xml @@ -3,7 +3,11 @@ org.openapitools openapi-generator-project +<<<<<<< HEAD 4.1.0-SNAPSHOT +======= + 4.0.2-SNAPSHOT +>>>>>>> origin/master ../.. 4.0.0 diff --git a/modules/openapi-generator-core/pom.xml b/modules/openapi-generator-core/pom.xml index e63b7dac54..9a95abaf02 100644 --- a/modules/openapi-generator-core/pom.xml +++ b/modules/openapi-generator-core/pom.xml @@ -5,7 +5,11 @@ openapi-generator-project org.openapitools +<<<<<<< HEAD 4.1.0-SNAPSHOT +======= + 4.0.2-SNAPSHOT +>>>>>>> origin/master ../.. 4.0.0 diff --git a/modules/openapi-generator-gradle-plugin/README.adoc b/modules/openapi-generator-gradle-plugin/README.adoc index c31c31291d..47200a6754 100644 --- a/modules/openapi-generator-gradle-plugin/README.adoc +++ b/modules/openapi-generator-gradle-plugin/README.adoc @@ -48,7 +48,7 @@ buildscript { mavenCentral() } dependencies { - classpath "org.openapitools:openapi-generator-gradle-plugin:4.0.0" + classpath "org.openapitools:openapi-generator-gradle-plugin:4.0.1" } } @@ -599,7 +599,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.2.1' - classpath('org.openapitools:openapi-generator-gradle-plugin:4.0.0') { + classpath('org.openapitools:openapi-generator-gradle-plugin:4.0.1') { exclude group: 'com.google.guava' } } diff --git a/modules/openapi-generator-gradle-plugin/build.gradle b/modules/openapi-generator-gradle-plugin/build.gradle index 346deef7c4..cac4261ea7 100644 --- a/modules/openapi-generator-gradle-plugin/build.gradle +++ b/modules/openapi-generator-gradle-plugin/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.2.60' + ext.kotlin_version = '1.2.61' repositories { mavenCentral() maven { @@ -11,14 +11,13 @@ buildscript { maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } - maven { - url "https://plugins.gradle.org/m2/" - } } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "gradle.plugin.org.gradle.kotlin:gradle-kotlin-dsl-plugins:1.0-rc-3" classpath "com.gradle.publish:plugin-publish-plugin:0.10.1" + classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.20.0" + classpath "de.marcphilipp.gradle:nexus-publish-plugin:0.2.0" } } @@ -35,10 +34,11 @@ ext.isReleaseVersion = !version.endsWith("SNAPSHOT") apply plugin: 'com.gradle.plugin-publish' apply plugin: 'java-gradle-plugin' -apply plugin: 'maven' apply plugin: 'signing' apply plugin: 'kotlin' apply plugin: "org.gradle.kotlin.kotlin-dsl" +apply plugin: 'io.codearte.nexus-staging' +apply plugin: "de.marcphilipp.nexus-publish" sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -87,6 +87,72 @@ test { } } +task javadocJar(type: Jar) { + from javadoc + classifier = 'javadoc' +} + +task sourcesJar(type: Jar) { + from sourceSets.main.allSource + classifier = 'sources' +} + +artifacts { + archives javadocJar, sourcesJar +} + +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + artifact sourcesJar + artifact javadocJar + pom { + name = 'OpenAPI-Generator Contributors' + description = project.description + url = 'https://openapi-generator.tech' + organization { + name = 'org.openapitools' + url = 'https://github.com/OpenAPITools' + } + licenses { + license { + name = "The Apache Software License, Version 2.0" + url = "http://www.apache.org/licenses/LICENSE-2.0.txt" + distribution = "repo" + } + } + developers { + developer { + id = "openapitools" + name = "OpenAPI-Generator Contributors" + email = "team@openapitools.org" + } + } + scm { + url = 'https://github.com/OpenAPITools/openapi-generator' + connection = 'scm:git:git://github.com/OpenAPITools/openapi-generator.git' + developerConnection = 'scm:git:ssh://git@github.com:OpenAPITools/openapi-generator.git' + } + issueManagement { + system = 'GitHub' + url = 'https://github.com/OpenAPITools/openapi-generator/issues' + } + } + } + } +} + +nexusStaging { + username = project.properties["ossrhUsername"] + password = project.properties["ossrhPassword"] +} + +nexusPublishing { + // To retrieve: ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="$SIGNING_SECRET" getStagingProfile --no-daemon + stagingProfileId = "456297f829bbbe" +} + gradlePlugin { plugins { openApiGenerator { @@ -109,6 +175,7 @@ pluginBundle { displayName = 'OpenAPI Generator Gradle Plugin' tags = ['openapi-3.0', 'openapi-2.0', 'openapi', 'swagger', 'codegen', 'sdk'] version = "$openApiGeneratorVersion" + group = "org.openapitools" } } } @@ -119,79 +186,8 @@ pluginBundle { // or stored as key=value pairs in ~/.gradle/gradle.properties // You can also apply them in CI via environment variables. See Gradle's docs for details. signing { - required { isReleaseVersion && gradle.taskGraph.hasTask("uploadArchives") } - sign configurations.archives -} - -task javadocJar(type: Jar) { - classifier = 'javadoc' - from javadoc -} - -task sourcesJar(type: Jar) { - from sourceSets.main.allSource - classifier = 'sources' -} - -artifacts { - archives javadocJar, sourcesJar -} - -def pomConfig = { - description project.description - name 'OpenAPI-Generator Contributors' - url 'https://openapi-generator.tech' - organization { - name 'org.openapitools' - url 'https://github.com/OpenAPITools' - } - licenses { - license { - name "The Apache Software License, Version 2.0" - url "http://www.apache.org/licenses/LICENSE-2.0.txt" - distribution "repo" - } - } - developers { - developer { - id "openapitools" - name "OpenAPI-Generator Contributors" - email "team@openapitools.org" - } - } - scm { - url 'https://github.com/OpenAPITools/openapi-generator' - connection 'scm:git:git://github.com/OpenAPITools/openapi-generator.git' - developerConnection 'scm:git:ssh://git@github.com:OpenAPITools/openapi-generator.git' - } - issueManagement { - system 'GitHub' - url 'https://github.com/OpenAPITools/openapi-generator/issues' - } -} - -uploadArchives { - repositories { - - // credentials here would need to be passed along with the gradle command: - // ./gradlew -P ossrhUsername=yourUser - // or stored in ~/.gradle/gradle.properties as key=value pairs - mavenDeployer { - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { - authentication(userName: ossrhUsername, password: ossrhPassword) - } - snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") { - authentication(userName: ossrhUsername, password: ossrhPassword) - } - - pom.withXml { - def root = asNode() - root.appendNode('description', project.description) - root.children().last() + pomConfig - } - } - } + required { isReleaseVersion && (gradle.taskGraph.hasTask("publishPluginMavenPublicationToNexusRepository") ) } + sign publishing.publications.mavenJava } compileKotlin { @@ -205,4 +201,19 @@ compileTestKotlin { } } -uploadArchives.dependsOn 'check' +javadoc { + if(JavaVersion.current().isJava9Compatible()) { + options.addBooleanOption('html5', true) + } +} + +tasks { + closeRepository { + onlyIf { nexusPublishing.useStaging.get() } + } + releaseRepository{ + onlyIf { nexusPublishing.useStaging.get() } + } +} + +publishToNexus.dependsOn 'check' diff --git a/modules/openapi-generator-gradle-plugin/gradle.properties b/modules/openapi-generator-gradle-plugin/gradle.properties index b545d45715..9be0797629 100644 --- a/modules/openapi-generator-gradle-plugin/gradle.properties +++ b/modules/openapi-generator-gradle-plugin/gradle.properties @@ -1,4 +1,8 @@ +<<<<<<< HEAD openApiGeneratorVersion=4.1.0-SNAPSHOT +======= +openApiGeneratorVersion=4.0.2-SNAPSHOT +>>>>>>> origin/master # BEGIN placeholders # these are just placeholders to allow contributors to build directly diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml index 6283593068..d08fdb3c19 100644 --- a/modules/openapi-generator-gradle-plugin/pom.xml +++ b/modules/openapi-generator-gradle-plugin/pom.xml @@ -3,7 +3,11 @@ org.openapitools openapi-generator-project +<<<<<<< HEAD 4.1.0-SNAPSHOT +======= + 4.0.2-SNAPSHOT +>>>>>>> origin/master ../.. 4.0.0 @@ -72,7 +76,7 @@ clean assemble - install + publishToMavenLocal diff --git a/modules/openapi-generator-gradle-plugin/samples/local-spec/README.md b/modules/openapi-generator-gradle-plugin/samples/local-spec/README.md index 41a9877bce..ca68b2306f 100644 --- a/modules/openapi-generator-gradle-plugin/samples/local-spec/README.md +++ b/modules/openapi-generator-gradle-plugin/samples/local-spec/README.md @@ -17,5 +17,5 @@ gradle generateGoWithInvalidSpec The samples can be tested against other versions of the plugin using the `openApiGeneratorVersion` property. For example: ```bash -gradle -PopenApiGeneratorVersion=4.0.0 openApiValidate +gradle -PopenApiGeneratorVersion=4.0.1 openApiValidate ``` diff --git a/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties b/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties index f291e11317..11f18bc06e 100644 --- a/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties +++ b/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties @@ -1 +1 @@ -openApiGeneratorVersion=4.0.0 +openApiGeneratorVersion=4.0.1 diff --git a/modules/openapi-generator-gradle-plugin/settings.gradle b/modules/openapi-generator-gradle-plugin/settings.gradle index 563879e5d5..dfb2ecf250 100644 --- a/modules/openapi-generator-gradle-plugin/settings.gradle +++ b/modules/openapi-generator-gradle-plugin/settings.gradle @@ -1,2 +1,3 @@ rootProject.name = 'openapi-generator-gradle-plugin' +enableFeaturePreview('STABLE_PUBLISHING') diff --git a/modules/openapi-generator-maven-plugin/README.md b/modules/openapi-generator-maven-plugin/README.md index 27fe12c478..bcf211db7d 100644 --- a/modules/openapi-generator-maven-plugin/README.md +++ b/modules/openapi-generator-maven-plugin/README.md @@ -11,7 +11,7 @@ Add to your `build->plugins` section (default phase is `generate-sources` phase) org.openapitools openapi-generator-maven-plugin - 4.0.0 + 4.0.1 @@ -39,50 +39,56 @@ mvn clean compile :bulb: These **general** configurations should be in the same level -- `inputSpec` - OpenAPI Spec file path -- `language` - target generation language (deprecated, replaced by `generatorName` as values here don't represent only 'language' any longer) -- `generatorName` - target generator name -- `output` - target output path (default is `${project.build.directory}/generated-sources/openapi`. Can also be set globally through the `openapi.generator.maven.plugin.output` property) -- `templateDirectory` - directory with mustache templates -- `addCompileSourceRoot` - add the output directory to the project as a source root (`true` by default) -- `modelPackage` - the package to use for generated model objects/classes -- `apiPackage` - the package to use for generated api objects/classes -- `invokerPackage` - the package to use for the generated invoker objects -- `modelNamePrefix` and `modelNameSuffix` - Sets the pre- or suffix for model classes and enums -- `withXml` - enable XML annotations inside the generated models and API (only works with Java `language` and libraries that provide support for JSON and XML) -- `configOptions` - a map of language-specific parameters. To show a full list of generator-specified parameters (options), please use `configHelp` (explained below) -- `configHelp` - dumps the configuration help for the specified library (generates no sources) -- `ignoreFileOverride` - specifies the full path to a `.openapi-generator-ignore` used for pattern based overrides of generated outputs -- `removeOperationIdPrefix` - remove operationId prefix (e.g. user_getName => getName) -- `logToStderr` - write all log messages (not just errors) to STDOUT -- `enablePostProcessFile` - enable file post-processing hook -- `skipValidateSpec` - Whether or not to skip validating the input spec prior to generation. By default, invalid specifications will result in an error. -- `strictSpec` - Whether or not to treat an input document strictly against the spec. 'MUST' and 'SHALL' wording in OpenAPI spec is strictly adhered to. e.g. when false, no fixes will be applied to documents which pass validation but don't follow the spec. -- `generateAliasAsModel` - generate alias (array, map) as model -- `generateApis` - generate the apis (`true` by default) -- `generateApiTests` - generate the api tests (`true` by default. Only available if `generateApis` is `true`) -- `generateApiDocumentation` - generate the api documentation (`true` by default. Only available if `generateApis` is `true`) -- `generateModels` - generate the models (`true` by default) -- `modelsToGenerate` - A comma separated list of models to generate. All models is the default. -- `generateModelTests` - generate the model tests (`true` by default. Only available if `generateModels` is `true`) -- `generateModelDocumentation` - generate the model documentation (`true` by default. Only available if `generateModels` is `true`) -- `generateSupportingFiles` - generate the supporting files (`true` by default) -- `supportingFilesToGenerate` - A comma separated list of supporting files to generate. All files is the default. -- `skip` - skip code generation (`false` by default. Can also be set globally through the `codegen.skip` property) -- `verbose` - verbose mode (`false` by default) -- `groupId`, `artifactId` and `artifactVersion` - sets project information in generated pom.xml/build.gradle or other build script. Language-specific conversions occur in non-jvm generators -- `gitUserId` and `gitRepoId` - sets git information of the project -- `auth` - adds authorization headers when fetching the OpenAPI definitions remotely. Pass in a URL-encoded string of `name:header` with a comma separating multiple values -- `configurationFile` - Path to separate json configuration file. File content should be in a json format {"optionKey":"optionValue", "optionKey1":"optionValue1"...} Supported options can be different for each language. Run `config-help -g {generator name}` command for language specific config options -- `skipOverwrite` - Specifies if the existing files should be overwritten during the generation. (`false` by default) -- `library` - library template (sub-template) -- `instantiationTypes` - sets instantiation type mappings in the format of type=instantiatedType,type=instantiatedType. For example (in Java): `array=ArrayList,map=HashMap`. In other words array types will get instantiated as ArrayList in generated code. You can also have multiple occurrences of this option -- `importMappings` - specifies mappings between a given class and the import that should be used for that class in the format of type=import,type=import. You can also have multiple occurrences of this option -- `typeMappings` - sets mappings between OpenAPI spec types and generated code types in the format of OpenAPIType=generatedType,OpenAPIType=generatedType. For example: `array=List,map=Map,string=String`. You can also have multiple occurrences of this option -- `languageSpecificPrimitives` - specifies additional language specific primitive types in the format of type1,type2,type3,type3. For example: `String,boolean,Boolean,Double`. You can also have multiple occurrences of this option -- `additionalProperties` - sets additional properties that can be referenced by the mustache templates in the format of name=value,name=value. You can also have multiple occurrences of this option -- `reservedWordsMappings` - specifies how a reserved name should be escaped to. Otherwise, the default `_` is used. For example `id=identifier`. You can also have multiple occurrences of this option -- `skipIfSpecIsUnchanged` - Skip the execution if the source file is older than the output folder (`false` by default. Can also be set globally through the `codegen.skipIfSpecIsUnchanged` property) +| Option | Property | Description | +|--------|----------|-------------| +| `inputSpec` | `openapi.generator.maven.plugin.inputSpec` | OpenAPI Spec file path +| `language` | `openapi.generator.maven.plugin.language` | target generation language (deprecated, replaced by `generatorName` as values here don't represent only 'language' any longer) +| `generatorName` | `openapi.generator.maven.plugin.generatorName` | target generator name +| `output` | `openapi.generator.maven.plugin.output` | target output path (default is `${project.build.directory}/generated-sources/openapi`. Can also be set globally through the `openapi.generator.maven.plugin.output` property) +| `templateDirectory` | `openapi.generator.maven.plugin.templateDirectory` | directory with mustache templates +| `addCompileSourceRoot` | `openapi.generator.maven.plugin.addCompileSourceRoot` | add the output directory to the project as a source root (`true` by default) +| `modelPackage` | `openapi.generator.maven.plugin.modelPackage` | the package to use for generated model objects/classes +| `apiPackage` | `openapi.generator.maven.plugin.apiPackage` | the package to use for generated api objects/classes +| `invokerPackage` | `openapi.generator.maven.plugin.invokerPackage` | the package to use for the generated invoker objects +| `modelNamePrefix` | `openapi.generator.maven.plugin.modelNamePrefix` | Sets the prefix for model classes and enums +| `modelNameSuffix` | `openapi.generator.maven.plugin.modelNameSuffix` | Sets the suffix for model classes and enums +| `withXml` | `openapi.generator.maven.plugin.withXml` | enable XML annotations inside the generated models and API (only works with Java `language` and libraries that provide support for JSON and XML) +| `configOptions` | N/A | a map of language-specific parameters. To show a full list of generator-specified parameters (options), please use `configHelp` (explained below) +| `configHelp` | `codegen.configHelp` | dumps the configuration help for the specified library (generates no sources) +| `ignoreFileOverride` | `openapi.generator.maven.plugin.ignoreFileOverride` | specifies the full path to a `.openapi-generator-ignore` used for pattern based overrides of generated outputs +| `removeOperationIdPrefix` | `openapi.generator.maven.plugin.removeOperationIdPrefix` | remove operationId prefix (e.g. user_getName => getName) +| `logToStderr` | `openapi.generator.maven.plugin.logToStderr` | write all log messages (not just errors) to STDOUT +| `enablePostProcessFile` | `openapi.generator.maven.plugin.` | enable file post-processing hook +| `skipValidateSpec` | `openapi.generator.maven.plugin.skipValidateSpec` | Whether or not to skip validating the input spec prior to generation. By default, invalid specifications will result in an error. +| `strictSpec` | `openapi.generator.maven.plugin.strictSpec` | Whether or not to treat an input document strictly against the spec. 'MUST' and 'SHALL' wording in OpenAPI spec is strictly adhered to. e.g. when false, no fixes will be applied to documents which pass validation but don't follow the spec. +| `generateAliasAsModel` | `openapi.generator.maven.plugin.generateAliasAsModel` | generate alias (array, map) as model +| `generateApis` | `openapi.generator.maven.plugin.generateApis` | generate the apis (`true` by default) +| `generateApiTests` | `openapi.generator.maven.plugin.generateApiTests` | generate the api tests (`true` by default. Only available if `generateApis` is `true`) +| `generateApiDocumentation` | `openapi.generator.maven.plugin.generateApiDocumentation` | generate the api documentation (`true` by default. Only available if `generateApis` is `true`) +| `generateModels` | `openapi.generator.maven.plugin.generateModels` | generate the models (`true` by default) +| `modelsToGenerate` | `openapi.generator.maven.plugin.modelsToGenerate` | A comma separated list of models to generate. All models is the default. +| `generateModelTests` | `openapi.generator.maven.plugin.generateModelTests` | generate the model tests (`true` by default. Only available if `generateModels` is `true`) +| `generateModelDocumentation` | `openapi.generator.maven.plugin.generateModelDocumentation` | generate the model documentation (`true` by default. Only available if `generateModels` is `true`) +| `generateSupportingFiles` | `openapi.generator.maven.plugin.generateSupportingFiles` | generate the supporting files (`true` by default) +| `supportingFilesToGenerate` | `openapi.generator.maven.plugin.supportingFilesToGenerate` | A comma separated list of supporting files to generate. All files is the default. +| `skip` | `codegen.skip` | skip code generation (`false` by default. Can also be set globally through the `codegen.skip` property) +| `verbose` | `openapi.generator.maven.plugin.verbose` | verbose mode (`false` by default) +| `groupId` | `openapi.generator.maven.plugin.groupId` | sets project information in generated pom.xml/build.gradle or other build script. Language-specific conversions occur in non-jvm generators +| `artifactId` | `openapi.generator.maven.plugin.artifactId` | sets project information in generated pom.xml/build.gradle or other build script. Language-specific conversions occur in non-jvm generators +| `artifactVersion` | `openapi.generator.maven.plugin.artifactVersion` | sets project information in generated pom.xml/build.gradle or other build script. Language-specific conversions occur in non-jvm generators +| `gitUserId` and `gitRepoId` | `openapi.generator.maven.plugin.gitUserId` | sets git information of the project +| `auth` | `openapi.generator.maven.plugin.auth` | adds authorization headers when fetching the OpenAPI definitions remotely. Pass in a URL-encoded string of `name:header` with a comma separating multiple values +| `configurationFile` | `openapi.generator.maven.plugin.configurationFile` | Path to separate json configuration file. File content should be in a json format {"optionKey":"optionValue", "optionKey1":"optionValue1"...} Supported options can be different for each language. Run `config-help -g {generator name}` command for language specific config options +| `skipOverwrite` | `openapi.generator.maven.plugin.skipOverwrite` | Specifies if the existing files should be overwritten during the generation. (`false` by default) +| `library` | `openapi.generator.maven.plugin.library` | library template (sub-template) +| `instantiationTypes` | `openapi.generator.maven.plugin.instantiationTypes` | sets instantiation type mappings in the format of type=instantiatedType,type=instantiatedType. For example (in Java): `array=ArrayList,map=HashMap`. In other words array types will get instantiated as ArrayList in generated code. You can also have multiple occurrences of this option +| `importMappings` | `openapi.generator.maven.plugin.importMappings` | specifies mappings between a given class and the import that should be used for that class in the format of type=import,type=import. You can also have multiple occurrences of this option +| `typeMappings` | `openapi.generator.maven.plugin.typeMappings` | sets mappings between OpenAPI spec types and generated code types in the format of OpenAPIType=generatedType,OpenAPIType=generatedType. For example: `array=List,map=Map,string=String`. You can also have multiple occurrences of this option +| `languageSpecificPrimitives` | `openapi.generator.maven.plugin.languageSpecificPrimitives` | specifies additional language specific primitive types in the format of type1,type2,type3,type3. For example: `String,boolean,Boolean,Double`. You can also have multiple occurrences of this option +| `additionalProperties` | `openapi.generator.maven.plugin.additionalProperties` | sets additional properties that can be referenced by the mustache templates in the format of name=value,name=value. You can also have multiple occurrences of this option +| `reservedWordsMappings` | `openapi.generator.maven.plugin.reservedWordsMappings` | specifies how a reserved name should be escaped to. Otherwise, the default `_` is used. For example `id=identifier`. You can also have multiple occurrences of this option +| `skipIfSpecIsUnchanged` | `codegen.skipIfSpecIsUnchanged` | Skip the execution if the source file is older than the output folder (`false` by default. Can also be set globally through the `codegen.skipIfSpecIsUnchanged` property) +| `engine` | `openapi.generator.maven.plugin.engine` | The name of templating engine to use, "mustache" (default) or "handlebars" (beta) ### Custom Generator diff --git a/modules/openapi-generator-maven-plugin/examples/java-client.xml b/modules/openapi-generator-maven-plugin/examples/java-client.xml index ce15e7171b..0d6d91acad 100644 --- a/modules/openapi-generator-maven-plugin/examples/java-client.xml +++ b/modules/openapi-generator-maven-plugin/examples/java-client.xml @@ -12,7 +12,7 @@ org.openapitools openapi-generator-maven-plugin - 4.0.0 + 4.0.2-SNAPSHOT @@ -50,6 +50,12 @@ + + + sonatype-snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + diff --git a/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml b/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml index 592d80762d..1b1e28ee07 100644 --- a/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml +++ b/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml @@ -18,7 +18,7 @@ org.openapitools openapi-generator-maven-plugin - 4.0.0 + 4.0.2-SNAPSHOT ${project.groupId} @@ -63,6 +63,12 @@ + + + sonatype-snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + diff --git a/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml b/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml index 1a3df39f0a..06f7f10c73 100644 --- a/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml +++ b/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml @@ -12,7 +12,7 @@ org.openapitools openapi-generator-maven-plugin - 4.0.0 + 4.0.2-SNAPSHOT @@ -31,4 +31,10 @@ + + + sonatype-snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + diff --git a/modules/openapi-generator-maven-plugin/examples/non-java.xml b/modules/openapi-generator-maven-plugin/examples/non-java.xml index d0c9da3e3f..6f8fbec5c4 100644 --- a/modules/openapi-generator-maven-plugin/examples/non-java.xml +++ b/modules/openapi-generator-maven-plugin/examples/non-java.xml @@ -12,7 +12,7 @@ org.openapitools openapi-generator-maven-plugin - 4.0.0 + 4.0.2-SNAPSHOT @@ -30,4 +30,10 @@ + + + sonatype-snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + diff --git a/modules/openapi-generator-maven-plugin/pom.xml b/modules/openapi-generator-maven-plugin/pom.xml index 0ec7803e88..d657464feb 100644 --- a/modules/openapi-generator-maven-plugin/pom.xml +++ b/modules/openapi-generator-maven-plugin/pom.xml @@ -4,7 +4,11 @@ org.openapitools openapi-generator-project +<<<<<<< HEAD 4.1.0-SNAPSHOT +======= + 4.0.2-SNAPSHOT +>>>>>>> origin/master ../.. openapi-generator-maven-plugin diff --git a/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java b/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java index 791c830141..7ac66dc4da 100644 --- a/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java +++ b/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java @@ -105,146 +105,152 @@ public class CodeGenMojo extends AbstractMojo { /** * Location of the OpenAPI spec, as URL or file. */ - @Parameter(name = "inputSpec", required = true) + @Parameter(name = "inputSpec", property = "openapi.generator.maven.plugin.inputSpec", required = true) private String inputSpec; /** * Git user ID, e.g. swagger-api. */ - @Parameter(name = "gitUserId", required = false) + @Parameter(name = "gitUserId", property = "openapi.generator.maven.plugin.gitUserId", required = false) private String gitUserId; /** * Git repo ID, e.g. openapi-generator. */ - @Parameter(name = "gitRepoId", required = false) + @Parameter(name = "gitRepoId", property = "openapi.generator.maven.plugin.gitRepoId", required = false) private String gitRepoId; /** * Folder containing the template files. */ - @Parameter(name = "templateDirectory") + @Parameter(name = "templateDirectory", property = "openapi.generator.maven.plugin.templateDirectory") private File templateDirectory; + /** + * The name of templating engine to use, "mustache" (default) or "handlebars" (beta) + */ + @Parameter(name = "engine", defaultValue = "mustache", property="openapi.generator.maven.plugin.engine") + private String engine; + /** * Adds authorization headers when fetching the swagger definitions remotely. " Pass in a * URL-encoded string of name:header with a comma separating multiple values */ - @Parameter(name = "auth") + @Parameter(name = "auth", property = "openapi.generator.maven.plugin.auth") private String auth; /** * Path to separate json configuration file. */ - @Parameter(name = "configurationFile", required = false) + @Parameter(name = "configurationFile", property = "openapi.generator.maven.plugin.configurationFile", required = false) private String configurationFile; /** * Specifies if the existing files should be overwritten during the generation. */ - @Parameter(name = "skipOverwrite", required = false) + @Parameter(name = "skipOverwrite", property = "openapi.generator.maven.plugin.skipOverwrite", required = false) private Boolean skipOverwrite; /** * The package to use for generated api objects/classes */ - @Parameter(name = "apiPackage") + @Parameter(name = "apiPackage", property = "openapi.generator.maven.plugin.apiPackage") private String apiPackage; /** * The package to use for generated model objects/classes */ - @Parameter(name = "modelPackage") + @Parameter(name = "modelPackage", property = "openapi.generator.maven.plugin.modelPackage") private String modelPackage; /** * The package to use for the generated invoker objects */ - @Parameter(name = "invokerPackage") + @Parameter(name = "invokerPackage", property = "openapi.generator.maven.plugin.invokerPackage") private String invokerPackage; /** * The default package to use for the generated objects */ - @Parameter(name = "packageName") + @Parameter(name = "packageName", property = "openapi.generator.maven.plugin.packageName") private String packageName; /** * groupId in generated pom.xml */ - @Parameter(name = "groupId") + @Parameter(name = "groupId", property = "openapi.generator.maven.plugin.groupId") private String groupId; /** * artifactId in generated pom.xml */ - @Parameter(name = "artifactId") + @Parameter(name = "artifactId", property = "openapi.generator.maven.plugin.artifactId") private String artifactId; /** * artifact version in generated pom.xml */ - @Parameter(name = "artifactVersion") + @Parameter(name = "artifactVersion", property = "openapi.generator.maven.plugin.artifactVersion") private String artifactVersion; /** * Sets the library */ - @Parameter(name = "library", required = false) + @Parameter(name = "library", property = "openapi.generator.maven.plugin.library", required = false) private String library; /** * Sets the prefix for model enums and classes */ - @Parameter(name = "modelNamePrefix", required = false) + @Parameter(name = "modelNamePrefix", property = "openapi.generator.maven.plugin.modelNamePrefix", required = false) private String modelNamePrefix; /** * Sets the suffix for model enums and classes */ - @Parameter(name = "modelNameSuffix", required = false) + @Parameter(name = "modelNameSuffix", property = "openapi.generator.maven.plugin.modelNameSuffix", required = false) private String modelNameSuffix; /** * Sets an optional ignoreFileOverride path */ - @Parameter(name = "ignoreFileOverride", required = false) + @Parameter(name = "ignoreFileOverride", property = "openapi.generator.maven.plugin.ignoreFileOverride", required = false) private String ignoreFileOverride; /** * To remove operationId prefix (e.g. user_getName => getName) */ - @Parameter(name = "removeOperationIdPrefix", required = false) + @Parameter(name = "removeOperationIdPrefix", property = "openapi.generator.maven.plugin.removeOperationIdPrefix", required = false) private Boolean removeOperationIdPrefix; /** * To write all log messages (not just errors) to STDOUT */ - @Parameter(name = "logToStderr", required = false) + @Parameter(name = "logToStderr", property = "openapi.generator.maven.plugin.logToStderr", required = false) private Boolean logToStderr; /** * To file post-processing hook */ - @Parameter(name = "enablePostProcessFile", required = false) + @Parameter(name = "enablePostProcessFile", property = "openapi.generator.maven.plugin.enablePostProcessFile", required = false) private Boolean enablePostProcessFile; /** * To skip spec validation */ - @Parameter(name = "skipValidateSpec", required = false) + @Parameter(name = "skipValidateSpec", property = "openapi.generator.maven.plugin.skipValidateSpec", required = false) private Boolean skipValidateSpec; /** * To treat a document strictly against the spec. */ - @Parameter(name = "strictSpec", required = false) + @Parameter(name = "strictSpec", property = "openapi.generator.maven.plugin.strictSpec", required = false) private Boolean strictSpecBehavior; /** * To generate alias (array, map) as model */ - @Parameter(name = "generateAliasAsModel", required = false) + @Parameter(name = "generateAliasAsModel", property = "openapi.generator.maven.plugin.generateAliasAsModel", required = false) private Boolean generateAliasAsModel; /** @@ -256,97 +262,97 @@ public class CodeGenMojo extends AbstractMojo { /** * A map of types and the types they should be instantiated as */ - @Parameter(name = "instantiationTypes") + @Parameter(name = "instantiationTypes", property = "openapi.generator.maven.plugin.instantiationTypes") private List instantiationTypes; /** * A map of classes and the import that should be used for that class */ - @Parameter(name = "importMappings") + @Parameter(name = "importMappings", property = "openapi.generator.maven.plugin.importMappings") private List importMappings; /** * A map of swagger spec types and the generated code types to use for them */ - @Parameter(name = "typeMappings") + @Parameter(name = "typeMappings", property = "openapi.generator.maven.plugin.typeMappings") private List typeMappings; /** * A map of additional language specific primitive types */ - @Parameter(name = "languageSpecificPrimitives") + @Parameter(name = "languageSpecificPrimitives", property = "openapi.generator.maven.plugin.languageSpecificPrimitives") private List languageSpecificPrimitives; /** * A map of additional properties that can be referenced by the mustache templates */ - @Parameter(name = "additionalProperties") + @Parameter(name = "additionalProperties", property = "openapi.generator.maven.plugin.additionalProperties") private List additionalProperties; /** * A map of reserved names and how they should be escaped */ - @Parameter(name = "reservedWordsMappings") + @Parameter(name = "reservedWordsMappings", property = "openapi.generator.maven.plugin.reservedWordMappings") private List reservedWordsMappings; /** * Generate the apis */ - @Parameter(name = "generateApis", required = false) + @Parameter(name = "generateApis", property = "openapi.generator.maven.plugin.generateApis", required = false) private Boolean generateApis = true; /** * Generate the models */ - @Parameter(name = "generateModels", required = false) + @Parameter(name = "generateModels", property = "openapi.generator.maven.plugin.generateModels", required = false) private Boolean generateModels = true; /** * A comma separated list of models to generate. All models is the default. */ - @Parameter(name = "modelsToGenerate", required = false) + @Parameter(name = "modelsToGenerate", property = "openapi.generator.maven.plugin.modelsToGenerate", required = false) private String modelsToGenerate = ""; /** * Generate the supporting files */ - @Parameter(name = "generateSupportingFiles", required = false) + @Parameter(name = "generateSupportingFiles", property = "openapi.generator.maven.plugin.generateSupportingFiles", required = false) private Boolean generateSupportingFiles = true; /** * A comma separated list of models to generate. All models is the default. */ - @Parameter(name = "supportingFilesToGenerate", required = false) + @Parameter(name = "supportingFilesToGenerate", property = "openapi.generator.maven.plugin.supportingFilesToGenerate", required = false) private String supportingFilesToGenerate = ""; /** * Generate the model tests */ - @Parameter(name = "generateModelTests", required = false) + @Parameter(name = "generateModelTests", property = "openapi.generator.maven.plugin.generateModelTests", required = false) private Boolean generateModelTests = true; /** * Generate the model documentation */ - @Parameter(name = "generateModelDocumentation", required = false) + @Parameter(name = "generateModelDocumentation", property = "openapi.generator.maven.plugin.generateModelDocumentation", required = false) private Boolean generateModelDocumentation = true; /** * Generate the api tests */ - @Parameter(name = "generateApiTests", required = false) + @Parameter(name = "generateApiTests", property = "openapi.generator.maven.plugin.generateApiTests", required = false) private Boolean generateApiTests = true; /** * Generate the api documentation */ - @Parameter(name = "generateApiDocumentation", required = false) + @Parameter(name = "generateApiDocumentation", property = "openapi.generator.maven.plugin.generateApiDocumentation", required = false) private Boolean generateApiDocumentation = true; /** * Generate the api documentation */ - @Parameter(name = "withXml", required = false) + @Parameter(name = "withXml", property = "openapi.generator.maven.plugin.withXml", required = false) private Boolean withXml = false; /** @@ -374,7 +380,7 @@ public class CodeGenMojo extends AbstractMojo { @Parameter protected Map originalEnvironmentVariables = new HashMap(); - @Parameter + @Parameter(property = "codegen.configHelp") private boolean configHelp = false; /** @@ -550,6 +556,10 @@ public class CodeGenMojo extends AbstractMojo { configurator.setTemplateDir(templateDirectory.getAbsolutePath()); } + if (null != engine) { + configurator.setTemplatingEngineName(engine); + } + // Set generation options if (null != generateApis && generateApis) { GeneratorProperties.setProperty(CodegenConstants.APIS, ""); diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml index 79e1ccfa07..ea14a7fea0 100644 --- a/modules/openapi-generator-online/pom.xml +++ b/modules/openapi-generator-online/pom.xml @@ -3,7 +3,11 @@ org.openapitools openapi-generator-project +<<<<<<< HEAD 4.1.0-SNAPSHOT +======= + 4.0.2-SNAPSHOT +>>>>>>> origin/master ../.. openapi-generator-online diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml index 53fc6efe31..fe92a91688 100644 --- a/modules/openapi-generator/pom.xml +++ b/modules/openapi-generator/pom.xml @@ -3,7 +3,11 @@ org.openapitools openapi-generator-project +<<<<<<< HEAD 4.1.0-SNAPSHOT +======= + 4.0.2-SNAPSHOT +>>>>>>> origin/master ../.. 4.0.0 @@ -313,7 +317,11 @@ org.openapitools openapi-generator-core +<<<<<<< HEAD 4.1.0-SNAPSHOT +======= + 4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java index 75fcb1cba6..61134701d5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java @@ -232,6 +232,8 @@ public class CodegenConstants { public static final String PARCELIZE_MODELS = "parcelizeModels"; public static final String PARCELIZE_MODELS_DESC = "toggle \"@Parcelize\" for generated models"; + public static final String CASE_INSENSITIVE_RESPONSE_HEADERS = "caseInsensitiveResponseHeaders"; + public static final String CASE_INSENSITIVE_RESPONSE_HEADERS_DESC = "Make API response's headers case-insensitive"; // Not user-configurable. System provided for use in templates. diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java index 5879ff1a93..5963b8791b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java @@ -33,7 +33,7 @@ public class CodegenParameter { public String example; // example value (x-example) public String jsonSchema; public boolean isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isByteArray, isBinary, - isBoolean, isDate, isDateTime, isUuid, isEmail, isFreeFormObject; + isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject; public boolean isListContainer, isMapContainer; public boolean isFile; public boolean isEnum; @@ -168,6 +168,7 @@ public class CodegenParameter { output.isDate = this.isDate; output.isDateTime = this.isDateTime; output.isUuid = this.isUuid; + output.isUri = this.isUri; output.isEmail = this.isEmail; output.isFreeFormObject = this.isFreeFormObject; output.isListContainer = this.isListContainer; @@ -222,6 +223,7 @@ public class CodegenParameter { Objects.equals(isDate, that.isDate) && Objects.equals(isDateTime, that.isDateTime) && Objects.equals(isUuid, that.isUuid) && + Objects.equals(isUri, that.isUri) && Objects.equals(isEmail, that.isEmail) && Objects.equals(isFreeFormObject, that.isFreeFormObject) && Objects.equals(isListContainer, that.isListContainer) && @@ -289,6 +291,7 @@ public class CodegenParameter { isDate, isDateTime, isUuid, + isUri, isEmail, isFreeFormObject, isListContainer, @@ -357,6 +360,7 @@ public class CodegenParameter { ", isDate=" + isDate + ", isDateTime=" + isDateTime + ", isUuid=" + isUuid + + ", isUri=" + isUri + ", isEmail=" + isEmail + ", isFreeFormObject=" + isFreeFormObject + ", isListContainer=" + isListContainer + diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java index 64aaa3ab26..137e259692 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java @@ -55,7 +55,7 @@ public class CodegenProperty implements Cloneable { public boolean hasMoreNonReadOnly; // for model constructor, true if next property is not readonly public boolean isPrimitiveType, isModel, isContainer; public boolean isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isByteArray, isBinary, isFile, - isBoolean, isDate, isDateTime, isUuid, isEmail, isFreeFormObject; + isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject; public boolean isListContainer, isMapContainer; public boolean isEnum; public boolean isReadOnly; @@ -472,6 +472,7 @@ public class CodegenProperty implements Cloneable { isDate, isDateTime, isUuid, + isUri, isEmail, isFreeFormObject, isMapContainer, @@ -552,6 +553,7 @@ public class CodegenProperty implements Cloneable { Objects.equals(isDate, other.isDate) && Objects.equals(isDateTime, other.isDateTime) && Objects.equals(isUuid, other.isUuid) && + Objects.equals(isUri, other.isUri) && Objects.equals(isEmail, other.isEmail) && Objects.equals(isFreeFormObject, other.isFreeFormObject) && Objects.equals(isBinary, other.isBinary) && @@ -649,6 +651,7 @@ public class CodegenProperty implements Cloneable { ", isDate=" + isDate + ", isDateTime=" + isDateTime + ", isUuid=" + isUuid + + ", isUri=" + isUri + ", isEmail=" + isEmail + ", isFreeFormObject=" + isFreeFormObject + ", isListContainer=" + isListContainer + diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 7c928dee6c..96cc499810 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -1015,6 +1015,7 @@ public class DefaultCodegen implements CodegenConfig { typeMapping.put("binary", "File"); typeMapping.put("file", "File"); typeMapping.put("UUID", "UUID"); + typeMapping.put("URI", "URI"); //typeMapping.put("BigDecimal", "BigDecimal"); //TODO need the mapping? @@ -1025,6 +1026,7 @@ public class DefaultCodegen implements CodegenConfig { importMapping = new HashMap(); importMapping.put("BigDecimal", "java.math.BigDecimal"); importMapping.put("UUID", "java.util.UUID"); + importMapping.put("URI", "java.net.URI"); importMapping.put("File", "java.io.File"); importMapping.put("Date", "java.util.Date"); importMapping.put("Timestamp", "java.sql.Timestamp"); @@ -1233,6 +1235,8 @@ public class DefaultCodegen implements CodegenConfig { codegenParameter.example = "2013-10-20T19:20:30+01:00"; } else if (Boolean.TRUE.equals(codegenParameter.isUuid)) { codegenParameter.example = "38400000-8cf0-11bd-b23e-10b96e4ef00d"; + } else if (Boolean.TRUE.equals(codegenParameter.isUri)) { + codegenParameter.example = "https://openapi-generator.tech"; } else if (Boolean.TRUE.equals(codegenParameter.isString)) { codegenParameter.example = codegenParameter.paramName + "_example"; } else if (Boolean.TRUE.equals(codegenParameter.isFreeFormObject)) { @@ -1512,6 +1516,8 @@ public class DefaultCodegen implements CodegenConfig { return "array"; } else if (ModelUtils.isUUIDSchema(schema)) { return "UUID"; + } else if (ModelUtils.isURISchema(schema)) { + return "URI"; } else if (ModelUtils.isStringSchema(schema)) { return "string"; } else if (ModelUtils.isFreeFormObject(schema)) { @@ -2038,6 +2044,9 @@ public class DefaultCodegen implements CodegenConfig { // keep isString to true to make it backward compatible property.isString = true; property.isUuid = true; + } else if (ModelUtils.isURISchema(p)) { + property.isString = true; // for backward compatibility + property.isUri = true; } else if (ModelUtils.isEmailSchema(p)) { property.isString = true; property.isEmail = true; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java index 97f08f9d02..5ce8089d19 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java @@ -277,6 +277,8 @@ public class ExampleGenerator { return mp; } else if (ModelUtils.isUUIDSchema(property)) { return "046b6c7f-0b8a-43b9-b35d-6489e6daee91"; + } else if (ModelUtils.isURISchema(property)) { + return "https://openapi-generator.tech"; } else if (ModelUtils.isStringSchema(property)) { LOGGER.debug("String property"); String defaultValue = (String) property.getDefault(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/XmlExampleGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/XmlExampleGenerator.java index 4072f535d2..961320c404 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/XmlExampleGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/XmlExampleGenerator.java @@ -193,6 +193,8 @@ public class XmlExampleGenerator { return "********"; } else if (ModelUtils.isUUIDSchema(schema)) { return "046b6c7f-0b8a-43b9-b35d-6489e6daee91"; + } else if (ModelUtils.isURISchema(schema)) { + return "https://openapi-generator.tech"; // do these last in case the specific types above are derived from these classes } else if (ModelUtils.isStringSchema(schema)) { return "aeiou"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java index 39bd1ada23..5a7ba74f37 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java @@ -140,6 +140,7 @@ abstract public class AbstractAdaCodegen extends DefaultCodegen implements Codeg typeMapping.put("object", "Swagger.Object"); typeMapping.put("number", "Swagger.Number"); typeMapping.put("UUID", "Swagger.UString"); + typeMapping.put("URI", "Swagger.UString"); typeMapping.put("file", "Swagger.Http_Content_Type"); typeMapping.put("binary", "Swagger.Binary"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java index 63a99ff938..1e7a454007 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java @@ -76,6 +76,8 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co // nullable type protected Set nullableType = new HashSet(); + protected Set valueTypes = new HashSet(); + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractCSharpCodegen.class); public AbstractCSharpCodegen() { @@ -185,11 +187,16 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co typeMapping.put("map", "Dictionary"); typeMapping.put("object", "Object"); typeMapping.put("UUID", "Guid?"); + typeMapping.put("URI", "string"); // nullable type nullableType = new HashSet( Arrays.asList("decimal", "bool", "int", "float", "long", "double", "DateTime", "Guid") ); + // value Types + valueTypes = new HashSet( + Arrays.asList("decimal", "bool", "int", "float", "long", "double") + ); } public void setReturnICollection(boolean returnICollection) { @@ -414,6 +421,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co public Map postProcessAllModels(Map objs) { final Map processed = super.postProcessAllModels(objs); postProcessEnumRefs(processed); + updateValueTypeProperty(processed); return processed; } @@ -454,6 +462,19 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co var.isPrimitiveType = true; } } + for (CodegenProperty var : model.vars) { + if (enumRefs.containsKey(var.dataType)) { + // Handle any enum properties referred to by $ref. + // This is different in C# than most other generators, because enums in C# are compiled to integral types, + // while enums in many other languages are true objects. + CodegenModel refModel = enumRefs.get(var.dataType); + var.allowableValues = refModel.allowableValues; + var.isEnum = true; + + // We do these after updateCodegenPropertyEnum to avoid generalities that don't mesh with C#. + var.isPrimitiveType = true; + } + } // We're looping all models here. if (model.isEnum) { @@ -541,6 +562,23 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co } } + /** + * Update property if it is a C# value type + * + * @param models list of all models + */ + protected void updateValueTypeProperty(Map models) { + for (Map.Entry entry : models.entrySet()) { + String openAPIName = entry.getKey(); + CodegenModel model = ModelUtils.getModelByName(openAPIName, models); + if (model != null) { + for (CodegenProperty var : model.vars) { + var.vendorExtensions.put("isValueType", isValueType(var)); + } + } + } + } + @Override public Map postProcessOperationsWithModels(Map objs, List allModels) { super.postProcessOperationsWithModels(objs, allModels); @@ -1055,6 +1093,17 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co "double".equals(dataType) || "decimal".equals(dataType) || "float".equals(dataType); } + /** + * Return true if the property being passed is a C# value type + * + * @param var property + * @return true if property is a value type + */ + + protected boolean isValueType(CodegenProperty var) { + return (valueTypes.contains(var.dataType) || var.isEnum ) ; + } + @Override public void setParameterExampleValue(CodegenParameter codegenParameter) { @@ -1087,6 +1136,8 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co codegenParameter.example = "2013-10-20T19:20:30+01:00"; } else if (Boolean.TRUE.equals(codegenParameter.isUuid)) { codegenParameter.example = "38400000-8cf0-11bd-b23e-10b96e4ef00d"; + } else if (Boolean.TRUE.equals(codegenParameter.isUri)) { + codegenParameter.example = "https://openapi-generator.tech"; } else if (Boolean.TRUE.equals(codegenParameter.isString)) { codegenParameter.example = codegenParameter.paramName + "_example"; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java index dffc475fb7..65105e467a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java @@ -19,6 +19,8 @@ package org.openapitools.codegen.languages; import com.google.common.collect.ImmutableMap; import com.samskivert.mustache.Mustache; + +import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.media.Schema; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; @@ -26,10 +28,12 @@ import org.openapitools.codegen.CodegenConfig; import org.openapitools.codegen.CodegenProperty; import org.openapitools.codegen.DefaultCodegen; import org.openapitools.codegen.templating.mustache.IndentedLambda; +import org.openapitools.codegen.utils.URLPathUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; +import java.net.URL; import java.util.Arrays; import java.util.Map; @@ -300,4 +304,17 @@ abstract public class AbstractCppCodegen extends DefaultCodegen implements Codeg } } } + + @Override + public void preprocessOpenAPI(OpenAPI openAPI) { + URL url = URLPathUtils.getServerURL(openAPI); + String port = URLPathUtils.getPort(url, ""); + String host = url.getHost(); + if(!port.isEmpty()) { + this.additionalProperties.put("serverPort", port); + } + if(!host.isEmpty()) { + this.additionalProperties.put("serverHost", host); + } + } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java index 357362ce2a..49cf187a13 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java @@ -71,6 +71,7 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co typeMapping.put("boolean", "BOOLEAN"); typeMapping.put("string", "STRING_32"); typeMapping.put("UUID", "UUID"); // + typeMapping.put("URI", "STRING"); // typeMapping.put("date", "DATE"); typeMapping.put("DateTime", "DATE_TIME"); typeMapping.put("date-time", "DATE_TIME"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java index eb8bfdc78c..9d82448ffb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java @@ -171,6 +171,7 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co typeMapping.put("map", "IDictionary"); typeMapping.put("object", "obj"); typeMapping.put("UUID", "Guid"); + typeMapping.put("URI", "string"); // nullable type nullableType = new HashSet( diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java index f6fce0c714..56ea40ef9a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java @@ -98,6 +98,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege typeMapping.put("boolean", "bool"); typeMapping.put("string", "string"); typeMapping.put("UUID", "string"); + typeMapping.put("URI", "string"); typeMapping.put("date", "string"); typeMapping.put("DateTime", "time.Time"); typeMapping.put("password", "string"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java index 9e4ec307c8..7eb5421c16 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java @@ -82,6 +82,7 @@ public abstract class AbstractGraphQLCodegen extends DefaultCodegen implements C typeMapping.put("boolean", "Boolean"); typeMapping.put("string", "String"); typeMapping.put("UUID", "ID"); + typeMapping.put("URI", "String"); typeMapping.put("date", "String"); typeMapping.put("DateTime", "String"); typeMapping.put("password", "String"); @@ -463,4 +464,4 @@ public abstract class AbstractGraphQLCodegen extends DefaultCodegen implements C return camelize(name) + "Input"; } -} \ No newline at end of file +} diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java index 0a26de4049..58d22e5165 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java @@ -44,6 +44,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co protected String apiSuffix = "Api"; protected String sourceFolder = "src/main/kotlin"; + protected String testFolder = "src/test/kotlin"; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; @@ -166,14 +167,14 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co typeMapping.put("ByteArray", "kotlin.ByteArray"); typeMapping.put("number", "java.math.BigDecimal"); typeMapping.put("date-time", "java.time.LocalDateTime"); - typeMapping.put("date", "java.time.LocalDateTime"); + typeMapping.put("date", "java.time.LocalDate"); typeMapping.put("file", "java.io.File"); typeMapping.put("array", "kotlin.Array"); typeMapping.put("list", "kotlin.collections.List"); typeMapping.put("map", "kotlin.collections.Map"); typeMapping.put("object", "kotlin.Any"); typeMapping.put("binary", "kotlin.Array"); - typeMapping.put("Date", "java.time.LocalDateTime"); + typeMapping.put("Date", "java.time.LocalDate"); typeMapping.put("DateTime", "java.time.LocalDateTime"); instantiationTypes.put("array", "kotlin.arrayOf"); @@ -183,6 +184,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co importMapping = new HashMap(); importMapping.put("BigDecimal", "java.math.BigDecimal"); importMapping.put("UUID", "java.util.UUID"); + importMapping.put("URI", "java.net.URI"); importMapping.put("File", "java.io.File"); importMapping.put("Date", "java.util.Date"); importMapping.put("Timestamp", "java.sql.Timestamp"); @@ -208,12 +210,17 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co @Override public String apiDocFileFolder() { - return (outputFolder + "/" + apiDocPath).replace('/', File.separatorChar); + return (outputFolder + File.separator + apiDocPath).replace('/', File.separatorChar); } @Override public String apiFileFolder() { - return outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar); + return (outputFolder + File.separator + sourceFolder + File.separator + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar); + } + + @Override + public String apiTestFileFolder() { + return (outputFolder + File.separator + testFolder + File.separator + apiPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar) ; } @Override @@ -410,6 +417,10 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co this.sourceFolder = sourceFolder; } + public void setTestFolder(String testFolder) { + this.testFolder = testFolder; + } + public Boolean getParcelizeModels() { return parcelizeModels; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java index 3893a63785..214978d8f2 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java @@ -125,6 +125,7 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg typeMapping.put("binary", "string"); typeMapping.put("ByteArray", "string"); typeMapping.put("UUID", "string"); + typeMapping.put("URI", "string"); cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC)); cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC)); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java index 23a62a69b4..f909883602 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java @@ -81,6 +81,7 @@ abstract public class AbstractRubyCodegen extends DefaultCodegen implements Code typeMapping.put("binary", "String"); typeMapping.put("ByteArray", "String"); typeMapping.put("UUID", "String"); + typeMapping.put("URI", "String"); } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java index ab230e20be..9e5e01123d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java @@ -123,6 +123,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp typeMapping.put("File", "any"); typeMapping.put("ByteArray", "string"); typeMapping.put("UUID", "string"); + typeMapping.put("URI", "string"); typeMapping.put("Error", "Error"); cliOptions.add(new CliOption(CodegenConstants.MODEL_PROPERTY_NAMING, CodegenConstants.MODEL_PROPERTY_NAMING_DESC).defaultValue(this.modelPropertyNaming)); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java index 6b252fd00c..b0cebcf66c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java @@ -21,6 +21,7 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; +import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.CliOption; import org.openapitools.codegen.CodegenProperty; import org.openapitools.codegen.SupportingFile; @@ -46,7 +47,7 @@ public class ApexClientCodegen extends AbstractApexCodegen { private String classPrefix = "OAS"; private String apiVersion = "42.0"; private String buildMethod = "sfdx"; - private String namedCredential = classPrefix; + private String namedCredential; private String srcPath = "force-app/main/default/"; private String sfdxConfigPath = "config/"; private HashMap primitiveDefaults = new HashMap(); @@ -93,6 +94,7 @@ public class ApexClientCodegen extends AbstractApexCodegen { typeMapping.put("number", "Double"); typeMapping.put("short", "Integer"); typeMapping.put("UUID", "String"); + typeMapping.put("URI", "String"); // https://developer.salesforce.com/docs/atlas.en-us.apexcode.meta/apexcode/apex_reserved_words.htm setReservedWordsLowerCase( @@ -161,8 +163,10 @@ public class ApexClientCodegen extends AbstractApexCodegen { @Override public void preprocessOpenAPI(OpenAPI openAPI) { - Info info = openAPI.getInfo(); - String calloutLabel = info.getTitle(); + String calloutLabel = openAPI.getInfo().getTitle(); + if (StringUtils.isNotBlank(namedCredential)) { + calloutLabel = namedCredential; + } additionalProperties.put("calloutLabel", calloutLabel); String sanitized = sanitizeName(calloutLabel); additionalProperties.put("calloutName", sanitized); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java index 85d6f7a60d..a2eaa806b2 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java @@ -100,6 +100,7 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen { typeMapping.put("DateTime", "DateTime"); typeMapping.put("date", "DateTime"); typeMapping.put("UUID", "Guid"); + typeMapping.put("URI", "string"); setSupportNullable(Boolean.TRUE); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java index 816405bbe7..94992fd9fc 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java @@ -199,6 +199,7 @@ public class BashClientCodegen extends DefaultCodegen implements CodegenConfig { typeMapping.put("file", "binary"); typeMapping.put("binary", "binary"); typeMapping.put("UUID", "string"); + typeMapping.put("URI", "string"); /** * Additional Properties. These values can be passed to the templates and diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java index 7945971fd4..cf290dc0de 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java @@ -152,6 +152,7 @@ public class CLibcurlClientCodegen extends DefaultCodegen implements CodegenConf typeMapping.put("binary", "binary_t*"); typeMapping.put("ByteArray", "char"); typeMapping.put("UUID", "char"); + typeMapping.put("URI", "char"); typeMapping.put("array", "list"); typeMapping.put("map", "list_t*"); typeMapping.put("date-time", "char"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java index 4b03107e09..8ef2fde34a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java @@ -73,6 +73,9 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen { // use KellermanSoftware.CompareNetObjects for deep recursive object comparision protected boolean useCompareNetObjects = Boolean.FALSE; + // To make API response's headers dictionary case insensitive + protected boolean caseInsensitiveResponseHeaders = Boolean.FALSE; + public CSharpClientCodegen() { super(); supportsInheritance = true; @@ -95,6 +98,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen { typeMapping.put("DateTime", "DateTime"); typeMapping.put("date", "DateTime"); typeMapping.put("UUID", "Guid"); + typeMapping.put("URI", "string"); setSupportNullable(Boolean.TRUE); @@ -198,6 +202,10 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen { CodegenConstants.USE_COMPARE_NET_OBJECTS_DESC, this.useCompareNetObjects); + addSwitch(CodegenConstants.CASE_INSENSITIVE_RESPONSE_HEADERS, + CodegenConstants.CASE_INSENSITIVE_RESPONSE_HEADERS_DESC, + this.caseInsensitiveResponseHeaders); + regexModifiers = new HashMap(); regexModifiers.put('i', "IgnoreCase"); regexModifiers.put('m', "Multiline"); @@ -801,6 +809,10 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen { this.useCompareNetObjects = useCompareNetObjects; } + public void setCaseInsensitiveResponseHeaders(final Boolean caseInsensitiveResponseHeaders) { + this.caseInsensitiveResponseHeaders = caseInsensitiveResponseHeaders; + } + public boolean isNonPublicApi() { return nonPublicApi; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java index 4f38a6ebfa..7a79c06368 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java @@ -100,6 +100,7 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen { typeMapping.put("map", "Dictionary"); typeMapping.put("object", "Object"); typeMapping.put("UUID", "Guid"); + typeMapping.put("URI", "string"); setSupportNullable(Boolean.TRUE); hideGenerationTimestamp = Boolean.TRUE; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java index e7acb2595d..7f8527cec8 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java @@ -93,6 +93,7 @@ public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfi typeMapping.put("date", "inst?"); typeMapping.put("DateTime", "inst?"); typeMapping.put("UUID", "uuid?"); + typeMapping.put("URI", "string?"); // But some type mappings are not really worth/meaningful to check for: typeMapping.put("object", "any?"); // Like, everything is an object. diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java index 01e7cb1950..cf9d78ed5d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java @@ -107,6 +107,7 @@ public class CppPistacheServerCodegen extends AbstractCppCodegen { typeMapping.put("binary", "std::string"); typeMapping.put("number", "double"); typeMapping.put("UUID", "std::string"); + typeMapping.put("URI", "std::string"); typeMapping.put("ByteArray", "std::string"); super.importMapping = new HashMap(); @@ -404,14 +405,7 @@ public class CppPistacheServerCodegen extends AbstractCppCodegen { public String getTypeDeclaration(String str) { return toModelName(str); } - - @Override - public void preprocessOpenAPI(OpenAPI openAPI) { - URL url = URLPathUtils.getServerURL(openAPI); - String port = URLPathUtils.getPort(url, "8080"); - this.additionalProperties.put("serverPort", port); - } - + /** * Specify whether external libraries will be added during the generation * @param value the value to be set diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5AbstractCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5AbstractCodegen.java index bf12fc0d2b..7dcd055d9a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5AbstractCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5AbstractCodegen.java @@ -78,6 +78,7 @@ public class CppQt5AbstractCodegen extends AbstractCppCodegen implements Codegen typeMapping.put("integer", "qint32"); typeMapping.put("long", "qint64"); typeMapping.put("boolean", "bool"); + typeMapping.put("number", "double"); typeMapping.put("array", "QList"); typeMapping.put("map", "QMap"); typeMapping.put("object", PREFIX + "Object"); @@ -88,6 +89,7 @@ public class CppQt5AbstractCodegen extends AbstractCppCodegen implements Codegen // come out of the box and will need to be sorted out (at least imply // modifications on multiple templates) typeMapping.put("UUID", "QString"); + typeMapping.put("URI", "QString"); typeMapping.put("file", "QIODevice"); typeMapping.put("binary", "QIODevice"); importMapping = new HashMap(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java index cafd2ca1c8..393fafc8be 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java @@ -194,13 +194,6 @@ public class CppQt5QHttpEngineServerCodegen extends CppQt5AbstractCodegen implem return result; } - @Override - public void preprocessOpenAPI(OpenAPI openAPI) { - URL url = URLPathUtils.getServerURL(openAPI); - String port = URLPathUtils.getPort(url, "8080"); - this.additionalProperties.put("serverPort", port); - } - @Override public String toApiFilename(String name) { return modelNamePrefix + sanitizeName(camelize(name)) + "ApiHandler"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java index 80bde50c8f..aabac7f7a3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java @@ -146,6 +146,7 @@ public class CppRestSdkClientCodegen extends AbstractCppCodegen { typeMapping.put("binary", "utility::string_t"); typeMapping.put("number", "double"); typeMapping.put("UUID", "utility::string_t"); + typeMapping.put("URI", "utility::string_t"); typeMapping.put("ByteArray", "utility::string_t"); super.importMapping = new HashMap(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java index f9b4a600b6..798639807b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java @@ -89,6 +89,7 @@ public class CppRestbedServerCodegen extends AbstractCppCodegen { typeMapping.put("binary", "restbed::Bytes"); typeMapping.put("number", "double"); typeMapping.put("UUID", "std::string"); + typeMapping.put("URI", "std::string"); typeMapping.put("ByteArray", "std::string"); super.importMapping = new HashMap(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java index f277c32217..f22e668550 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java @@ -102,6 +102,7 @@ public class CppTizenClientCodegen extends AbstractCppCodegen implements Codegen typeMapping.put("DateTime", "std::string"); typeMapping.put("Date", "std::string"); typeMapping.put("UUID", "std::string"); + typeMapping.put("URI", "std::string"); importMapping = new HashMap(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java index 12f91133f0..8d9de1271e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java @@ -49,6 +49,8 @@ public class DartClientCodegen extends DefaultCodegen implements CodegenConfig { protected String sourceFolder = ""; protected String apiDocPath = "docs" + File.separator; protected String modelDocPath = "docs" + File.separator; + protected String apiTestPath = "test" + File.separator; + protected String modelTestPath = "test" + File.separator; public DartClientCodegen() { super(); @@ -66,6 +68,9 @@ public class DartClientCodegen extends DefaultCodegen implements CodegenConfig { modelDocTemplateFiles.put("object_doc.mustache", ".md"); apiDocTemplateFiles.put("api_doc.mustache", ".md"); + modelTestTemplateFiles.put("model_test.mustache", ".dart"); + apiTestTemplateFiles.put("api_test.mustache", ".dart"); + setReservedWordsLowerCase( Arrays.asList( "abstract", "as", "assert", "async", "async*", "await", @@ -110,6 +115,7 @@ public class DartClientCodegen extends DefaultCodegen implements CodegenConfig { typeMapping.put("File", "MultipartFile"); typeMapping.put("binary", "MultipartFile"); typeMapping.put("UUID", "String"); + typeMapping.put("URI", "String"); typeMapping.put("ByteArray", "String"); cliOptions.add(new CliOption(BROWSER_CLIENT, "Is the client browser based")); @@ -214,6 +220,7 @@ public class DartClientCodegen extends DefaultCodegen implements CodegenConfig { supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh")); supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore")); supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); + supportingFiles.add(new SupportingFile("travis.mustache", "", ".travis.yml")); } @Override @@ -231,6 +238,16 @@ public class DartClientCodegen extends DefaultCodegen implements CodegenConfig { return outputFolder + File.separator + sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar); } + @Override + public String apiTestFileFolder() { + return outputFolder + File.separator + apiTestPath.replace('/', File.separatorChar); + } + + @Override + public String modelTestFileFolder() { + return outputFolder + File.separator + modelTestPath.replace('/', File.separatorChar); + } + @Override public String apiDocFileFolder() { return outputFolder + File.separator + apiDocPath.replace('/', File.separatorChar); @@ -295,6 +312,16 @@ public class DartClientCodegen extends DefaultCodegen implements CodegenConfig { return underscore(toApiName(name)); } + @Override + public String toApiTestFilename(String name) { + return toApiFilename(name) + "_test"; + } + + @Override + public String toModelTestFilename(String name) { + return toModelFilename(name) + "_test"; + } + @Override public String toDefaultValue(Schema schema) { if (ModelUtils.isMapSchema(schema)) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartJaguarClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartJaguarClientCodegen.java index 6e2507b7a4..5e60619cd9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartJaguarClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartJaguarClientCodegen.java @@ -43,6 +43,7 @@ public class DartJaguarClientCodegen extends DartClientCodegen { static { modelToIgnore.add("datetime"); modelToIgnore.add("map"); + modelToIgnore.add("object"); modelToIgnore.add("list"); modelToIgnore.add("file"); modelToIgnore.add("uint8list"); @@ -86,6 +87,7 @@ public class DartJaguarClientCodegen extends DartClientCodegen { protoTypeMapping.put("file", "bytes"); protoTypeMapping.put("binary", "bytes"); protoTypeMapping.put("UUID", "string"); + protoTypeMapping.put("URI", "string"); protoTypeMapping.put("ByteArray", "bytes"); } @@ -177,6 +179,7 @@ public class DartJaguarClientCodegen extends DartClientCodegen { supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh")); supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore")); supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); + supportingFiles.add(new SupportingFile("travis.mustache", "", ".travis.yml")); final String authFolder = sourceFolder + File.separator + "lib" + File.separator + "auth"; supportingFiles.add(new SupportingFile("auth/api_key_auth.mustache", authFolder, "api_key_auth.dart")); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java index 7f109d01a0..165ec84281 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElixirClientCodegen.java @@ -175,6 +175,7 @@ public class ElixirClientCodegen extends DefaultCodegen implements CodegenConfig typeMapping.put("binary", "String"); typeMapping.put("ByteArray", "String"); typeMapping.put("UUID", "String"); + typeMapping.put("URI", "String"); cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, "The main namespace to use for all classes. e.g. Yay.Pets")); cliOptions.add(new CliOption("licenseHeader", "The license header to prepend to the top of all source files.")); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java index 05642204b1..cc5246dc21 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java @@ -138,6 +138,7 @@ public class ElmClientCodegen extends DefaultCodegen implements CodegenConfig { typeMapping.put("file", "String"); typeMapping.put("binary", "String"); typeMapping.put("UUID", "Uuid"); + typeMapping.put("URI", "String"); importMapping.clear(); @@ -567,44 +568,56 @@ public class ElmClientCodegen extends DefaultCodegen implements CodegenConfig { return "(Just " + value + ")"; } + private Optional paramToStringMapper(final String paramName, final CodegenProperty property) { + if (property.isEnum) { + return Optional.of(toVarName(paramName) + "ToString"); + } else if (property.isString || property.isBinary || property.isByteArray) { + return Optional.empty(); + } else if (property.isBoolean) { + return Optional.of("(\\val -> if val then \"true\" else \"false\")"); + } else if (property.isDateTime) { + return Optional.of("DateTime.toString"); + } else if (property.isDate) { + return Optional.of("DateOnly.toString"); + } else if (property.isUuid) { + return Optional.of("Uuid.toString"); + } else if (ElmVersion.ELM_018.equals(elmVersion)) { + return Optional.of("toString"); + } else if (property.isInteger || property.isLong) { + return Optional.of("String.fromInt"); + } else if (property.isFloat || property.isDouble) { + return Optional.of("String.fromFloat"); + } + throw new RuntimeException("Parameter '" + paramName + "' cannot be converted to a string. Please report the issue."); + } + + private CodegenProperty paramToProperty(final CodegenParameter parameter) { + final CodegenProperty property = new CodegenProperty(); + property.isEnum = parameter.isEnum; + property.isString = parameter.isString; + property.isBinary = parameter.isBinary; + property.isByteArray = parameter.isByteArray; + property.isBoolean = parameter.isBoolean; + property.isDateTime = parameter.isDateTime; + property.isDate = parameter.isDate; + property.isUuid = parameter.isUuid; + property.isInteger = parameter.isInteger; + property.isLong = parameter.isLong; + property.isFloat = parameter.isFloat; + property.isDouble = parameter.isDouble; + return property; + } + private String paramToString(final String prefix, final CodegenParameter param, final boolean useMaybe, final String maybeMapResult) { final String paramName = (ElmVersion.ELM_018.equals(elmVersion) ? "" : prefix + ".") + param.paramName; if (!useMaybe) { param.required = true; } - String mapFn = null; - if (param.isString || param.isBinary || param.isByteArray) { - mapFn = ""; - } else if (param.isBoolean) { - mapFn = "(\\val -> if val then \"true\" else \"false\")"; - } else if (param.isDateTime) { - mapFn = "DateTime.toString"; - } else if (param.isDate) { - mapFn = "DateOnly.toString"; - } else if (param.isUuid) { - mapFn = "Uuid.toString"; - } else if (ElmVersion.ELM_018.equals(elmVersion)) { - mapFn = "toString"; - } else if (param.isInteger || param.isLong) { - mapFn = "String.fromInt"; - } else if (param.isFloat || param.isDouble) { - mapFn = "String.fromFloat"; - } else if (param.isListContainer) { - // TODO duplicate ALL types from parameter to property... - if (param.items.isString || param.items.isUuid || param.items.isBinary || param.items.isByteArray) { - mapFn = "String.join \",\""; - } - } - if (mapFn == null) { - throw new RuntimeException("Parameter '" + param.paramName + "' cannot be converted to a string. Please report the issue."); - } + final String mapFn = param.isListContainer + ? "(String.join \",\"" + paramToStringMapper(param.paramName, param.items).map(mapper -> " << List.map " + mapper).orElse("") + ")" + : paramToStringMapper(param.paramName, paramToProperty(param)).orElse(""); - if (param.isListContainer) { - if (!param.required) { - mapFn = "(" + mapFn + ")"; - } - } String mapResult = ""; if (maybeMapResult != null) { if ("".equals(mapFn)) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java index b9d46f66a9..8d5836f717 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java @@ -95,6 +95,7 @@ public class ErlangClientCodegen extends DefaultCodegen implements CodegenConfig typeMapping.put("bytearray", "binary()"); typeMapping.put("byte", "binary()"); typeMapping.put("uuid", "binary()"); + typeMapping.put("uri", "binary()"); typeMapping.put("password", "binary()"); cliOptions.clear(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangProperCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangProperCodegen.java index ee2e5c8e7f..5d935d75bd 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangProperCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangProperCodegen.java @@ -98,6 +98,7 @@ public class ErlangProperCodegen extends DefaultCodegen implements CodegenConfig typeMapping.put("bytearray", "binary()"); typeMapping.put("byte", "binary()"); typeMapping.put("uuid", "binary()"); + typeMapping.put("uri", "binary()"); typeMapping.put("password", "binary()"); cliOptions.clear(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangServerCodegen.java index 63c9cd0a39..d9c280cfc6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangServerCodegen.java @@ -102,6 +102,7 @@ public class ErlangServerCodegen extends DefaultCodegen implements CodegenConfig typeMapping.put("bytearray", "binary"); typeMapping.put("byte", "binary"); typeMapping.put("uuid", "binary"); + typeMapping.put("uri", "binary"); typeMapping.put("password", "binary"); cliOptions.clear(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java index 750353acce..ec5a866705 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FlashClientCodegen.java @@ -74,6 +74,7 @@ public class FlashClientCodegen extends DefaultCodegen implements CodegenConfig typeMapping.put("object", "Object"); typeMapping.put("file", "File"); typeMapping.put("UUID", "String"); + typeMapping.put("URI", "String"); typeMapping.put("binary", "File"); importMapping = new HashMap(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java index 2b225223af..6a69660348 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellHttpClientCodegen.java @@ -227,6 +227,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC // lib typeMapping.put("string", "Text"); typeMapping.put("UUID", "Text"); + typeMapping.put("URI", "Text"); typeMapping.put("any", "A.Value"); typeMapping.put("set", "Set.Set"); // newtype diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java index b3692878ee..dd8ca1b529 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/HaskellServantCodegen.java @@ -173,6 +173,7 @@ public class HaskellServantCodegen extends DefaultCodegen implements CodegenConf typeMapping.put("number", "Double"); typeMapping.put("any", "Value"); typeMapping.put("UUID", "UUID"); + typeMapping.put("URI", "Text"); typeMapping.put("ByteArray", "Text"); typeMapping.put("object", "Value"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMSF4JServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMSF4JServerCodegen.java index f3559223c8..b7a16a6178 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMSF4JServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMSF4JServerCodegen.java @@ -44,7 +44,7 @@ public class JavaMSF4JServerCodegen extends AbstractJavaJAXRSServerCodegen { apiTestTemplateFiles.clear(); modelDocTemplateFiles.remove("model_doc.mustache"); apiDocTemplateFiles.remove("api_doc.mustache"); - embeddedTemplateDir = templateDir = "MSF4J"; + embeddedTemplateDir = templateDir = "java-msf4j-server"; CliOption library = new CliOption(CodegenConstants.LIBRARY, CodegenConstants.LIBRARY_DESC); supportedLibraries.put(LIBRARY_JERSEY1, "Jersey core 1.x"); supportedLibraries.put(LIBRARY_JERSEY2, "Jersey core 2.x"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaUndertowServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaUndertowServerCodegen.java index f9b18901c2..ef6b005fb0 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaUndertowServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaUndertowServerCodegen.java @@ -40,7 +40,7 @@ public class JavaUndertowServerCodegen extends AbstractJavaCodegen { public JavaUndertowServerCodegen() { super(); - embeddedTemplateDir = templateDir = "undertow"; + embeddedTemplateDir = templateDir = "java-undertow-server"; invokerPackage = "org.openapitools.handler"; artifactId = "openapi-undertow-server"; dateLibrary = "legacy"; //TODO: add joda support diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java index 23404c7814..299dcd661d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java @@ -156,6 +156,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo typeMapping.put("binary", "File"); typeMapping.put("file", "File"); typeMapping.put("UUID", "String"); + typeMapping.put("URI", "String"); importMapping.clear(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java index e213cd9235..21fd8ea4f8 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java @@ -95,6 +95,7 @@ public class JavascriptFlowtypedClientCodegen extends AbstractTypeScriptClientCo typeMapping.put("binary", "string"); typeMapping.put("ByteArray", "string"); typeMapping.put("UUID", "string"); + typeMapping.put("URI", "string"); defaultIncludes = new HashSet(languageSpecificPrimitives); outputFolder = "generated-code/javascript-flowtyped"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java index 7b18594f2e..96a95ade50 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java @@ -131,6 +131,7 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen { typeMapping.put("DateTime", "LocalDateTime"); importMapping.put("LocalDate", "org.threeten.bp.LocalDate"); importMapping.put("LocalDateTime", "org.threeten.bp.LocalDateTime"); + defaultIncludes.add("org.threeten.bp.LocalDate"); defaultIncludes.add("org.threeten.bp.LocalDateTime"); } else if (DateLibrary.STRING.value.equals(dateLibrary)) { typeMapping.put("date-time", "kotlin.String"); @@ -166,5 +167,8 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen { supportingFiles.add(new SupportingFile("infrastructure/Serializer.kt.mustache", infrastructureFolder, "Serializer.kt")); supportingFiles.add(new SupportingFile("infrastructure/Errors.kt.mustache", infrastructureFolder, "Errors.kt")); supportingFiles.add(new SupportingFile("infrastructure/ByteArrayAdapter.kt.mustache", infrastructureFolder, "ByteArrayAdapter.kt")); + supportingFiles.add(new SupportingFile("infrastructure/LocalDateAdapter.kt.mustache", infrastructureFolder, "LocalDateAdapter.kt")); + supportingFiles.add(new SupportingFile("infrastructure/LocalDateTimeAdapter.kt.mustache", infrastructureFolder, "LocalDateTimeAdapter.kt")); + supportingFiles.add(new SupportingFile("infrastructure/UUIDAdapter.kt.mustache", infrastructureFolder, "UUIDAdapter.kt")); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java index 36fbb49247..f142091531 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java @@ -76,10 +76,11 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen public KotlinSpringServerCodegen() { super(); + apiTestTemplateFiles.put("api_test.mustache", ".kt"); + reservedWords.addAll(VARIABLE_RESERVED_WORDS); outputFolder = "generated-code/kotlin-spring"; - apiTestTemplateFiles.clear(); // TODO: add test template embeddedTemplateDir = templateDir = "kotlin-spring"; artifactId = "openapi-spring"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java index 13334ec3e2..fd647aaa2e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java @@ -108,6 +108,7 @@ public class LuaClientCodegen extends DefaultCodegen implements CodegenConfig { typeMapping.put("boolean", "boolean"); typeMapping.put("string", "string"); typeMapping.put("UUID", "string"); + typeMapping.put("URI", "string"); typeMapping.put("date", "string"); typeMapping.put("DateTime", "string"); typeMapping.put("password", "string"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MysqlSchemaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MysqlSchemaCodegen.java index a8503e2f46..3376c2359c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MysqlSchemaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MysqlSchemaCodegen.java @@ -117,6 +117,7 @@ public class MysqlSchemaCodegen extends DefaultCodegen implements CodegenConfig "binary", "file", "UUID", + "URI", "BigDecimal", "mixed", "number", @@ -148,6 +149,7 @@ public class MysqlSchemaCodegen extends DefaultCodegen implements CodegenConfig typeMapping.put("binary", "MEDIUMBLOB"); typeMapping.put("file", "MEDIUMBLOB"); typeMapping.put("UUID", "TEXT"); + typeMapping.put("URI", "TEXT"); typeMapping.put("BigDecimal", "DECIMAL"); embeddedTemplateDir = templateDir = "mysql-schema"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java index f1203b7280..510d0c15a5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java @@ -134,6 +134,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig { typeMapping.put("bytearray", "NSData"); typeMapping.put("byte", "NSData"); typeMapping.put("uuid", "NSString"); + typeMapping.put("uri", "NSString"); typeMapping.put("password", "NSString"); // ref: http://www.tutorialspoint.com/objective_c/objective_c_basic_syntax.htm diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java index b4bc61534b..673ab32669 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java @@ -111,6 +111,7 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig { typeMapping.put("file", "string"); typeMapping.put("ByteArray", "string"); typeMapping.put("UUID", "string"); + typeMapping.put("URI", "string"); cliOptions.clear(); cliOptions.add(new CliOption(MODULE_NAME, "Perl module name (convention: CamelCase or Long::Module).").defaultValue("OpenAPIClient")); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java index 1a46dd34b7..d29dd78849 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java @@ -173,6 +173,7 @@ public class PhpSymfonyServerCodegen extends AbstractPhpCodegen implements Codeg typeMapping.put("binary", "string"); typeMapping.put("ByteArray", "string"); typeMapping.put("UUID", "string"); + typeMapping.put("URI", "string"); cliOptions.add(new CliOption(COMPOSER_VENDOR_NAME, "The vendor name used in the composer package name." + " The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. yaypets")); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpZendExpressivePathHandlerServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpZendExpressivePathHandlerServerCodegen.java index d68c59755d..337978615f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpZendExpressivePathHandlerServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpZendExpressivePathHandlerServerCodegen.java @@ -60,7 +60,7 @@ public class PhpZendExpressivePathHandlerServerCodegen extends AbstractPhpCodege //no point to use double - http://php.net/manual/en/language.types.float.php , especially because of PHP 7+ float type declaration typeMapping.put("double", "float"); - embeddedTemplateDir = templateDir = "ze-ph"; + embeddedTemplateDir = templateDir = "php-ze-ph"; invokerPackage = "App"; srcBasePath = "src" + File.separator + "App"; apiDirName = "Handler"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonAbstractConnexionServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonAbstractConnexionServerCodegen.java index e3e9d4ebf6..5d6c5ca102 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonAbstractConnexionServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonAbstractConnexionServerCodegen.java @@ -93,6 +93,7 @@ public class PythonAbstractConnexionServerCodegen extends DefaultCodegen impleme typeMapping.put("object", "object"); typeMapping.put("file", "file"); typeMapping.put("UUID", "str"); + typeMapping.put("URI", "str"); typeMapping.put("byte", "bytearray"); typeMapping.put("ByteArray", "bytearray"); @@ -201,6 +202,7 @@ public class PythonAbstractConnexionServerCodegen extends DefaultCodegen impleme } supportingFiles.add(new SupportingFile("__main__.mustache", packagePath(), "__main__.py")); supportingFiles.add(new SupportingFile("util.mustache", packagePath(), "util.py")); + supportingFiles.add(new SupportingFile("typing_utils.mustache", packagePath(), "typing_utils.py")); supportingFiles.add(new SupportingFile("__init__.mustache", packagePath() + File.separatorChar + packageToPath(controllerPackage), "__init__.py")); supportingFiles.add(new SupportingFile("security_controller_.mustache", packagePath() + File.separatorChar + packageToPath(controllerPackage), "security_controller_.py")); supportingFiles.add(new SupportingFile("__init__model.mustache", packagePath() + File.separatorChar + packageToPath(modelPackage), "__init__.py")); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonBluePlanetServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonBluePlanetServerCodegen.java index 7a1599a4c3..f45a2f6510 100755 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonBluePlanetServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonBluePlanetServerCodegen.java @@ -118,6 +118,7 @@ public class PythonBluePlanetServerCodegen extends PythonAbstractConnexionServer supportingFiles.add(new SupportingFile("app/{{packageName}}/__main__.mustache", APP_PACKAGE_PATH, "__main__.py")); supportingFiles.add(new SupportingFile("app/{{packageName}}/encoder.mustache", APP_PACKAGE_PATH, "encoder.py")); supportingFiles.add(new SupportingFile("app/{{packageName}}/util.mustache", APP_PACKAGE_PATH, "util.py")); + supportingFiles.add(new SupportingFile("app/{{packageName}}/typing_utils.mustache", APP_PACKAGE_PATH, "typing_utils.py")); supportingFiles.add(new SupportingFile("app/{{packageName}}/controllers/__init__.mustache", CONTROLLER_PATH, "__init__.py")); @@ -192,6 +193,7 @@ public class PythonBluePlanetServerCodegen extends PythonAbstractConnexionServer supportingFiles.add(new SupportingFile("app/{{packageName}}/__main__.mustache", APP_PACKAGE_PATH, "__main__.py")); supportingFiles.add(new SupportingFile("app/{{packageName}}/encoder.mustache", APP_PACKAGE_PATH, "encoder.py")); supportingFiles.add(new SupportingFile("app/{{packageName}}/util.mustache", APP_PACKAGE_PATH, "util.py")); + supportingFiles.add(new SupportingFile("app/{{packageName}}/typing_utils.mustache", APP_PACKAGE_PATH, "typing_utils.py")); supportingFiles.add(new SupportingFile("app/{{packageName}}/controllers/__init__.mustache", CONTROLLER_PATH, "__init__.py")); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java index 66ed01279a..0df25cfd15 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java @@ -41,8 +41,8 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig public static final String PACKAGE_URL = "packageUrl"; public static final String DEFAULT_LIBRARY = "urllib3"; - protected String packageName; // e.g. petstore_api - protected String packageVersion; + protected String packageName = "openapi_client"; + protected String packageVersion = "1.0.0"; protected String projectName; // for setup.py, e.g. petstore-api protected String packageUrl; protected String apiDocPath = "docs/"; @@ -113,6 +113,7 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig typeMapping.put("ByteArray", "str"); // map uuid to string for the time being typeMapping.put("UUID", "str"); + typeMapping.put("URI", "str"); // from https://docs.python.org/3/reference/lexical_analysis.html#keywords setReservedWordsLowerCase( @@ -176,8 +177,6 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig if (additionalProperties.containsKey(CodegenConstants.PACKAGE_NAME)) { setPackageName((String) additionalProperties.get(CodegenConstants.PACKAGE_NAME)); - } else { - setPackageName("openapi_client"); } if (additionalProperties.containsKey(CodegenConstants.PROJECT_NAME)) { @@ -190,9 +189,7 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig if (additionalProperties.containsKey(CodegenConstants.PACKAGE_VERSION)) { setPackageVersion((String) additionalProperties.get(CodegenConstants.PACKAGE_VERSION)); - } else { - setPackageVersion("1.0.0"); - } + } Boolean generateSourceCodeOnly = false; if (additionalProperties.containsKey(CodegenConstants.SOURCECODEONLY_GENERATION)) { @@ -240,10 +237,22 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig supportingFiles.add(new SupportingFile("__init__package.mustache", packagePath(), "__init__.py")); supportingFiles.add(new SupportingFile("__init__model.mustache", packagePath() + File.separatorChar + modelPackage, "__init__.py")); supportingFiles.add(new SupportingFile("__init__api.mustache", packagePath() + File.separatorChar + apiPackage, "__init__.py")); + + // If the package name consists of dots(openapi.client), then we need to create the directory structure like openapi/client with __init__ files. + String[] packageNameSplits = packageName.split("\\."); + String currentPackagePath = ""; + for (int i = 0; i < packageNameSplits.length-1; i++) { + if (i > 0) { + currentPackagePath = currentPackagePath + File.separatorChar; + } + currentPackagePath = currentPackagePath + packageNameSplits[i]; + supportingFiles.add(new SupportingFile("__init__.mustache", currentPackagePath, "__init__.py")); + } + supportingFiles.add(new SupportingFile("exceptions.mustache", packagePath(), "exceptions.py")); if (Boolean.FALSE.equals(excludeTests)) { - supportingFiles.add(new SupportingFile("__init__test.mustache", testFolder, "__init__.py")); + supportingFiles.add(new SupportingFile("__init__.mustache", testFolder, "__init__.py")); } supportingFiles.add(new SupportingFile("api_client.mustache", packagePath(), "api_client.py")); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java index 779b91dcfd..443bb43863 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java @@ -96,6 +96,7 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig { typeMapping.put("boolean", "character"); typeMapping.put("string", "character"); typeMapping.put("UUID", "character"); + typeMapping.put("URI", "character"); typeMapping.put("date", "character"); typeMapping.put("DateTime", "character"); typeMapping.put("password", "character"); @@ -683,4 +684,4 @@ public class RClientCodegen extends DefaultCodegen implements CodegenConfig { example += ")"; return example; } -} \ No newline at end of file +} diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java index c3636e215d..03b0c865ea 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java @@ -116,6 +116,7 @@ public class RustClientCodegen extends DefaultCodegen implements CodegenConfig { typeMapping.put("boolean", "bool"); typeMapping.put("string", "String"); typeMapping.put("UUID", "String"); + typeMapping.put("URI", "String"); typeMapping.put("date", "string"); typeMapping.put("DateTime", "String"); typeMapping.put("password", "String"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java index dedc8a91ef..dfbb7eab35 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java @@ -154,6 +154,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig { typeMapping.put("double", "f64"); typeMapping.put("string", "String"); typeMapping.put("UUID", uuidType); + typeMapping.put("URI", "String"); typeMapping.put("byte", "u8"); typeMapping.put("ByteArray", bytesType); typeMapping.put("binary", bytesType); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FinchServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java similarity index 98% rename from modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FinchServerCodegen.java rename to modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java index 5830c19417..64696f6896 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FinchServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java @@ -25,7 +25,7 @@ import org.openapitools.codegen.utils.ModelUtils; import java.io.File; import java.util.*; -public class FinchServerCodegen extends DefaultCodegen implements CodegenConfig { +public class ScalaFinchServerCodegen extends DefaultCodegen implements CodegenConfig { protected String invokerPackage = "org.openapitools.client"; protected String groupId = "org.openapitools"; protected String artifactId = "finch-server"; @@ -33,12 +33,12 @@ public class FinchServerCodegen extends DefaultCodegen implements CodegenConfig protected String sourceFolder = "src/main/scala"; protected String packageName = "org.openapitools"; - public FinchServerCodegen() { + public ScalaFinchServerCodegen() { super(); outputFolder = "generated-code/finch"; modelTemplateFiles.put("model.mustache", ".scala"); apiTemplateFiles.put("api.mustache", ".scala"); - embeddedTemplateDir = templateDir = "finch"; + embeddedTemplateDir = templateDir = "scala-finch"; apiPackage = packageName + ".apis"; modelPackage = packageName + ".models"; @@ -154,6 +154,7 @@ public class FinchServerCodegen extends DefaultCodegen implements CodegenConfig importMapping = new HashMap(); importMapping.put("BigDecimal", "java.math.BigDecimal"); importMapping.put("UUID", "java.util.UUID"); + importMapping.put("URI", "java.net.URI"); importMapping.put("File", "java.io.File"); importMapping.put("Date", "java.util.Date"); importMapping.put("Timestamp", "java.sql.Timestamp"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalatraServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalatraServerCodegen.java index 6eb994bd8e..806157ce87 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalatraServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalatraServerCodegen.java @@ -101,6 +101,7 @@ public class ScalatraServerCodegen extends AbstractScalaCodegen implements Codeg importMapping = new HashMap(); importMapping.put("BigDecimal", "java.math.BigDecimal"); importMapping.put("UUID", "java.util.UUID"); + importMapping.put("URI", "java.net.URI"); importMapping.put("File", "java.io.File"); importMapping.put("Date", "java.util.Date"); importMapping.put("Timestamp", "java.sql.Timestamp"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift3Codegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift3Codegen.java index 2c5e001d79..61a5e654fd 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift3Codegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift3Codegen.java @@ -151,6 +151,7 @@ public class Swift3Codegen extends DefaultCodegen implements CodegenConfig { typeMapping.put("binary", "Data"); typeMapping.put("ByteArray", "Data"); typeMapping.put("UUID", "UUID"); + typeMapping.put("URI", "String"); importMapping = new HashMap<>(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java index c5b5b97a36..b78891af4f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java @@ -197,6 +197,7 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig { typeMapping.put("binary", "URL"); typeMapping.put("ByteArray", "Data"); typeMapping.put("UUID", "UUID"); + typeMapping.put("URI", "String"); importMapping = new HashMap<>(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftClientCodegen.java index 1f6fc32b3f..d4e06cc01a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftClientCodegen.java @@ -169,6 +169,7 @@ public class SwiftClientCodegen extends DefaultCodegen implements CodegenConfig typeMapping.put("binary", "NSURL"); typeMapping.put("ByteArray", "NSData"); typeMapping.put("UUID", "NSUUID"); + typeMapping.put("URI", "String"); importMapping = new HashMap(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java index 7714265d1e..1fbe90664d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java @@ -23,10 +23,8 @@ import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.parser.util.SchemaTypeUtil; import org.openapitools.codegen.*; import org.openapitools.codegen.utils.ModelUtils; -import org.openapitools.codegen.utils.StringUtils; import java.io.File; -import java.text.SimpleDateFormat; import java.util.*; import static org.openapitools.codegen.utils.StringUtils.camelize; @@ -36,6 +34,7 @@ public class TypeScriptInversifyClientCodegen extends AbstractTypeScriptClientCo public static final String NPM_REPOSITORY = "npmRepository"; public static final String WITH_INTERFACES = "withInterfaces"; public static final String USE_PROMISE = "usePromise"; + public static final String USE_RXJS6 = "useRxJS6"; public static final String TAGGED_UNIONS = "taggedUnions"; protected String npmRepository = null; @@ -53,6 +52,8 @@ public class TypeScriptInversifyClientCodegen extends AbstractTypeScriptClientCo apiPackage = "api"; modelPackage = "model"; + this.reservedWords.add("map"); + this.cliOptions.add(new CliOption(NPM_REPOSITORY, "Use this property to set an url your private npmRepo in the package.json")); this.cliOptions.add(new CliOption(WITH_INTERFACES, @@ -61,6 +62,9 @@ public class TypeScriptInversifyClientCodegen extends AbstractTypeScriptClientCo this.cliOptions.add(new CliOption(USE_PROMISE, "Setting this property to use promise instead of observable inside every service.", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString())); + this.cliOptions.add(new CliOption(USE_RXJS6, + "Setting this property to use rxjs 6 instead of rxjs 5.", + SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString())); this.cliOptions.add(new CliOption(TAGGED_UNIONS, "Use discriminators to create tagged unions instead of extending interfaces.", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString())); @@ -85,7 +89,7 @@ public class TypeScriptInversifyClientCodegen extends AbstractTypeScriptClientCo @Override public void processOpts() { super.processOpts(); - // HttpClient + // HttpCliens supportingFiles.add(new SupportingFile("IHttpClient.mustache", getIndexDirectory(), "IHttpClient.ts")); supportingFiles.add(new SupportingFile("IAPIConfiguration.mustache", getIndexDirectory(), "IAPIConfiguration.ts")); supportingFiles.add(new SupportingFile("HttpClient.mustache", getIndexDirectory(), "HttpClient.ts")); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java index efdf43561c..814035e9e8 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java @@ -42,6 +42,7 @@ import java.util.stream.Collectors; public class ModelUtils { private static final Logger LOGGER = LoggerFactory.getLogger(ModelUtils.class); + private static final String URI_FORMAT = "uri"; private static boolean generateAliasAsModel = false; public static void setGenerateAliasAsModel(boolean value) { @@ -500,6 +501,14 @@ public class ModelUtils { return false; } + public static boolean isURISchema(Schema schema) { + if (SchemaTypeUtil.STRING_TYPE.equals(schema.getType()) + && URI_FORMAT.equals(schema.getFormat())) { // format: uri + return true; + } + return false; + } + public static boolean isEmailSchema(Schema schema) { if (schema instanceof EmailSchema) { return true; diff --git a/modules/openapi-generator/src/main/resources/Groovy/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Groovy/build.gradle.mustache index 7bf4d93d73..96aed20d0a 100644 --- a/modules/openapi-generator/src/main/resources/Groovy/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Groovy/build.gradle.mustache @@ -27,7 +27,7 @@ repositories { ext { swagger_annotations_version = "1.5.22" - jackson_version = "2.9.8" + jackson_version = "2.9.9" } dependencies { diff --git a/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache index 04a9d55cfd..2e00ae91d1 100644 --- a/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache @@ -32,6 +32,7 @@ if(hasProperty('target') && target == 'android') { minSdkVersion 14 targetSdkVersion 25 } + compileOptions { {{#supportJava6}} sourceCompatibility JavaVersion.VERSION_1_6 @@ -134,9 +135,9 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.17" - jackson_version = "{{^threetenbp}}2.8.11{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" - jackson_databind_version = "{{^threetenbp}}2.8.11.2{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" + swagger_annotations_version = "1.5.22" + jackson_version = "{{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" + jackson_databind_version = "{{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" jersey_version = "1.19.4" jodatime_version = "2.9.9" junit_version = "4.12" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OAuth.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OAuth.mustache index c0344c1113..25b1f193ba 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OAuth.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OAuth.mustache @@ -96,7 +96,7 @@ public class OAuth implements RequestInterceptor { accessTokenResponse = oauthClient.accessToken(tokenRequestBuilder.buildBodyMessage()); } catch (Exception e) { {{#useFeign10}} - throw new RetryableException(e.getMessage(), HttpMethod.POST, e, null); + throw new RetryableException(0, e.getMessage(), HttpMethod.POST, e, null); {{/useFeign10}} {{^useFeign10}} throw new RetryableException(e.getMessage(), e,null); diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache index c96666e2aa..24e5e816ca 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache @@ -119,13 +119,13 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.21" - jackson_version = "2.8.11" - jackson_databind_version = "2.8.11.3" + swagger_annotations_version = "1.5.22" + jackson_version = "2.9.9" + jackson_databind_version = "2.9.9" {{#threetenbp}} threepane_version = "2.6.4" {{/threetenbp}} - feign_version = "{{#useFeign10}}10.0.1{{/useFeign10}}{{^useFeign10}}9.4.0{{/useFeign10}}" + feign_version = "{{#useFeign10}}10.2.3{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}" feign_form_version = "2.1.0" junit_version = "4.12" oltu_version = "1.0.1" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache index 2168e3e9f6..946b319561 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache @@ -9,15 +9,15 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( - "io.swagger" % "swagger-annotations" % "1.5.21" % "compile", - "io.github.openfeign" % "feign-core" % "{{#useFeign10}}10.0.1{{/useFeign10}}{{^useFeign10}}9.4.0{{/useFeign10}}" % "compile", - "io.github.openfeign" % "feign-jackson" % "{{#useFeign10}}10.0.1{{/useFeign10}}{{^useFeign10}}9.4.0{{/useFeign10}}" % "compile", - "io.github.openfeign" % "feign-slf4j" % "{{#useFeign10}}10.0.1{{/useFeign10}}{{^useFeign10}}9.4.0{{/useFeign10}}" % "compile", + "io.swagger" % "swagger-annotations" % "1.5.22" % "compile", + "io.github.openfeign" % "feign-core" % "{{#useFeign10}}10.2.3{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}" % "compile", + "io.github.openfeign" % "feign-jackson" % "{{#useFeign10}}10.2.3{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}" % "compile", + "io.github.openfeign" % "feign-slf4j" % "{{#useFeign10}}10.2.3{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}" % "compile", "io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile", - "com.fasterxml.jackson.core" % "jackson-core" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.11.3" % "compile", - "com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.8.7" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile", + "com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.9.9" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "com.brsanthu" % "migbase64" % "2.2" % "compile", diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache index ebfe5859b1..21954ad8ad 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache @@ -300,10 +300,10 @@ ${java.version} ${java.version} 1.5.21 - {{#useFeign10}}10.0.1{{/useFeign10}}{{^useFeign10}}9.4.0{{/useFeign10}} + {{#useFeign10}}10.2.3{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}} 2.1.0 - 2.8.11 - 2.8.11.3 + 2.9.9 + 2.9.9 {{#threetenbp}} 2.6.4 {{/threetenbp}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache index 62f9f6b6d4..f8d3ce9d78 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache @@ -119,9 +119,9 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.21" - jackson_version = "2.8.11" - jackson_databind_version = "2.8.11.3" + swagger_annotations_version = "1.5.22" + jackson_version = "2.9.9" + jackson_databind_version = "2.9.9" google_api_client_version = "1.23.0" jersey_common_version = "2.25.1" jodatime_version = "2.9.9" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache index 10f26b6493..48f28b25d1 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache @@ -9,20 +9,20 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( - "io.swagger" % "swagger-annotations" % "1.5.21", + "io.swagger" % "swagger-annotations" % "1.5.22", "com.google.api-client" % "google-api-client" % "1.23.0", "org.glassfish.jersey.core" % "jersey-common" % "2.25.1", - "com.fasterxml.jackson.core" % "jackson-core" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.11.3" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile", {{#withXml}} - "com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.8.9" % "compile", + "com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.9.9" % "compile", {{/withXml}} {{#joda}} - "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.8.9" % "compile", + "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9" % "compile", {{/joda}} {{#java8}} - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.8.9" % "compile", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.9" % "compile", {{/java8}} {{#threetenbp}} "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache index db32695d81..35f0cafdf9 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache @@ -292,11 +292,11 @@ UTF-8 - 1.5.21 + 1.5.22 1.23.0 2.25.1 - 2.8.11 - 2.8.11.3 + 2.9.9 + 2.9.9 {{#joda}} 2.9.9 {{/joda}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache index dfd4cda750..6ca2e18a7c 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache @@ -118,9 +118,9 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.21" - jackson_version = "2.8.11" - jackson_databind_version = "2.8.11.3" + swagger_annotations_version = "1.5.22" + jackson_version = "2.9.9" + jackson_databind_version = "2.9.9" {{#supportJava6}} jersey_version = "2.6" commons_io_version=2.5 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache index 64157fb6cb..d5d6906549 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache @@ -9,18 +9,18 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( - "io.swagger" % "swagger-annotations" % "1.5.21", + "io.swagger" % "swagger-annotations" % "1.5.22", "org.glassfish.jersey.core" % "jersey-client" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}}, "org.glassfish.jersey.media" % "jersey-media-multipart" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}}, "org.glassfish.jersey.media" % "jersey-media-json-jackson" % {{#supportJava6}}"2.6"{{/supportJava6}}{{^supportJava6}}"2.25.1"{{/supportJava6}}, - "com.fasterxml.jackson.core" % "jackson-core" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.11.3" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile", {{#joda}} - "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.8.9" % "compile", + "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9" % "compile", {{/joda}} {{#java8}} - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.8.9" % "compile", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.9" % "compile", {{/java8}} {{#threetenbp}} "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache index 026b777ec9..3c0af2dac5 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache @@ -323,7 +323,7 @@ UTF-8 - 1.5.21 + 1.5.22 {{^supportJava6}} 2.27 {{/supportJava6}} @@ -332,8 +332,8 @@ 2.5 3.6 {{/supportJava6}} - 2.8.11 - 2.8.11.3 + 2.9.9 + 2.9.9 {{#threetenbp}} 2.6.4 {{/threetenbp}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/README.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/README.mustache index 441a784943..07636f62a4 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/README.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/README.mustache @@ -77,48 +77,52 @@ Please follow the [installation](#installation) instruction and execute the foll ```java {{#apiInfo}}{{#apis}}{{#-first}}{{#operations}}{{#operation}}{{#-first}} -import {{{invokerPackage}}}.*; -import {{{invokerPackage}}}.auth.*; -import {{{modelPackage}}}.*; +// Import classes: +import {{{invokerPackage}}}.ApiClient; +import {{{invokerPackage}}}.ApiException; +import {{{invokerPackage}}}.Configuration;{{#hasAuthMethods}} +import {{{invokerPackage}}}.auth.*;{{/hasAuthMethods}} +import {{{invokerPackage}}}.models.*; import {{{package}}}.{{{classname}}}; -import java.io.File; -import java.util.*; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("{{{basePath}}}"); + {{#hasAuthMethods}} + {{#authMethods}}{{#isBasic}} + // Configure HTTP basic authorization: {{{name}}} + HttpBasicAuth {{{name}}} = (HttpBasicAuth) defaultClient.getAuthentication("{{{name}}}"); + {{{name}}}.setUsername("YOUR USERNAME"); + {{{name}}}.setPassword("YOUR PASSWORD");{{/isBasic}}{{#isApiKey}} + // Configure API key authorization: {{{name}}} + ApiKeyAuth {{{name}}} = (ApiKeyAuth) defaultClient.getAuthentication("{{{name}}}"); + {{{name}}}.setApiKey("YOUR API KEY"); + // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null) + //{{{name}}}.setApiKeyPrefix("Token");{{/isApiKey}}{{#isOAuth}} + // Configure OAuth2 access token for authorization: {{{name}}} + OAuth {{{name}}} = (OAuth) defaultClient.getAuthentication("{{{name}}}"); + {{{name}}}.setAccessToken("YOUR ACCESS TOKEN");{{/isOAuth}} + {{/authMethods}} + {{/hasAuthMethods}} -public class {{{classname}}}Example { - - public static void main(String[] args) { - {{#hasAuthMethods}}ApiClient defaultClient = Configuration.getDefaultApiClient(); - {{#authMethods}}{{#isBasic}} - // Configure HTTP basic authorization: {{{name}}} - HttpBasicAuth {{{name}}} = (HttpBasicAuth) defaultClient.getAuthentication("{{{name}}}"); - {{{name}}}.setUsername("YOUR USERNAME"); - {{{name}}}.setPassword("YOUR PASSWORD");{{/isBasic}}{{#isApiKey}} - // Configure API key authorization: {{{name}}} - ApiKeyAuth {{{name}}} = (ApiKeyAuth) defaultClient.getAuthentication("{{{name}}}"); - {{{name}}}.setApiKey("YOUR API KEY"); - // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null) - //{{{name}}}.setApiKeyPrefix("Token");{{/isApiKey}}{{#isOAuth}} - // Configure OAuth2 access token for authorization: {{{name}}} - OAuth {{{name}}} = (OAuth) defaultClient.getAuthentication("{{{name}}}"); - {{{name}}}.setAccessToken("YOUR ACCESS TOKEN");{{/isOAuth}} - {{/authMethods}} - {{/hasAuthMethods}} - - {{{classname}}} apiInstance = new {{{classname}}}(); - {{#allParams}} - {{{dataType}}} {{{paramName}}} = {{{example}}}; // {{{dataType}}} | {{{description}}} - {{/allParams}} - try { - {{#returnType}}{{{returnType}}} result = {{/returnType}}apiInstance.{{{operationId}}}{{^vendorExtensions.x-group-parameters}}({{#allParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}({{#requiredParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/requiredParams}}){{#optionalParams}} - .{{{paramName}}}({{{paramName}}}){{/optionalParams}} - .execute();{{/vendorExtensions.x-group-parameters}}{{#returnType}} - System.out.println(result);{{/returnType}} - } catch (ApiException e) { - System.err.println("Exception when calling {{{classname}}}#{{{operationId}}}"); - e.printStackTrace(); - } + {{{classname}}} apiInstance = new {{{classname}}}(defaultClient); + {{#allParams}} + {{{dataType}}} {{{paramName}}} = {{{example}}}; // {{{dataType}}} | {{{description}}} + {{/allParams}} + try { + {{#returnType}}{{{returnType}}} result = {{/returnType}}apiInstance.{{{operationId}}}{{^vendorExtensions.x-group-parameters}}({{#allParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}({{#requiredParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/requiredParams}}){{#optionalParams}} + .{{{paramName}}}({{{paramName}}}){{/optionalParams}} + .execute();{{/vendorExtensions.x-group-parameters}}{{#returnType}} + System.out.println(result);{{/returnType}} + } catch (ApiException e) { + System.err.println("Exception when calling {{{classname}}}#{{{operationId}}}"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); } + } } {{/-first}}{{/operation}}{{/operations}}{{/-first}}{{/apis}}{{/apiInfo}} ``` diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache index 3705e654e0..32b1e3fcf0 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache @@ -69,6 +69,15 @@ public class {{classname}} { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + {{#responses.0}} + * @http.response.details + + + {{#responses}} + + {{/responses}} +
Status Code Description Response Headers
{{code}} {{message}} {{#headers}} * {{baseName}} - {{description}}
{{/headers}}{{^headers.0}} - {{/headers.0}}
+ {{/responses.0}} {{#isDeprecated}} * @deprecated {{/isDeprecated}} @@ -179,6 +188,15 @@ public class {{classname}} { * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}{{/isContainer}}){{/required}}{{/allParams}}{{#returnType}} * @return {{returnType}}{{/returnType}} * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + {{#responses.0}} + * @http.response.details + + + {{#responses}} + + {{/responses}} +
Status Code Description Response Headers
{{code}} {{message}} {{#headers}} * {{baseName}} - {{description}}
{{/headers}}{{^headers.0}} - {{/headers.0}}
+ {{/responses.0}} {{#isDeprecated}} * @deprecated {{/isDeprecated}} @@ -202,6 +220,15 @@ public class {{classname}} { * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}{{/isContainer}}){{/required}}{{/allParams}} * @return ApiResponse<{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Void{{/returnType}}> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + {{#responses.0}} + * @http.response.details + + + {{#responses}} + + {{/responses}} +
Status Code Description Response Headers
{{code}} {{message}} {{#headers}} * {{baseName}} - {{description}}
{{/headers}}{{^headers.0}} - {{/headers.0}}
+ {{/responses.0}} {{#isDeprecated}} * @deprecated {{/isDeprecated}} @@ -226,6 +253,15 @@ public class {{classname}} { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + {{#responses.0}} + * @http.response.details + + + {{#responses}} + + {{/responses}} +
Status Code Description Response Headers
{{code}} {{message}} {{#headers}} * {{baseName}} - {{description}}
{{/headers}}{{^headers.0}} - {{/headers.0}}
+ {{/responses.0}} {{#isDeprecated}} * @deprecated {{/isDeprecated}} @@ -277,6 +313,15 @@ public class {{classname}} { * @param _callback ApiCallback API callback * @return Call to execute * @throws ApiException If fail to serialize the request body object + {{#responses.0}} + * @http.response.details + + + {{#responses}} + + {{/responses}} +
Status Code Description Response Headers
{{code}} {{message}} {{#headers}} * {{baseName}} - {{description}}
{{/headers}}{{^headers.0}} - {{/headers.0}}
+ {{/responses.0}} {{#isDeprecated}} * @deprecated {{/isDeprecated}} @@ -292,6 +337,15 @@ public class {{classname}} { * Execute {{operationId}} request{{#returnType}} * @return {{returnType}}{{/returnType}} * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + {{#responses.0}} + * @http.response.details + + + {{#responses}} + + {{/responses}} +
Status Code Description Response Headers
{{code}} {{message}} {{#headers}} * {{baseName}} - {{description}}
{{/headers}}{{^headers.0}} - {{/headers.0}}
+ {{/responses.0}} {{#isDeprecated}} * @deprecated {{/isDeprecated}} @@ -308,6 +362,15 @@ public class {{classname}} { * Execute {{operationId}} request with HTTP info returned * @return ApiResponse<{{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}Void{{/returnType}}> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + {{#responses.0}} + * @http.response.details + + + {{#responses}} + + {{/responses}} +
Status Code Description Response Headers
{{code}} {{message}} {{#headers}} * {{baseName}} - {{description}}
{{/headers}}{{^headers.0}} - {{/headers.0}}
+ {{/responses.0}} {{#isDeprecated}} * @deprecated {{/isDeprecated}} @@ -324,6 +387,15 @@ public class {{classname}} { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + {{#responses.0}} + * @http.response.details + + + {{#responses}} + + {{/responses}} +
Status Code Description Response Headers
{{code}} {{message}} {{#headers}} * {{baseName}} - {{description}}
{{/headers}}{{^headers.0}} - {{/headers.0}}
+ {{/responses.0}} {{#isDeprecated}} * @deprecated {{/isDeprecated}} @@ -341,6 +413,15 @@ public class {{classname}} { * {{notes}}{{#requiredParams}} * @param {{paramName}} {{description}} (required){{/requiredParams}} * @return API{{operationId}}Request + {{#responses.0}} + * @http.response.details + + + {{#responses}} + + {{/responses}} +
Status Code Description Response Headers
{{code}} {{message}} {{#headers}} * {{baseName}} - {{description}}
{{/headers}}{{^headers.0}} - {{/headers.0}}
+ {{/responses.0}} {{#isDeprecated}} * @deprecated {{/isDeprecated}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api_doc.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api_doc.mustache index 1292eb3aa8..720b4d3c5e 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api_doc.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api_doc.mustache @@ -21,43 +21,52 @@ Method | HTTP request | Description ### Example ```java -// Import classes:{{#hasAuthMethods}} -//import {{{invokerPackage}}}.ApiClient;{{/hasAuthMethods}} -//import {{{invokerPackage}}}.ApiException;{{#hasAuthMethods}} -//import {{{invokerPackage}}}.Configuration; -//import {{{invokerPackage}}}.auth.*;{{/hasAuthMethods}} -//import {{{package}}}.{{{classname}}}; +// Import classes: +import {{{invokerPackage}}}.ApiClient; +import {{{invokerPackage}}}.ApiException; +import {{{invokerPackage}}}.Configuration;{{#hasAuthMethods}} +import {{{invokerPackage}}}.auth.*;{{/hasAuthMethods}} +import {{{invokerPackage}}}.models.*; +import {{{package}}}.{{{classname}}}; -{{#hasAuthMethods}} -ApiClient defaultClient = Configuration.getDefaultApiClient(); -{{#authMethods}}{{#isBasic}} -// Configure HTTP basic authorization: {{{name}}} -HttpBasicAuth {{{name}}} = (HttpBasicAuth) defaultClient.getAuthentication("{{{name}}}"); -{{{name}}}.setUsername("YOUR USERNAME"); -{{{name}}}.setPassword("YOUR PASSWORD");{{/isBasic}}{{#isApiKey}} -// Configure API key authorization: {{{name}}} -ApiKeyAuth {{{name}}} = (ApiKeyAuth) defaultClient.getAuthentication("{{{name}}}"); -{{{name}}}.setApiKey("YOUR API KEY"); -// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null) -//{{{name}}}.setApiKeyPrefix("Token");{{/isApiKey}}{{#isOAuth}} -// Configure OAuth2 access token for authorization: {{{name}}} -OAuth {{{name}}} = (OAuth) defaultClient.getAuthentication("{{{name}}}"); -{{{name}}}.setAccessToken("YOUR ACCESS TOKEN");{{/isOAuth}} -{{/authMethods}} -{{/hasAuthMethods}} +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("{{{basePath}}}"); + {{#hasAuthMethods}} + {{#authMethods}}{{#isBasic}} + // Configure HTTP basic authorization: {{{name}}} + HttpBasicAuth {{{name}}} = (HttpBasicAuth) defaultClient.getAuthentication("{{{name}}}"); + {{{name}}}.setUsername("YOUR USERNAME"); + {{{name}}}.setPassword("YOUR PASSWORD");{{/isBasic}}{{#isApiKey}} + // Configure API key authorization: {{{name}}} + ApiKeyAuth {{{name}}} = (ApiKeyAuth) defaultClient.getAuthentication("{{{name}}}"); + {{{name}}}.setApiKey("YOUR API KEY"); + // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null) + //{{{name}}}.setApiKeyPrefix("Token");{{/isApiKey}}{{#isOAuth}} + // Configure OAuth2 access token for authorization: {{{name}}} + OAuth {{{name}}} = (OAuth) defaultClient.getAuthentication("{{{name}}}"); + {{{name}}}.setAccessToken("YOUR ACCESS TOKEN");{{/isOAuth}} + {{/authMethods}} + {{/hasAuthMethods}} -{{{classname}}} apiInstance = new {{{classname}}}(); -{{#allParams}} -{{{dataType}}} {{{paramName}}} = {{{example}}}; // {{{dataType}}} | {{{description}}} -{{/allParams}} -try { - {{#returnType}}{{{returnType}}} result = {{/returnType}}apiInstance.{{{operationId}}}{{^vendorExtensions.x-group-parameters}}({{#allParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}({{#requiredParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/requiredParams}}){{#optionalParams}} + {{{classname}}} apiInstance = new {{{classname}}}(defaultClient); + {{#allParams}} + {{{dataType}}} {{{paramName}}} = {{{example}}}; // {{{dataType}}} | {{{description}}} + {{/allParams}} + try { + {{#returnType}}{{{returnType}}} result = {{/returnType}}apiInstance.{{{operationId}}}{{^vendorExtensions.x-group-parameters}}({{#allParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}({{#requiredParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/requiredParams}}){{#optionalParams}} .{{{paramName}}}({{{paramName}}}){{/optionalParams}} .execute();{{/vendorExtensions.x-group-parameters}}{{#returnType}} - System.out.println(result);{{/returnType}} -} catch (ApiException e) { - System.err.println("Exception when calling {{{classname}}}#{{{operationId}}}"); - e.printStackTrace(); + System.out.println(result);{{/returnType}} + } catch (ApiException e) { + System.err.println("Exception when calling {{{classname}}}#{{{operationId}}}"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -81,5 +90,14 @@ Name | Type | Description | Notes - **Content-Type**: {{#consumes}}{{{mediaType}}}{{#hasMore}}, {{/hasMore}}{{/consumes}}{{^consumes}}Not defined{{/consumes}} - **Accept**: {{#produces}}{{{mediaType}}}{{#hasMore}}, {{/hasMore}}{{/produces}}{{^produces}}Not defined{{/produces}} +{{#responses.0}} +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +{{#responses}} +**{{code}}** | {{message}} | {{#headers}} * {{baseName}} - {{description}}
{{/headers}}{{^headers.0}} - {{/headers.0}} | +{{/responses}} +{{/responses.0}} + {{/operation}} {{/operations}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache index 5ef1fc2bf9..eac0a4e1ba 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache @@ -149,6 +149,15 @@ jar + + + + http.response.details + a + Http Response Details: + + + diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache index bb64ceda84..16da888f26 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache @@ -118,9 +118,9 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.21" - jackson_version = "2.8.11" - jackson_databind_version = "2.8.11.3" + swagger_annotations_version = "1.5.22" + jackson_version = "2.9.9" + jackson_databind_version = "2.9.9" threetenbp_version = "2.6.4" resteasy_version = "3.1.3.Final" {{^java8}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache index 5f713ff903..4f67eb3882 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache @@ -9,19 +9,19 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( - "io.swagger" % "swagger-annotations" % "1.5.21" % "compile", + "io.swagger" % "swagger-annotations" % "1.5.22" % "compile", "org.jboss.resteasy" % "resteasy-client" % "3.1.3.Final" % "compile", "org.jboss.resteasy" % "resteasy-multipart-provider" % "3.1.3.Final" % "compile", "org.jboss.resteasy" % "resteasy-jackson2-provider" % "3.1.3.Final" % "compile", - "com.fasterxml.jackson.core" % "jackson-core" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.11.3" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", {{#java8}} - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.8.6" % "compile", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.9" % "compile", {{/java8}} {{^java8}} - "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.7.5" % "compile", + "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9" % "compile", "joda-time" % "joda-time" % "2.9.9" % "compile", "com.brsanthu" % "migbase64" % "2.2" % "compile", {{/java8}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache index ab5332b4cb..48b5241973 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache @@ -281,10 +281,10 @@ UTF-8 - 1.5.21 + 1.5.22 3.1.3.Final - 2.8.11 - 2.8.11.3 + 2.9.9 + 2.9.9 2.6.4 {{^java8}} 2.9.9 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache index d1ea207485..eae0fa4e4a 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache @@ -119,9 +119,9 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.21" - jackson_version = "2.8.11" - jackson_databind_version = "2.8.11.3" + swagger_annotations_version = "1.5.22" + jackson_version = "2.9.9" + jackson_databind_version = "2.9.9" spring_web_version = "4.3.9.RELEASE" jodatime_version = "2.9.9" junit_version = "4.12" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache index 600880cb6a..39a4a7c8d8 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache @@ -295,10 +295,10 @@ UTF-8 - 1.5.21 + 1.5.22 4.3.9.RELEASE - 2.8.11 - 2.8.11.3 + 2.9.9 + 2.9.9 {{#joda}} 2.9.9 {{/joda}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache index 125f276b39..39574a5755 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache @@ -127,16 +127,16 @@ ext { play_version = "2.4.11" {{/play24}} {{#play25}} - jackson_version = "2.7.8" + jackson_version = "2.9.9" play_version = "2.5.14" {{/play25}} {{#play26}} - jackson_version = "2.8.11" - jackson_databind_version = "2.8.11.3" + jackson_version = "2.9.9" + jackson_databind_version = "2.9.9" play_version = "2.6.7" {{/play26}} {{/usePlayWS}} - swagger_annotations_version = "1.5.21" + swagger_annotations_version = "1.5.22" junit_version = "4.12" {{#useRxJava}} rx_java_version = "1.3.0" diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache index 4c7a766cdc..21b00d3b91 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache @@ -23,16 +23,16 @@ lazy val root = (project in file(".")). {{/play24}} {{#play25}} "com.typesafe.play" % "play-java-ws_2.11" % "2.5.15" % "compile", - "com.fasterxml.jackson.core" % "jackson-core" % "2.7.8" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.8" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.8" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile", {{/play25}} {{#play26}} "com.typesafe.play" % "play-ahc-ws_2.12" % "2.6.7" % "compile", "javax.validation" % "validation-api" % "1.1.0.Final" % "compile", - "com.fasterxml.jackson.core" % "jackson-core" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.11.3" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile", {{/play26}} "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile", {{/usePlayWS}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache index 5c20886169..4653b6650a 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache @@ -352,19 +352,19 @@ ${java.version} ${java.version} 1.8.3 - 1.5.21 + 1.5.22 {{#usePlayWS}} - 2.8.11.3 + 2.9.9 {{#play24}} 2.6.6 2.4.11 {{/play24}} {{#play25}} - 2.7.8 + 2.9.9 2.5.15 {{/play25}} {{#play26}} - 2.8.11 + 2.9.9 2.6.7 {{/play26}} {{/usePlayWS}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache index d7652437be..1e97c1e259 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache @@ -28,8 +28,8 @@ task execute(type:JavaExec) { ext { swagger_annotations_version = "1.5.21" - jackson_version = "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" - jackson_databind_version = "{{^threetenbp}}2.8.11.3{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" + jackson_version = "{{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" + jackson_databind_version = "{{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}" vertx_version = "3.4.2" junit_version = "4.12" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache index 5af4dc1ba9..c3976600d9 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache @@ -276,9 +276,9 @@ UTF-8 3.4.2 - 1.5.21 - {{^threetenbp}}2.8.11{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}} - {{^threetenbp}}2.8.11.3{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}} + 1.5.22 + {{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}} + {{^threetenbp}}2.9.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}} 4.12 diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache index d44f942930..8919c3d481 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache @@ -129,10 +129,10 @@ UTF-8 - 1.5.20 + 1.5.22 5.0.7.RELEASE - 2.8.11 - 2.8.11.3 + 2.9.9 + 2.9.9 4.12 3.1.8.RELEASE 0.7.8.RELEASE diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache index 40de23abd3..315e0d096a 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache @@ -204,7 +204,7 @@ {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} ${java.version} ${java.version} - 1.5.18 + 1.5.22 9.2.9.v20150224 4.12 1.1.7 @@ -213,7 +213,7 @@ 1.1.0.Final {{/useBeanValidation}} 3.3.0 - 2.9.8 + 2.9.9 UTF-8 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache index 6d16df1fd3..83c7335172 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache @@ -341,7 +341,7 @@ 1.1.7 {{/generateSpringBootApplication}} 3.3.0 - 2.9.8 + 2.9.9 UTF-8 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache index 805267eef7..62d0e3ebc0 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache @@ -207,7 +207,7 @@ 1.1.0.Final {{/useBeanValidation}} 3.3.0 - 2.9.8 + 2.9.9 UTF-8 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache index a9796d0170..2e75578f59 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache @@ -249,7 +249,7 @@ {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} ${java.version} ${java.version} - 1.5.18 + 1.5.22 9.2.9.v20150224 4.12 1.1.7 @@ -264,7 +264,7 @@ 1.5.9.RELEASE {{/generateSpringBootApplication}} 3.3.0 - 2.9.8 + 2.9.9 UTF-8 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache index 53accf2802..08e49b7f3c 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache @@ -200,13 +200,13 @@ {{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}} ${java.version} ${java.version} - 1.5.18 + 1.5.22 {{#useBeanValidation}} 1.1.0.Final {{/useBeanValidation}} 9.2.9.v20150224 1.19.1 - 2.8.9 + 2.9.9 1.7.21 4.12 2.5 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache index 91a926cac2..9785f8ac10 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache @@ -212,7 +212,7 @@ {{/useBeanValidation}} 9.2.9.v20150224 2.22.2 - 2.8.9 + 2.9.9 {{#supportJava6}} 2.5 3.5 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache index 60f4d69117..df8a82b461 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache @@ -19,11 +19,11 @@ dependencies { providedCompile 'javax.validation:validation-api:1.1.0.Final' {{/useBeanValidation}} {{^java8}} - compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.6.3' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9' compile 'joda-time:joda-time:2.7' {{/java8}} {{#java8}} - compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.6.3' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9' {{/java8}} testCompile 'junit:junit:4.12', 'org.hamcrest:hamcrest-core:1.3' diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache index 11c25090ad..48d331f4ae 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache @@ -156,14 +156,14 @@ com.fasterxml.jackson.datatype jackson-datatype-joda - 2.6.3 + 2.9.9 {{/java8}} {{#java8}} com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.6.3 + 2.9.9 {{/java8}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/gradle.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/gradle.mustache index 65d748762c..84e2d612aa 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/gradle.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/gradle.mustache @@ -15,12 +15,12 @@ dependencies { providedCompile 'javax.annotation:javax.annotation-api:1.2' providedCompile 'javax:javaee-api:7.0' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' - compile 'io.swagger:swagger-annotations:1.5.10' + compile 'io.swagger:swagger-annotations:1.5.22' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' {{#useBeanValidation}} providedCompile 'javax.validation:validation-api:1.1.0.Final' {{/useBeanValidation}} - compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.1' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9' compile 'joda-time:joda-time:2.7' //TODO: swaggerFeature compile 'io.swagger:swagger-jaxrs:1.5.12' diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache index d8e8fb2c63..d0000c1cd5 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache @@ -123,7 +123,7 @@ com.fasterxml.jackson.datatype jackson-datatype-joda - 2.4.1 + 2.9.9 joda-time @@ -182,7 +182,7 @@ - 1.5.18 + 1.5.22 9.2.9.v20150224 3.0.11.Final 1.6.3 diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache index 5d2110b5f6..40d6eba4c6 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache @@ -125,7 +125,7 @@ {{/useBeanValidation}} - 2.8.9 + 2.9.9 4.8.1 diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache index 81a6a95b9c..aafc216dba 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache @@ -245,7 +245,7 @@ 4.12 2.5 2.8.0 - 2.9.5 + 2.9.9 2.8.4 {{#useBeanValidation}} 1.1.0.Final diff --git a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig index 4eddf1ebea..3f21ea57ec 100644 --- a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig +++ b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig @@ -27,7 +27,6 @@ org.openapitools.codegen.languages.ErlangClientCodegen org.openapitools.codegen.languages.ErlangProperCodegen org.openapitools.codegen.languages.ErlangServerCodegen org.openapitools.codegen.languages.FlashClientCodegen -org.openapitools.codegen.languages.FinchServerCodegen org.openapitools.codegen.languages.GoClientCodegen org.openapitools.codegen.languages.GoServerCodegen org.openapitools.codegen.languages.GoGinServerCodegen @@ -85,6 +84,7 @@ org.openapitools.codegen.languages.RustClientCodegen org.openapitools.codegen.languages.RustServerCodegen org.openapitools.codegen.languages.ScalatraServerCodegen org.openapitools.codegen.languages.ScalaAkkaClientCodegen +org.openapitools.codegen.languages.ScalaFinchServerCodegen org.openapitools.codegen.languages.ScalaHttpClientCodegen org.openapitools.codegen.languages.ScalaGatlingCodegen org.openapitools.codegen.languages.ScalaLagomServerCodegen diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache index 0083aee398..e4be72baec 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache @@ -26,6 +26,9 @@ namespace {{modelPackage}} {{#required}} [Required] {{/required}} + {{#pattern}} + [RegularExpression("{{{pattern}}}")] + {{/pattern}} [DataMember(Name="{{baseName}}", EmitDefaultValue={{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}})] {{#isEnum}} public {{{datatypeWithEnum}}}{{#isEnum}}{{^isContainer}}?{{/isContainer}}{{/isEnum}} {{name}} { get; set; } @@ -86,14 +89,14 @@ namespace {{modelPackage}} return {{#vars}}{{^isContainer}} ( {{name}} == other.{{name}} || - {{name}} != null && + {{^vendorExtensions.isValueType}}{{name}} != null &&{{/vendorExtensions.isValueType}} {{name}}.Equals(other.{{name}}) ){{#hasMore}} && {{/hasMore}}{{/isContainer}}{{#isContainer}} ( {{name}} == other.{{name}} || - {{name}} != null && + {{^vendorExtensions.isValueType}}{{name}} != null && other.{{name}} != null && - {{name}}.SequenceEqual(other.{{name}}) + {{/vendorExtensions.isValueType}}{{name}}.SequenceEqual(other.{{name}}) ){{#hasMore}} && {{/hasMore}}{{/isContainer}}{{/vars}}{{^vars}}false{{/vars}}; } @@ -108,7 +111,7 @@ namespace {{modelPackage}} var hashCode = 41; // Suitable nullity checks etc, of course :) {{#vars}} - if ({{name}} != null) + {{^vendorExtensions.isValueType}}if ({{name}} != null){{/vendorExtensions.isValueType}} hashCode = hashCode * 59 + {{name}}.GetHashCode(); {{/vars}} return hashCode; diff --git a/modules/openapi-generator/src/main/resources/cpp-pistache-server/main-api-server.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/main-api-server.mustache index 69b33f661d..239c88e447 100644 --- a/modules/openapi-generator/src/main/resources/cpp-pistache-server/main-api-server.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-pistache-server/main-api-server.mustache @@ -53,7 +53,7 @@ int main() { std::vector sigs{SIGQUIT, SIGINT, SIGTERM, SIGHUP}; setUpUnixSignals(sigs); #endif - Pistache::Address addr(Pistache::Ipv4::any(), Pistache::Port({{serverPort}})); + Pistache::Address addr(Pistache::Ipv4::any(), Pistache::Port({{#serverPort}}{{serverPort}}{{/serverPort}}{{^serverPort}}8080{{/serverPort}})); httpEndpoint = new Pistache::Http::Endpoint((addr)); auto router = std::make_shared(); diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache index ff8137cc23..c2355916bf 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache @@ -9,7 +9,8 @@ namespace {{this}} { {{/cppNamespaceDeclarations}} -{{classname}}::{{classname}}() { +{{classname}}::{{classname}}() : basePath("{{{basePathWithoutHost}}}"), + host("{{#serverHost}}{{#scheme}}{{scheme}}://{{/scheme}}{{serverHost}}{{#serverPort}}:{{serverPort}}{{/serverPort}}{{/serverHost}}") { } @@ -17,11 +18,24 @@ namespace {{this}} { } -{{classname}}::{{classname}}(QString host, QString basePath) { +{{classname}}::{{classname}}(const QString& host, const QString& basePath) { this->host = host; this->basePath = basePath; } +void {{classname}}::setBasePath(const QString& basePath){ + this->basePath = basePath; +} + +void {{classname}}::setHost(const QString& host){ + this->host = host; +} + +void {{classname}}::addHeaders(const QString& key, const QString& value){ + defaultHeaders.insert(key, value); +} + + {{#operations}} {{#operation}} void diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-header.mustache index 5c33c1b721..a5fc0432b5 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-header.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-header.mustache @@ -18,16 +18,19 @@ class {{classname}}: public QObject { public: {{classname}}(); - {{classname}}(QString host, QString basePath); + {{classname}}(const QString& host, const QString& basePath); ~{{classname}}(); - QString host; - QString basePath; - QMap defaultHeaders; - + void setBasePath(const QString& basePath); + void setHost(const QString& host); + void addHeaders(const QString& key, const QString& value); + {{#operations}}{{#operation}}void {{nickname}}({{#allParams}}const {{{dataType}}}& {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}); {{/operation}}{{/operations}} private: + QString basePath; + QString host; + QMap defaultHeaders; {{#operations}}{{#operation}}void {{nickname}}Callback ({{prefix}}HttpRequestWorker * worker); {{/operation}}{{/operations}} signals: diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/main.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/main.cpp.mustache index e864d562d6..5b4954ae4f 100644 --- a/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/main.cpp.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server/main.cpp.mustache @@ -58,7 +58,7 @@ int main(int argc, char * argv[]) QStringList() << "p" << "port", "port to listen on", "port", - "{{serverPort}}" + "{{#serverPort}}{{serverPort}}{{/serverPort}}{{^serverPort}}8080{{/serverPort}}" ); parser.addOption(portOption); parser.addHelpOption(); diff --git a/modules/openapi-generator/src/main/resources/cpp-restbed-server/api-header.mustache b/modules/openapi-generator/src/main/resources/cpp-restbed-server/api-header.mustache index 22d1f33037..fe966c1d98 100644 --- a/modules/openapi-generator/src/main/resources/cpp-restbed-server/api-header.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-restbed-server/api-header.mustache @@ -10,6 +10,8 @@ {{{defaultInclude}}} #include +#include + #include #include #include @@ -49,6 +51,31 @@ public: {{#vendorExtensions.x-codegen-otherMethods}} void {{httpMethod}}_method_handler(const std::shared_ptr session); {{/vendorExtensions.x-codegen-otherMethods}} + + void set_handler_{{httpMethod}}( + std::function( + {{#allParams}}{{{dataType}}} const &{{#hasMore}}, {{/hasMore}}{{/allParams}} + )> handler + ); + + {{#vendorExtensions.x-codegen-otherMethods}} + void set_handler_{{httpMethod}}( + std::function( + {{#allParams}}{{{dataType}}} const &{{#hasMore}}, {{/hasMore}}{{/allParams}} + )> handler + ); + {{/vendorExtensions.x-codegen-otherMethods}} + +private: + std::function( + {{#allParams}}{{{dataType}}} const &{{#hasMore}}, {{/hasMore}}{{/allParams}} + )> handler_{{httpMethod}}_; + + {{#vendorExtensions.x-codegen-otherMethods}} + std::function( + {{#allParams}}{{{dataType}}} const &{{#hasMore}}, {{/hasMore}}{{/allParams}} + )> handler_{{httpMethod}}_; + {{/vendorExtensions.x-codegen-otherMethods}} }; {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/cpp-restbed-server/api-source.mustache b/modules/openapi-generator/src/main/resources/cpp-restbed-server/api-source.mustache index ccd81ee02e..9523774984 100644 --- a/modules/openapi-generator/src/main/resources/cpp-restbed-server/api-source.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-restbed-server/api-source.mustache @@ -54,6 +54,22 @@ void {{classname}}::stopService() { { } +void {{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource::set_handler_{{httpMethod}}( + std::function( + {{#allParams}}{{{dataType}}} const &{{#hasMore}}, {{/hasMore}}{{/allParams}} + )> handler) { + handler_{{httpMethod}}_ = std::move(handler); +} + +{{#vendorExtensions.x-codegen-otherMethods}} +void {{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource::set_handler_{{httpMethod}}( + std::function( + {{#allParams}}{{{dataType}}} const &{{#hasMore}}, {{/hasMore}}{{/allParams}} + )> handler) { + handler_{{httpMethod}}_ = std::move(handler); +} +{{/vendorExtensions.x-codegen-otherMethods}} + void {{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource::{{httpMethod}}_method_handler(const std::shared_ptr session) { const auto request = session->get_request(); @@ -65,12 +81,12 @@ void {{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource::{{httpMet { const auto request = session->get_request(); - std::string requestBody = restbed::String::format("%.*s\n", ( int ) body.size( ), body.data( )); + std::string file = restbed::String::format("%.*s\n", ( int ) body.size( ), body.data( )); /** - * Get body params or form params here from the requestBody string + * Get body params or form params here from the file string */ {{/hasBodyParam}} - + {{#hasPathParams}} // Getting the path params {{#pathParams}} @@ -79,7 +95,7 @@ void {{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource::{{httpMet {{/isPrimitiveType}} {{/pathParams}} {{/hasPathParams}} - + {{#hasQueryParams}} // Getting the query params {{#queryParams}} @@ -97,21 +113,25 @@ void {{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource::{{httpMet {{/isPrimitiveType}} {{/headerParams}} {{/hasHeaderParams}} - + // Change the value of this variable to the appropriate response before sending the response int status_code = 200; - - /** - * Process the received information here - */ - + std::string result = "successful operation"; + + if (handler_{{httpMethod}}_) + { + std::tie(status_code, result) = handler_{{httpMethod}}_( + {{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}} + ); + } + {{#responses}} if (status_code == {{code}}) { {{#headers}} // Description: {{description}} session->set_header("{{baseName}}", ""); // Change second param to your header value {{/headers}} - session->close({{code}}, "{{message}}", { {"Connection", "close"} }); + session->close({{code}}, result.empty() ? "{{message}}" : std::move(result), { {"Connection", "close"} }); return; } {{/responses}} @@ -133,7 +153,7 @@ void {{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource::{{httpMet { const auto request = session->get_request(); - std::string requestBody = restbed::String::format("%.*s\n", ( int ) body.size( ), body.data( )); + std::string file = restbed::String::format("%.*s\n", ( int ) body.size( ), body.data( )); {{/hasBodyParam}} {{#hasPathParams}} @@ -144,7 +164,7 @@ void {{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource::{{httpMet {{/isPrimitiveType}} {{/pathParams}} {{/hasPathParams}} - + {{#hasQueryParams}} // Getting the query params {{#queryParams}} @@ -162,14 +182,18 @@ void {{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource::{{httpMet {{/isPrimitiveType}} {{/headerParams}} {{/hasHeaderParams}} - + // Change the value of this variable to the appropriate response before sending the response int status_code = 200; - - /** - * Process the received information here - */ - + std::string result = "successful operation"; + + if (handler_{{httpMethod}}_) + { + std::tie(status_code, result) = handler_{{httpMethod}}_( + {{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}} + ); + } + {{#responses}} if (status_code == {{code}}) { {{#baseType}} @@ -179,7 +203,7 @@ void {{classname}}{{vendorExtensions.x-codegen-resourceName}}Resource::{{httpMet // Description: {{description}} session->set_header("{{baseName}}", ""); // Change second param to your header value {{/headers}} - session->close({{code}}, "{{message}}", { {"Connection", "close"} }); + session->close({{code}}, result.empty() ? "{{message}}" : std::move(result), { {"Connection", "close"} }); return; } {{/responses}} diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/Project.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/Project.mustache index 8f2c2285a1..f23e4b1cf9 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/Project.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/Project.mustache @@ -27,6 +27,7 @@ {{targetFrameworkVersion}} {{targetFrameworkIdentifier}} 512 + bin\$(Configuration)\$(TargetFramework)\{{packageName}}.xml diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache index 5d8beeda3b..45d075c16e 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache @@ -182,19 +182,19 @@ return {{#vars}}{{#parent}}base.Equals(input) && {{/parent}}{{^isContainer}} ( this.{{name}} == input.{{name}} || - {{^isEnum}} + {{^vendorExtensions.isValueType}} (this.{{name}} != null && this.{{name}}.Equals(input.{{name}})) - {{/isEnum}} - {{#isEnum}} + {{/vendorExtensions.isValueType}} + {{#vendorExtensions.isValueType}} this.{{name}}.Equals(input.{{name}}) - {{/isEnum}} + {{/vendorExtensions.isValueType}} ){{#hasMore}} && {{/hasMore}}{{/isContainer}}{{#isContainer}} ( this.{{name}} == input.{{name}} || - this.{{name}} != null && + {{^vendorExtensions.isValueType}}this.{{name}} != null && input.{{name}} != null && - this.{{name}}.SequenceEqual(input.{{name}}) + {{/vendorExtensions.isValueType}}this.{{name}}.SequenceEqual(input.{{name}}) ){{#hasMore}} && {{/hasMore}}{{/isContainer}}{{/vars}}{{^vars}}{{#parent}}base.Equals(input){{/parent}}{{^parent}}false{{/parent}}{{/vars}}; {{/useCompareNetObjects}} } @@ -214,13 +214,13 @@ int hashCode = 41; {{/parent}} {{#vars}} - {{^isEnum}} + {{^vendorExtensions.isValueType}} if (this.{{name}} != null) hashCode = hashCode * 59 + this.{{name}}.GetHashCode(); - {{/isEnum}} - {{#isEnum}} + {{/vendorExtensions.isValueType}} + {{#vendorExtensions.isValueType}} hashCode = hashCode * 59 + this.{{name}}.GetHashCode(); - {{/isEnum}} + {{/vendorExtensions.isValueType}} {{/vars}} return hashCode; } diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_project.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_project.mustache index 6c4a9927ef..e40e9541db 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_project.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_project.mustache @@ -18,6 +18,7 @@ true {{packageName}} {{packageVersion}} + bin\$(Configuration)\$(TargetFramework)\{{packageName}}.xml diff --git a/modules/openapi-generator/src/main/resources/csharp/Project.mustache b/modules/openapi-generator/src/main/resources/csharp/Project.mustache index a9e7438c7a..e028c7b63c 100644 --- a/modules/openapi-generator/src/main/resources/csharp/Project.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/Project.mustache @@ -46,6 +46,7 @@ DEBUG;TRACE prompt 4 + bin\Debug\{{packageName}}.xml pdbonly @@ -54,6 +55,7 @@ TRACE prompt 4 + bin\Release\{{packageName}}.xml {{^netStandard}} diff --git a/modules/openapi-generator/src/main/resources/csharp/README.mustache b/modules/openapi-generator/src/main/resources/csharp/README.mustache index 84dd3f21d6..be09f9d138 100644 --- a/modules/openapi-generator/src/main/resources/csharp/README.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/README.mustache @@ -102,7 +102,6 @@ Then, publish to a [local feed](https://docs.microsoft.com/en-us/nuget/hosting-p ## Getting Started ```csharp -using System; using System.Diagnostics; using {{packageName}}.{{apiPackage}}; using {{packageName}}.Client; @@ -112,9 +111,10 @@ namespace Example { public class {{operationId}}Example { - public void main() + public static void Main() { {{#apiInfo}}{{#apis}}{{#-first}}{{#operations}}{{#operation}}{{#-first}} + Configuration.Default.BasePath = "{{{basePath}}}"; {{#hasAuthMethods}} {{#authMethods}} {{#isBasic}} @@ -135,7 +135,7 @@ namespace Example {{/authMethods}} {{/hasAuthMethods}} - var apiInstance = new {{classname}}(); + var apiInstance = new {{classname}}(Configuration.Default); {{#allParams}} {{#isPrimitiveType}} var {{paramName}} = {{{example}}}; // {{{dataType}}} | {{{description}}}{{^required}} (optional) {{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}} @@ -153,9 +153,11 @@ namespace Example {{#returnType}}{{{.}}} result = {{/returnType}}apiInstance.{{{operationId}}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{#returnType}} Debug.WriteLine(result);{{/returnType}} } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling {{classname}}.{{operationId}}: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } {{/-first}}{{/operation}}{{/operations}}{{/-first}}{{/apis}}{{/apiInfo}} } diff --git a/modules/openapi-generator/src/main/resources/csharp/api.mustache b/modules/openapi-generator/src/main/resources/csharp/api.mustache index 22ee80b69e..f3f3f7e578 100644 --- a/modules/openapi-generator/src/main/resources/csharp/api.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/api.mustache @@ -308,12 +308,12 @@ namespace {{packageName}}.{{apiPackage}} {{#returnType}} return new ApiResponse<{{{returnType}}}>(localVarStatusCode, - localVarResponse.Headers.ToDictionary(x => x.{{^netStandard}}Name{{/netStandard}}{{#netStandard}}Key{{/netStandard}}, x => string.Join(",", x.Value)), + localVarResponse.Headers.ToDictionary(x => x.{{^netStandard}}Name{{/netStandard}}{{#netStandard}}Key{{/netStandard}}, x => string.Join(",", x.Value){{#caseInsensitiveResponseHeaders}}, StringComparer.OrdinalIgnoreCase{{/caseInsensitiveResponseHeaders}}), ({{{returnType}}}) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof({{#returnContainer}}{{{returnContainer}}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}))); {{/returnType}} {{^returnType}} return new ApiResponse(localVarStatusCode, - localVarResponse.Headers.ToDictionary(x => x.{{^netStandard}}Name{{/netStandard}}{{#netStandard}}Key{{/netStandard}}, x => string.Join(",", x.Value)), + localVarResponse.Headers.ToDictionary(x => x.{{^netStandard}}Name{{/netStandard}}{{#netStandard}}Key{{/netStandard}}, x => string.Join(",", x.Value){{#caseInsensitiveResponseHeaders}}, StringComparer.OrdinalIgnoreCase{{/caseInsensitiveResponseHeaders}}), null); {{/returnType}} } @@ -444,12 +444,12 @@ namespace {{packageName}}.{{apiPackage}} {{#returnType}} return new ApiResponse<{{{returnType}}}>(localVarStatusCode, - localVarResponse.Headers.ToDictionary(x => x.{{^netStandard}}Name{{/netStandard}}{{#netStandard}}Key{{/netStandard}}, x => string.Join(",", x.Value)), + localVarResponse.Headers.ToDictionary(x => x.{{^netStandard}}Name{{/netStandard}}{{#netStandard}}Key{{/netStandard}}, x => string.Join(",", x.Value){{#caseInsensitiveResponseHeaders}}, StringComparer.OrdinalIgnoreCase{{/caseInsensitiveResponseHeaders}}), ({{{returnType}}}) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof({{#returnContainer}}{{{returnContainer}}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}))); {{/returnType}} {{^returnType}} return new ApiResponse(localVarStatusCode, - localVarResponse.Headers.ToDictionary(x => x.{{^netStandard}}Name{{/netStandard}}{{#netStandard}}Key{{/netStandard}}, x => string.Join(",", x.Value)), + localVarResponse.Headers.ToDictionary(x => x.{{^netStandard}}Name{{/netStandard}}{{#netStandard}}Key{{/netStandard}}, x => string.Join(",", x.Value){{#caseInsensitiveResponseHeaders}}, StringComparer.OrdinalIgnoreCase{{/caseInsensitiveResponseHeaders}}), null); {{/returnType}} } diff --git a/modules/openapi-generator/src/main/resources/csharp/api_doc.mustache b/modules/openapi-generator/src/main/resources/csharp/api_doc.mustache index c4edd78d24..7971a78fb1 100644 --- a/modules/openapi-generator/src/main/resources/csharp/api_doc.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/api_doc.mustache @@ -23,7 +23,6 @@ Method | HTTP request | Description ### Example ```csharp -using System; using System.Diagnostics; using {{packageName}}.{{apiPackage}}; using {{packageName}}.Client; @@ -33,8 +32,9 @@ namespace Example { public class {{operationId}}Example { - public void main() + public static void Main() { + Configuration.Default.BasePath = "{{{basePath}}}"; {{#hasAuthMethods}} {{#authMethods}} {{#isBasic}} @@ -55,7 +55,7 @@ namespace Example {{/authMethods}} {{/hasAuthMethods}} - var apiInstance = new {{classname}}(); + var apiInstance = new {{classname}}(Configuration.Default); {{#allParams}} {{#isPrimitiveType}} var {{paramName}} = {{{example}}}; // {{{dataType}}} | {{{description}}}{{^required}} (optional) {{/required}}{{#defaultValue}} (default to {{{.}}}){{/defaultValue}} @@ -73,9 +73,11 @@ namespace Example {{#returnType}}{{returnType}} result = {{/returnType}}apiInstance.{{{operationId}}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{#returnType}} Debug.WriteLine(result);{{/returnType}} } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling {{classname}}.{{operationId}}: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } diff --git a/modules/openapi-generator/src/main/resources/dart-jaguar/api_test.mustache b/modules/openapi-generator/src/main/resources/dart-jaguar/api_test.mustache new file mode 100644 index 0000000000..951aaf86d8 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/dart-jaguar/api_test.mustache @@ -0,0 +1,28 @@ +import 'package:{{pubName}}/api.dart'; +import 'package:test/test.dart'; + +{{#operations}} + +/// tests for {{classname}} +void main() { + var instance = new {{classname}}(); + + group('tests for {{classname}}', () { + {{#operation}} + {{#summary}} + // {{{.}}} + // + {{/summary}} + {{#notes}} + // {{{.}}} + // + {{/notes}} + //{{#returnType}}Future<{{{returnType}}}> {{/returnType}}{{^returnType}}Future {{/returnType}}{{operationId}}({{#allParams}}{{#required}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{ {{#allParams}}{{^required}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/required}}{{/allParams}} }{{/hasOptionalParams}}) async + test('test {{operationId}}', () async { + // TODO + }); + + {{/operation}} + }); +} +{{/operations}} diff --git a/modules/openapi-generator/src/main/resources/dart-jaguar/model_test.mustache b/modules/openapi-generator/src/main/resources/dart-jaguar/model_test.mustache new file mode 100644 index 0000000000..b766bf143e --- /dev/null +++ b/modules/openapi-generator/src/main/resources/dart-jaguar/model_test.mustache @@ -0,0 +1,26 @@ +{{#models}} +{{#model}} +import 'package:{{pubName}}/api.dart'; +import 'package:test/test.dart'; + +// tests for {{classname}} +void main() { + var instance = new {{classname}}(); + + group('test {{classname}}', () { + {{#vars}} + {{#description}} + // {{{description}}} + {{/description}} + // {{{dataType}}} {{name}}{{#defaultValue}} (default value: {{{.}}}){{/defaultValue}} + test('to test the property `{{name}}`', () async { + // TODO + }); + + {{/vars}} + + }); + +} +{{/model}} +{{/models}} diff --git a/modules/openapi-generator/src/main/resources/dart-jaguar/travis.mustache b/modules/openapi-generator/src/main/resources/dart-jaguar/travis.mustache new file mode 100644 index 0000000000..82b19541fa --- /dev/null +++ b/modules/openapi-generator/src/main/resources/dart-jaguar/travis.mustache @@ -0,0 +1,11 @@ +# https://docs.travis-ci.com/user/languages/dart/ +# +language: dart +dart: +# Install a specific stable release +- "1.24.3" +install: +- pub get + +script: +- pub run test diff --git a/modules/openapi-generator/src/main/resources/dart/api_test.mustache b/modules/openapi-generator/src/main/resources/dart/api_test.mustache new file mode 100644 index 0000000000..951aaf86d8 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/dart/api_test.mustache @@ -0,0 +1,28 @@ +import 'package:{{pubName}}/api.dart'; +import 'package:test/test.dart'; + +{{#operations}} + +/// tests for {{classname}} +void main() { + var instance = new {{classname}}(); + + group('tests for {{classname}}', () { + {{#operation}} + {{#summary}} + // {{{.}}} + // + {{/summary}} + {{#notes}} + // {{{.}}} + // + {{/notes}} + //{{#returnType}}Future<{{{returnType}}}> {{/returnType}}{{^returnType}}Future {{/returnType}}{{operationId}}({{#allParams}}{{#required}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{ {{#allParams}}{{^required}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/required}}{{/allParams}} }{{/hasOptionalParams}}) async + test('test {{operationId}}', () async { + // TODO + }); + + {{/operation}} + }); +} +{{/operations}} diff --git a/modules/openapi-generator/src/main/resources/dart/model_test.mustache b/modules/openapi-generator/src/main/resources/dart/model_test.mustache new file mode 100644 index 0000000000..b766bf143e --- /dev/null +++ b/modules/openapi-generator/src/main/resources/dart/model_test.mustache @@ -0,0 +1,26 @@ +{{#models}} +{{#model}} +import 'package:{{pubName}}/api.dart'; +import 'package:test/test.dart'; + +// tests for {{classname}} +void main() { + var instance = new {{classname}}(); + + group('test {{classname}}', () { + {{#vars}} + {{#description}} + // {{{description}}} + {{/description}} + // {{{dataType}}} {{name}}{{#defaultValue}} (default value: {{{.}}}){{/defaultValue}} + test('to test the property `{{name}}`', () async { + // TODO + }); + + {{/vars}} + + }); + +} +{{/model}} +{{/models}} diff --git a/modules/openapi-generator/src/main/resources/dart/pubspec.mustache b/modules/openapi-generator/src/main/resources/dart/pubspec.mustache index ef8fab4bb2..997448a9be 100644 --- a/modules/openapi-generator/src/main/resources/dart/pubspec.mustache +++ b/modules/openapi-generator/src/main/resources/dart/pubspec.mustache @@ -3,3 +3,5 @@ version: {{pubVersion}} description: {{pubDescription}} dependencies: http: '>=0.11.1 <0.13.0' +dev_dependencies: + test: ^1.3.0 diff --git a/modules/openapi-generator/src/main/resources/dart/travis.mustache b/modules/openapi-generator/src/main/resources/dart/travis.mustache new file mode 100644 index 0000000000..82b19541fa --- /dev/null +++ b/modules/openapi-generator/src/main/resources/dart/travis.mustache @@ -0,0 +1,11 @@ +# https://docs.travis-ci.com/user/languages/dart/ +# +language: dart +dart: +# Install a specific stable release +- "1.24.3" +install: +- pub get + +script: +- pub run test diff --git a/modules/openapi-generator/src/main/resources/dart2/api_test.mustache b/modules/openapi-generator/src/main/resources/dart2/api_test.mustache new file mode 100644 index 0000000000..951aaf86d8 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/dart2/api_test.mustache @@ -0,0 +1,28 @@ +import 'package:{{pubName}}/api.dart'; +import 'package:test/test.dart'; + +{{#operations}} + +/// tests for {{classname}} +void main() { + var instance = new {{classname}}(); + + group('tests for {{classname}}', () { + {{#operation}} + {{#summary}} + // {{{.}}} + // + {{/summary}} + {{#notes}} + // {{{.}}} + // + {{/notes}} + //{{#returnType}}Future<{{{returnType}}}> {{/returnType}}{{^returnType}}Future {{/returnType}}{{operationId}}({{#allParams}}{{#required}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{ {{#allParams}}{{^required}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/required}}{{/allParams}} }{{/hasOptionalParams}}) async + test('test {{operationId}}', () async { + // TODO + }); + + {{/operation}} + }); +} +{{/operations}} diff --git a/modules/openapi-generator/src/main/resources/dart2/model_test.mustache b/modules/openapi-generator/src/main/resources/dart2/model_test.mustache new file mode 100644 index 0000000000..89300fed75 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/dart2/model_test.mustache @@ -0,0 +1,26 @@ +{{#models}} +{{#model}} +import 'package:{{pubName}}/api.dart'; +import 'package:test/test.dart'; + +// tests for {{classname}} +void main() { + var instance = new Pet(); + + group('test {{classname}}', () { + {{#vars}} + {{#description}} + // {{{description}}} + {{/description}} + // {{{dataType}}} {{name}}{{#defaultValue}} (default value: {{{.}}}){{/defaultValue}} + test('to test the property `{{name}}`', () async { + // TODO + }); + + {{/vars}} + + }); + +} +{{/model}} +{{/models}} diff --git a/modules/openapi-generator/src/main/resources/dart2/pubspec.mustache b/modules/openapi-generator/src/main/resources/dart2/pubspec.mustache index 008cee0b24..43bb64bb55 100644 --- a/modules/openapi-generator/src/main/resources/dart2/pubspec.mustache +++ b/modules/openapi-generator/src/main/resources/dart2/pubspec.mustache @@ -5,3 +5,5 @@ environment: sdk: '>=2.0.0 <3.0.0' dependencies: http: '>=0.11.1 <0.13.0' +dev_dependencies: + test: ^1.3.0 diff --git a/modules/openapi-generator/src/main/resources/dart2/travis.mustache b/modules/openapi-generator/src/main/resources/dart2/travis.mustache new file mode 100644 index 0000000000..d0758bc9f0 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/dart2/travis.mustache @@ -0,0 +1,11 @@ +# https://docs.travis-ci.com/user/languages/dart/ +# +language: dart +dart: +# Install a specific stable release +- "2.2.0" +install: +- pub get + +script: +- pub run test diff --git a/modules/openapi-generator/src/main/resources/elm/api.mustache b/modules/openapi-generator/src/main/resources/elm/api.mustache index 16c4e3a5ba..275a912192 100644 --- a/modules/openapi-generator/src/main/resources/elm/api.mustache +++ b/modules/openapi-generator/src/main/resources/elm/api.mustache @@ -1,6 +1,6 @@ {{>licenseInfo}} -module Request.{{classname}} exposing ({{#operations}}{{#operation}}{{^-first}}, {{/-first}}{{operationId}}{{/operation}}{{/operations}}) +module Request.{{classname}} exposing ({{#operations}}{{#operation}}{{^-first}}, {{/-first}}{{operationId}}{{#allParams}}{{#isEnum}}, {{enumName}}(..){{/isEnum}}{{/allParams}}{{/operation}}{{/operations}}) {{>imports}}import Dict import Http @@ -8,6 +8,29 @@ import Json.Decode as Decode import Url.Builder as Url +{{#operations}} +{{#operation}} +{{#allParams}} +{{#isEnum}} +type {{enumName}} +{{#allowableValues.enumVars}} {{#-first}}= {{/-first}}{{^-first}}| {{/-first}}{{name}} +{{/allowableValues.enumVars}} + +{{paramName}}ToString : {{enumName}} -> String +{{paramName}}ToString value = + case value of +{{#allowableValues.enumVars}} {{name}} -> + {{{value}}} + +{{/allowableValues.enumVars}} + + +{{/isEnum}} +{{/allParams}} +{{/operation}} +{{/operations}} + + {{^enableCustomBasePaths}}basePath : String basePath = "{{basePath}}" @@ -29,8 +52,8 @@ basePath = {{#enableCustomBasePaths}} , basePath : String{{/enableCustomBasePaths}} {{#enableHttpRequestTrackers}} , tracker : Maybe String{{/enableHttpRequestTrackers}} {{#bodyParam}} , body : {{^required}}Maybe {{/required}}{{dataType}}{{/bodyParam}} -{{#pathParams}} , {{paramName}} : {{#isListContainer}}List {{/isListContainer}}{{dataType}}{{/pathParams}} -{{#queryParams}} , {{paramName}} : {{^required}}Maybe ({{/required}}{{#isListContainer}}List {{/isListContainer}}{{dataType}}{{^required}}){{/required}}{{/queryParams}} +{{#pathParams}} , {{paramName}} : {{#isListContainer}}List {{/isListContainer}}{{#datatypeWithEnum}}{{datatypeWithEnum}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{dataType}}{{/datatypeWithEnum}}{{/pathParams}} +{{#queryParams}} , {{paramName}} : {{^required}}Maybe ({{/required}}{{#isListContainer}}List {{/isListContainer}}{{#datatypeWithEnum}}{{datatypeWithEnum}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{dataType}}{{/datatypeWithEnum}}{{^required}}){{/required}}{{/queryParams}} } -> Cmd msg {{operationId}} {{#headerParams.0}}headers {{/headerParams.0}}params = diff --git a/modules/openapi-generator/src/main/resources/go-gin-server/routers.mustache b/modules/openapi-generator/src/main/resources/go-gin-server/routers.mustache index babf63dd26..8eb63de4ea 100644 --- a/modules/openapi-generator/src/main/resources/go-gin-server/routers.mustache +++ b/modules/openapi-generator/src/main/resources/go-gin-server/routers.mustache @@ -3,7 +3,6 @@ package {{packageName}} import ( "net/http" - "strings" "github.com/gin-gonic/gin" ) @@ -28,13 +27,13 @@ func NewRouter() *gin.Engine { router := gin.Default() for _, route := range routes { switch route.Method { - case "GET": + case http.MethodGet: router.GET(route.Pattern, route.HandlerFunc) - case "POST": + case http.MethodPost: router.POST(route.Pattern, route.HandlerFunc) - case "PUT": + case http.MethodPut: router.PUT(route.Pattern, route.HandlerFunc) - case "DELETE": + case http.MethodDelete: router.DELETE(route.Pattern, route.HandlerFunc) } } @@ -50,14 +49,14 @@ func Index(c *gin.Context) { var routes = Routes{ { "Index", - "GET", + http.MethodGet, "{{{basePathWithoutHost}}}/", Index, },{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}} { "{{operationId}}", - strings.ToUpper("{{httpMethod}}"), + http.Method{{httpMethod}}, "{{{basePathWithoutHost}}}{{{path}}}", {{operationId}}, },{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}} diff --git a/modules/openapi-generator/src/main/resources/go/client.mustache b/modules/openapi-generator/src/main/resources/go/client.mustache index 4fd2e926f1..71db41037b 100644 --- a/modules/openapi-generator/src/main/resources/go/client.mustache +++ b/modules/openapi-generator/src/main/resources/go/client.mustache @@ -376,7 +376,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e } else if jsonCheck.MatchString(contentType) { err = json.NewEncoder(bodyBuf).Encode(body) } else if xmlCheck.MatchString(contentType) { - xml.NewEncoder(bodyBuf).Encode(body) + err = xml.NewEncoder(bodyBuf).Encode(body) } if err != nil { diff --git a/modules/openapi-generator/src/main/resources/MSF4J/ApiException.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/ApiException.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/ApiException.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/ApiException.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/ApiOriginFilter.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/ApiOriginFilter.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/ApiOriginFilter.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/ApiOriginFilter.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/ApiResponseMessage.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/ApiResponseMessage.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/ApiResponseMessage.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/ApiResponseMessage.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/Application.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/Application.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/Application.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/Application.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/JodaDateTimeProvider.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/JodaDateTimeProvider.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/JodaDateTimeProvider.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/JodaDateTimeProvider.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/JodaLocalDateProvider.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/JodaLocalDateProvider.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/JodaLocalDateProvider.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/JodaLocalDateProvider.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/LocalDateProvider.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/LocalDateProvider.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/LocalDateProvider.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/LocalDateProvider.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/NotFoundException.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/NotFoundException.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/NotFoundException.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/NotFoundException.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/OffsetDateTimeProvider.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/OffsetDateTimeProvider.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/OffsetDateTimeProvider.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/OffsetDateTimeProvider.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/README.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/README.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/README.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/README.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/RFC3339DateFormat.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/RFC3339DateFormat.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/RFC3339DateFormat.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/RFC3339DateFormat.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/StringUtil.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/StringUtil.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/StringUtil.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/StringUtil.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/allowableValues.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/allowableValues.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/allowableValues.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/allowableValues.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/api.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/api.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/api.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/api.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/apiService.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/apiService.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/apiService.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/apiService.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/apiServiceFactory.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/apiServiceFactory.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/apiServiceFactory.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/apiServiceFactory.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/apiServiceImpl.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/apiServiceImpl.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/apiServiceImpl.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/apiServiceImpl.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/bodyParams.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/bodyParams.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/bodyParams.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/bodyParams.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/bootstrap.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/bootstrap.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/bootstrap.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/bootstrap.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/enumClass.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/enumClass.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/enumClass.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/enumClass.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/enumOuterClass.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/enumOuterClass.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/enumOuterClass.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/formParams.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/formParams.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/formParams.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/formParams.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/generatedAnnotation.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/generatedAnnotation.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/generatedAnnotation.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/headerParams.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/headerParams.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/headerParams.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/headerParams.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/jacksonJsonProvider.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/jacksonJsonProvider.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/jacksonJsonProvider.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/jacksonJsonProvider.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/model.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/model.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/model.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/model.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/pathParams.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/pathParams.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/pathParams.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/pathParams.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/pojo.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/pojo.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/pojo.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/pojo.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/pom.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/pom.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/pom.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/pom.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/queryParams.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/queryParams.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/queryParams.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/queryParams.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/returnTypes.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/returnTypes.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/returnTypes.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/returnTypes.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/serviceBodyParams.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/serviceBodyParams.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/serviceBodyParams.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/serviceBodyParams.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/serviceFormParams.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/serviceFormParams.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/serviceFormParams.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/serviceFormParams.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/serviceHeaderParams.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/serviceHeaderParams.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/serviceHeaderParams.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/serviceHeaderParams.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/servicePathParams.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/servicePathParams.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/servicePathParams.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/servicePathParams.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/serviceQueryParams.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/serviceQueryParams.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/serviceQueryParams.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/serviceQueryParams.mustache diff --git a/modules/openapi-generator/src/main/resources/MSF4J/web.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/web.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/MSF4J/web.mustache rename to modules/openapi-generator/src/main/resources/java-msf4j-server/web.mustache diff --git a/modules/openapi-generator/src/main/resources/undertow/README.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/README.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/undertow/README.mustache rename to modules/openapi-generator/src/main/resources/java-undertow-server/README.mustache diff --git a/modules/openapi-generator/src/main/resources/undertow/bodyParams.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/bodyParams.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/undertow/bodyParams.mustache rename to modules/openapi-generator/src/main/resources/java-undertow-server/bodyParams.mustache diff --git a/modules/openapi-generator/src/main/resources/undertow/enumClass.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/enumClass.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/undertow/enumClass.mustache rename to modules/openapi-generator/src/main/resources/java-undertow-server/enumClass.mustache diff --git a/modules/openapi-generator/src/main/resources/undertow/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/enumOuterClass.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/undertow/enumOuterClass.mustache rename to modules/openapi-generator/src/main/resources/java-undertow-server/enumOuterClass.mustache diff --git a/modules/openapi-generator/src/main/resources/undertow/formParams.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/formParams.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/undertow/formParams.mustache rename to modules/openapi-generator/src/main/resources/java-undertow-server/formParams.mustache diff --git a/modules/openapi-generator/src/main/resources/undertow/generatedAnnotation.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/generatedAnnotation.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/undertow/generatedAnnotation.mustache rename to modules/openapi-generator/src/main/resources/java-undertow-server/generatedAnnotation.mustache diff --git a/modules/openapi-generator/src/main/resources/undertow/handler.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/handler.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/undertow/handler.mustache rename to modules/openapi-generator/src/main/resources/java-undertow-server/handler.mustache diff --git a/modules/openapi-generator/src/main/resources/undertow/headerParams.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/headerParams.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/undertow/headerParams.mustache rename to modules/openapi-generator/src/main/resources/java-undertow-server/headerParams.mustache diff --git a/modules/openapi-generator/src/main/resources/undertow/inflector.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/inflector.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/undertow/inflector.mustache rename to modules/openapi-generator/src/main/resources/java-undertow-server/inflector.mustache diff --git a/modules/openapi-generator/src/main/resources/undertow/model.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/model.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/undertow/model.mustache rename to modules/openapi-generator/src/main/resources/java-undertow-server/model.mustache diff --git a/modules/openapi-generator/src/main/resources/undertow/openapi.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/openapi.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/undertow/openapi.mustache rename to modules/openapi-generator/src/main/resources/java-undertow-server/openapi.mustache diff --git a/modules/openapi-generator/src/main/resources/undertow/pathParams.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/pathParams.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/undertow/pathParams.mustache rename to modules/openapi-generator/src/main/resources/java-undertow-server/pathParams.mustache diff --git a/modules/openapi-generator/src/main/resources/undertow/pojo.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/pojo.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/undertow/pojo.mustache rename to modules/openapi-generator/src/main/resources/java-undertow-server/pojo.mustache diff --git a/modules/openapi-generator/src/main/resources/undertow/pom.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/pom.mustache similarity index 98% rename from modules/openapi-generator/src/main/resources/undertow/pom.mustache rename to modules/openapi-generator/src/main/resources/java-undertow-server/pom.mustache index fb2d88c9f4..b45ae15ccd 100644 --- a/modules/openapi-generator/src/main/resources/undertow/pom.mustache +++ b/modules/openapi-generator/src/main/resources/java-undertow-server/pom.mustache @@ -16,8 +16,8 @@ 1.8 UTF-8 0.1.1 - 2.8.11 - 2.8.11.3 + 2.9.9 + 2.9.9 1.7.21 0.5.2 4.5.3 diff --git a/modules/openapi-generator/src/main/resources/undertow/primary.crt b/modules/openapi-generator/src/main/resources/java-undertow-server/primary.crt similarity index 100% rename from modules/openapi-generator/src/main/resources/undertow/primary.crt rename to modules/openapi-generator/src/main/resources/java-undertow-server/primary.crt diff --git a/modules/openapi-generator/src/main/resources/undertow/queryParams.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/queryParams.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/undertow/queryParams.mustache rename to modules/openapi-generator/src/main/resources/java-undertow-server/queryParams.mustache diff --git a/modules/openapi-generator/src/main/resources/undertow/security.json b/modules/openapi-generator/src/main/resources/java-undertow-server/security.json similarity index 100% rename from modules/openapi-generator/src/main/resources/undertow/security.json rename to modules/openapi-generator/src/main/resources/java-undertow-server/security.json diff --git a/modules/openapi-generator/src/main/resources/undertow/server.json b/modules/openapi-generator/src/main/resources/java-undertow-server/server.json similarity index 100% rename from modules/openapi-generator/src/main/resources/undertow/server.json rename to modules/openapi-generator/src/main/resources/java-undertow-server/server.json diff --git a/modules/openapi-generator/src/main/resources/undertow/service.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/service.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/undertow/service.mustache rename to modules/openapi-generator/src/main/resources/java-undertow-server/service.mustache diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/api.mustache index 012baf0fdc..6a38138788 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/api.mustache @@ -15,9 +15,6 @@ import {{packageName}}.infrastructure.RequestMethod import {{packageName}}.infrastructure.ResponseType import {{packageName}}.infrastructure.Success import {{packageName}}.infrastructure.toMultiValue -{{#threetenbp}} -import org.threeten.bp.LocalDateTime -{{/threetenbp}} {{#operations}} class {{classname}}(basePath: kotlin.String = "{{{basePath}}}") : ApiClient(basePath) { diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache index 0ab36cb774..6254c44ad9 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache @@ -30,9 +30,11 @@ test { dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - compile "com.squareup.moshi:moshi-kotlin:1.5.0" - compile "com.squareup.moshi:moshi-adapters:1.5.0" - compile "com.squareup.okhttp3:okhttp:3.14.0" + compile "com.squareup.moshi:moshi-kotlin:1.8.0" + compile "com.squareup.moshi:moshi-adapters:1.8.0" + compile "com.squareup.okhttp3:okhttp:3.14.2" + {{#threetenbp}} compile "org.threeten:threetenbp:1.3.8" + {{/threetenbp}} testImplementation "io.kotlintest:kotlintest-runner-junit5:3.1.0" } diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/ApiClient.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/ApiClient.kt.mustache index c0d5371c00..5a6872871a 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/ApiClient.kt.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/ApiClient.kt.mustache @@ -1,8 +1,5 @@ package {{packageName}}.infrastructure -import com.squareup.moshi.FromJson -import com.squareup.moshi.Moshi -import com.squareup.moshi.ToJson import okhttp3.OkHttpClient import okhttp3.RequestBody import okhttp3.MediaType @@ -11,7 +8,6 @@ import okhttp3.HttpUrl import okhttp3.ResponseBody import okhttp3.Request import java.io.File -import java.util.UUID open class ApiClient(val baseUrl: String) { companion object { @@ -23,7 +19,7 @@ open class ApiClient(val baseUrl: String) { protected const val XmlMediaType = "application/xml" @JvmStatic - val client by lazy { + val client: OkHttpClient by lazy { builder.build() } @@ -37,13 +33,13 @@ open class ApiClient(val baseUrl: String) { MediaType.parse(mediaType), content ) mediaType == FormDataMediaType || mediaType == FormUrlEncMediaType -> { - var builder = FormBody.Builder() - // content's type *must* be Map - @Suppress("UNCHECKED_CAST") - (content as Map).forEach { key, value -> - builder = builder.add(key, value) - } - builder.build() + FormBody.Builder().apply { + // content's type *must* be Map + @Suppress("UNCHECKED_CAST") + (content as Map).forEach { (key, value) -> + add(key, value) + } + }.build() } mediaType == JsonMediaType -> RequestBody.create( MediaType.parse(mediaType), Serializer.moshi.adapter(T::class.java).toJson(content) @@ -58,18 +54,11 @@ open class ApiClient(val baseUrl: String) { return null } val bodyContent = body.string() - if (bodyContent.length == 0) { + if (bodyContent.isEmpty()) { return null } return when(mediaType) { - JsonMediaType -> Moshi.Builder().add(object { - @ToJson - fun toJson(uuid: UUID) = uuid.toString() - @FromJson - fun fromJson(s: String) = UUID.fromString(s) - }) - .add(ByteArrayAdapter()) - .build().adapter(T::class.java).fromJson(bodyContent) + JsonMediaType -> Serializer.moshi.adapter(T::class.java).fromJson(bodyContent) else -> TODO("responseBody currently only supports JSON body.") } } @@ -77,23 +66,22 @@ open class ApiClient(val baseUrl: String) { protected inline fun request(requestConfig: RequestConfig, body : Any? = null): ApiInfrastructureResponse { val httpUrl = HttpUrl.parse(baseUrl) ?: throw IllegalStateException("baseUrl is invalid.") - var urlBuilder = httpUrl.newBuilder() - .addPathSegments(requestConfig.path.trimStart('/')) - - requestConfig.query.forEach { query -> - query.value.forEach { queryValue -> - urlBuilder = urlBuilder.addQueryParameter(query.key, queryValue) - } - } - - val url = urlBuilder.build() + val url = httpUrl.newBuilder() + .addPathSegments(requestConfig.path.trimStart('/')) + .apply { + requestConfig.query.forEach { query -> + query.value.forEach { queryValue -> + addQueryParameter(query.key, queryValue) + } + } + }.build() // take content-type/accept from spec or set to default (application/json) if not defined if (requestConfig.headers[ContentType].isNullOrEmpty()) { - requestConfig.headers.put(ContentType, JsonMediaType) + requestConfig.headers[ContentType] = JsonMediaType } if (requestConfig.headers[Accept].isNullOrEmpty()) { - requestConfig.headers.put(Accept, JsonMediaType) + requestConfig.headers[Accept] = JsonMediaType } val headers = requestConfig.headers @@ -108,7 +96,7 @@ open class ApiClient(val baseUrl: String) { // TODO: support multiple contentType options here. val contentType = (headers[ContentType] as String).substringBefore(";").toLowerCase() - var request : Request.Builder = when (requestConfig.method) { + val request = when (requestConfig.method) { RequestMethod.DELETE -> Request.Builder().url(url).delete() RequestMethod.GET -> Request.Builder().url(url) RequestMethod.HEAD -> Request.Builder().url(url).head() @@ -116,12 +104,11 @@ open class ApiClient(val baseUrl: String) { RequestMethod.PUT -> Request.Builder().url(url).put(requestBody(body, contentType)) RequestMethod.POST -> Request.Builder().url(url).post(requestBody(body, contentType)) RequestMethod.OPTIONS -> Request.Builder().url(url).method("OPTIONS", null) - } + }.apply { + headers.forEach { header -> addHeader(header.key, header.value) } + }.build() - headers.forEach { header -> request = request.addHeader(header.key, header.value) } - - val realRequest = request.build() - val response = client.newCall(realRequest).execute() + val response = client.newCall(request).execute() val accept = response.header(ContentType)?.substringBefore(";")?.toLowerCase() // TODO: handle specific mapping types. e.g. Map> @@ -153,4 +140,4 @@ open class ApiClient(val baseUrl: String) { ) } } -} \ No newline at end of file +} diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/LocalDateAdapter.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/LocalDateAdapter.kt.mustache new file mode 100644 index 0000000000..5f5d93af65 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/LocalDateAdapter.kt.mustache @@ -0,0 +1,25 @@ +package {{packageName}}.infrastructure + +import com.squareup.moshi.FromJson +import com.squareup.moshi.ToJson +{{^threetenbp}} +import java.time.LocalDate +import java.time.format.DateTimeFormatter +{{/threetenbp}} +{{#threetenbp}} +import org.threeten.bp.LocalDate +import org.threeten.bp.format.DateTimeFormatter +{{/threetenbp}} + +class LocalDateAdapter { + @ToJson + fun toJson(value: LocalDate): String { + return DateTimeFormatter.ISO_LOCAL_DATE.format(value) + } + + @FromJson + fun fromJson(value: String): LocalDate { + return LocalDate.parse(value, DateTimeFormatter.ISO_LOCAL_DATE) + } + +} diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/LocalDateTimeAdapter.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/LocalDateTimeAdapter.kt.mustache new file mode 100644 index 0000000000..765144bad5 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/LocalDateTimeAdapter.kt.mustache @@ -0,0 +1,25 @@ +package {{packageName}}.infrastructure + +import com.squareup.moshi.FromJson +import com.squareup.moshi.ToJson +{{^threetenbp}} +import java.time.LocalDateTime +import java.time.format.DateTimeFormatter +{{/threetenbp}} +{{#threetenbp}} +import org.threeten.bp.LocalDateTime +import org.threeten.bp.format.DateTimeFormatter +{{/threetenbp}} + +class LocalDateTimeAdapter { + @ToJson + fun toJson(value: LocalDateTime): String { + return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(value) + } + + @FromJson + fun fromJson(value: String): LocalDateTime { + return LocalDateTime.parse(value, DateTimeFormatter.ISO_LOCAL_DATE_TIME) + } + +} diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/Serializer.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/Serializer.kt.mustache index 9d448cb9a7..b370c468c6 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/Serializer.kt.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/Serializer.kt.mustache @@ -1,14 +1,18 @@ package {{packageName}}.infrastructure -import com.squareup.moshi.KotlinJsonAdapterFactory import com.squareup.moshi.Moshi -import com.squareup.moshi.Rfc3339DateJsonAdapter -import java.util.* +import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter +import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory +import java.util.Date object Serializer { @JvmStatic val moshi: Moshi = Moshi.Builder() - .add(KotlinJsonAdapterFactory()) .add(Date::class.java, Rfc3339DateJsonAdapter().nullSafe()) + .add(LocalDateTimeAdapter()) + .add(LocalDateAdapter()) + .add(UUIDAdapter()) + .add(ByteArrayAdapter()) + .add(KotlinJsonAdapterFactory()) .build() } diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/UUIDAdapter.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/UUIDAdapter.kt.mustache new file mode 100644 index 0000000000..cd973554cd --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-client/infrastructure/UUIDAdapter.kt.mustache @@ -0,0 +1,13 @@ +package {{packageName}}.infrastructure + +import com.squareup.moshi.FromJson +import com.squareup.moshi.ToJson +import java.util.UUID + +class UUIDAdapter { + @ToJson + fun toJson(uuid: UUID) = uuid.toString() + + @FromJson + fun fromJson(s: String) = UUID.fromString(s) +} diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/model.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/model.mustache index f0c5a9bb4a..b9514dad4d 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/model.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/model.mustache @@ -3,9 +3,6 @@ package {{modelPackage}} {{#imports}}import {{import}} {{/imports}} -{{#threetenbp}} -import org.threeten.bp.LocalDateTime -{{/threetenbp}} {{#models}} {{#model}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/api_test.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/api_test.mustache new file mode 100644 index 0000000000..f94e84c24d --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/api_test.mustache @@ -0,0 +1,33 @@ +package {{package}} + +{{#imports}}import {{import}} +{{/imports}} +import org.junit.jupiter.api.Test + +import org.springframework.http.ResponseEntity + +class {{classname}}Test { + + {{#serviceInterface}}private val service: {{classname}}Service = {{classname}}ServiceImpl(){{/serviceInterface}} + private val api: {{classname}}Controller = {{classname}}Controller({{#serviceInterface}}service{{/serviceInterface}}) + + {{#operations}}{{#operation}} + /** + * {{summary}} + * + * {{notes}} + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun {{operationId}}Test() { + {{#allParams}} + val {{paramName}}:{{{dataType}}}? = null + {{/allParams}} + val response: ResponseEntity<{{>returnTypes}}> = api.{{operationId}}({{#allParams}}{{paramName}}!!{{#hasMore}}, {{/hasMore}}{{/allParams}}) + + // TODO: test validations + } + {{/operation}}{{/operations}} +} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradleKts.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradleKts.mustache index a36b054d63..571f0179fa 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradleKts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradleKts.mustache @@ -42,6 +42,7 @@ dependencies { compile("com.fasterxml.jackson.dataformat:jackson-dataformat-xml") compile("com.fasterxml.jackson.module:jackson-module-kotlin") + testCompile("org.jetbrains.kotlin:kotlin-test-junit5") testCompile("org.springframework.boot:spring-boot-starter-test") { exclude(module = "junit") } diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache index bc74aa267d..e552565e4a 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache @@ -109,5 +109,11 @@ validation-api {{/useBeanValidation}} + + org.jetbrains.kotlin + kotlin-test-junit5 + 1.3.31 + test + diff --git a/modules/openapi-generator/src/main/resources/ze-ph/.gitignore b/modules/openapi-generator/src/main/resources/php-ze-ph/.gitignore similarity index 100% rename from modules/openapi-generator/src/main/resources/ze-ph/.gitignore rename to modules/openapi-generator/src/main/resources/php-ze-ph/.gitignore diff --git a/modules/openapi-generator/src/main/resources/ze-ph/Date.php.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/Date.php.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/ze-ph/Date.php.mustache rename to modules/openapi-generator/src/main/resources/php-ze-ph/Date.php.mustache diff --git a/modules/openapi-generator/src/main/resources/ze-ph/DateTime.php.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/DateTime.php.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/ze-ph/DateTime.php.mustache rename to modules/openapi-generator/src/main/resources/php-ze-ph/DateTime.php.mustache diff --git a/modules/openapi-generator/src/main/resources/ze-ph/Factory.php.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/Factory.php.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/ze-ph/Factory.php.mustache rename to modules/openapi-generator/src/main/resources/php-ze-ph/Factory.php.mustache diff --git a/modules/openapi-generator/src/main/resources/ze-ph/InternalServerError.php.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/InternalServerError.php.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/ze-ph/InternalServerError.php.mustache rename to modules/openapi-generator/src/main/resources/php-ze-ph/InternalServerError.php.mustache diff --git a/modules/openapi-generator/src/main/resources/ze-ph/QueryParameter.php.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/QueryParameter.php.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/ze-ph/QueryParameter.php.mustache rename to modules/openapi-generator/src/main/resources/php-ze-ph/QueryParameter.php.mustache diff --git a/modules/openapi-generator/src/main/resources/ze-ph/QueryParameterArray.php.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/QueryParameterArray.php.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/ze-ph/QueryParameterArray.php.mustache rename to modules/openapi-generator/src/main/resources/php-ze-ph/QueryParameterArray.php.mustache diff --git a/modules/openapi-generator/src/main/resources/ze-ph/QueryParameterArrayType.php.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/QueryParameterArrayType.php.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/ze-ph/QueryParameterArrayType.php.mustache rename to modules/openapi-generator/src/main/resources/php-ze-ph/QueryParameterArrayType.php.mustache diff --git a/modules/openapi-generator/src/main/resources/ze-ph/QueryParameterType.php.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/QueryParameterType.php.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/ze-ph/QueryParameterType.php.mustache rename to modules/openapi-generator/src/main/resources/php-ze-ph/QueryParameterType.php.mustache diff --git a/modules/openapi-generator/src/main/resources/ze-ph/README.md.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/README.md.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/ze-ph/README.md.mustache rename to modules/openapi-generator/src/main/resources/php-ze-ph/README.md.mustache diff --git a/modules/openapi-generator/src/main/resources/ze-ph/Type.php.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/Type.php.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/ze-ph/Type.php.mustache rename to modules/openapi-generator/src/main/resources/php-ze-ph/Type.php.mustache diff --git a/modules/openapi-generator/src/main/resources/ze-ph/api.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/api.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/ze-ph/api.mustache rename to modules/openapi-generator/src/main/resources/php-ze-ph/api.mustache diff --git a/modules/openapi-generator/src/main/resources/ze-ph/app.yml.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/app.yml.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/ze-ph/app.yml.mustache rename to modules/openapi-generator/src/main/resources/php-ze-ph/app.yml.mustache diff --git a/modules/openapi-generator/src/main/resources/ze-ph/composer.json.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/composer.json.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/ze-ph/composer.json.mustache rename to modules/openapi-generator/src/main/resources/php-ze-ph/composer.json.mustache diff --git a/modules/openapi-generator/src/main/resources/ze-ph/config.yml b/modules/openapi-generator/src/main/resources/php-ze-ph/config.yml similarity index 100% rename from modules/openapi-generator/src/main/resources/ze-ph/config.yml rename to modules/openapi-generator/src/main/resources/php-ze-ph/config.yml diff --git a/modules/openapi-generator/src/main/resources/ze-ph/container.php b/modules/openapi-generator/src/main/resources/php-ze-ph/container.php similarity index 100% rename from modules/openapi-generator/src/main/resources/ze-ph/container.php rename to modules/openapi-generator/src/main/resources/php-ze-ph/container.php diff --git a/modules/openapi-generator/src/main/resources/ze-ph/data_transfer.yml.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/data_transfer.yml.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/ze-ph/data_transfer.yml.mustache rename to modules/openapi-generator/src/main/resources/php-ze-ph/data_transfer.yml.mustache diff --git a/modules/openapi-generator/src/main/resources/ze-ph/index.php b/modules/openapi-generator/src/main/resources/php-ze-ph/index.php similarity index 100% rename from modules/openapi-generator/src/main/resources/ze-ph/index.php rename to modules/openapi-generator/src/main/resources/php-ze-ph/index.php diff --git a/modules/openapi-generator/src/main/resources/ze-ph/model.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/model.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/ze-ph/model.mustache rename to modules/openapi-generator/src/main/resources/php-ze-ph/model.mustache diff --git a/modules/openapi-generator/src/main/resources/ze-ph/model_normal_var.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/model_normal_var.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/ze-ph/model_normal_var.mustache rename to modules/openapi-generator/src/main/resources/php-ze-ph/model_normal_var.mustache diff --git a/modules/openapi-generator/src/main/resources/ze-ph/model_query_var.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/model_query_var.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/ze-ph/model_query_var.mustache rename to modules/openapi-generator/src/main/resources/php-ze-ph/model_query_var.mustache diff --git a/modules/openapi-generator/src/main/resources/ze-ph/path_handler.yml.mustache b/modules/openapi-generator/src/main/resources/php-ze-ph/path_handler.yml.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/ze-ph/path_handler.yml.mustache rename to modules/openapi-generator/src/main/resources/php-ze-ph/path_handler.yml.mustache diff --git a/modules/openapi-generator/src/main/resources/php/api.mustache b/modules/openapi-generator/src/main/resources/php/api.mustache index 6fac0d0748..1debf08569 100644 --- a/modules/openapi-generator/src/main/resources/php/api.mustache +++ b/modules/openapi-generator/src/main/resources/php/api.mustache @@ -178,7 +178,7 @@ use {{invokerPackage}}\ObjectSerializer; */ public function {{operationId}}WithHttpInfo({{^vendorExtensions.x-group-parameters}}{{#allParams}}${{paramName}}{{^required}} = {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}$associative_array{{/vendorExtensions.x-group-parameters}}) { - $request = $this->{{operationId}}Request({{^vendorExtensions.x-group-parameters}}{{#allParams}}${{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}{{#allParams}}$associative_array['{{paramName}}']{{#hasMore}}, {{/hasMore}}{{/allParams}}{{/vendorExtensions.x-group-parameters}}); + $request = $this->{{operationId}}Request({{^vendorExtensions.x-group-parameters}}{{#allParams}}${{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}{{/vendorExtensions.x-group-parameters}}{{#vendorExtensions.x-group-parameters}}$associative_array{{/vendorExtensions.x-group-parameters}}); try { $options = $this->createHttpClientOption(); diff --git a/modules/openapi-generator/src/main/resources/python-aiohttp/typing_utils.mustache b/modules/openapi-generator/src/main/resources/python-aiohttp/typing_utils.mustache new file mode 100644 index 0000000000..0563f81fd5 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/python-aiohttp/typing_utils.mustache @@ -0,0 +1,32 @@ +# coding: utf-8 + +import sys + +if sys.version_info < (3, 7): + import typing + + def is_generic(klass): + """ Determine whether klass is a generic class """ + return type(klass) == typing.GenericMeta + + def is_dict(klass): + """ Determine whether klass is a Dict """ + return klass.__extra__ == dict + + def is_list(klass): + """ Determine whether klass is a List """ + return klass.__extra__ == list + +else: + + def is_generic(klass): + """ Determine whether klass is a generic class """ + return hasattr(klass, '__origin__') + + def is_dict(klass): + """ Determine whether klass is a Dict """ + return klass.__origin__ == dict + + def is_list(klass): + """ Determine whether klass is a List """ + return klass.__origin__ == list diff --git a/modules/openapi-generator/src/main/resources/python-aiohttp/util.mustache b/modules/openapi-generator/src/main/resources/python-aiohttp/util.mustache index 9263acb016..1b1eadc7ee 100644 --- a/modules/openapi-generator/src/main/resources/python-aiohttp/util.mustache +++ b/modules/openapi-generator/src/main/resources/python-aiohttp/util.mustache @@ -2,6 +2,7 @@ import datetime import typing from typing import Union +from {{packageName}} import typing_utils T = typing.TypeVar('T') Class = typing.Type[T] @@ -26,10 +27,10 @@ def _deserialize(data: Union[dict, list, str], klass: Union[Class, str]) -> Unio return deserialize_date(data) elif klass == datetime.datetime: return deserialize_datetime(data) - elif type(klass) == typing.GenericMeta: - if klass.__extra__ == list: + elif typing_utils.is_generic(klass): + if typing_utils.is_list(klass): return _deserialize_list(data, klass.__args__[0]) - if klass.__extra__ == dict: + if typing_utils.is_dict(klass): return _deserialize_dict(data, klass.__args__[1]) else: return deserialize_model(data, klass) diff --git a/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/typing_utils.mustache b/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/typing_utils.mustache new file mode 100644 index 0000000000..0563f81fd5 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/typing_utils.mustache @@ -0,0 +1,32 @@ +# coding: utf-8 + +import sys + +if sys.version_info < (3, 7): + import typing + + def is_generic(klass): + """ Determine whether klass is a generic class """ + return type(klass) == typing.GenericMeta + + def is_dict(klass): + """ Determine whether klass is a Dict """ + return klass.__extra__ == dict + + def is_list(klass): + """ Determine whether klass is a List """ + return klass.__extra__ == list + +else: + + def is_generic(klass): + """ Determine whether klass is a generic class """ + return hasattr(klass, '__origin__') + + def is_dict(klass): + """ Determine whether klass is a Dict """ + return klass.__origin__ == dict + + def is_list(klass): + """ Determine whether klass is a List """ + return klass.__origin__ == list diff --git a/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/util.mustache b/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/util.mustache index 527d1424c3..9763c8fc85 100644 --- a/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/util.mustache +++ b/modules/openapi-generator/src/main/resources/python-blueplanet/app/{{packageName}}/util.mustache @@ -2,6 +2,7 @@ import datetime import six import typing +from {{packageName}} import typing_utils def _deserialize(data, klass): @@ -23,10 +24,10 @@ def _deserialize(data, klass): return deserialize_date(data) elif klass == datetime.datetime: return deserialize_datetime(data) - elif type(klass) == typing.GenericMeta: - if klass.__extra__ == list: + elif typing_utils.is_generic(klass): + if typing_utils.is_list(klass): return _deserialize_list(data, klass.__args__[0]) - if klass.__extra__ == dict: + if typing_utils.is_dict(klass): return _deserialize_dict(data, klass.__args__[1]) else: return deserialize_model(data, klass) diff --git a/modules/openapi-generator/src/main/resources/python-flask/typing_utils.mustache b/modules/openapi-generator/src/main/resources/python-flask/typing_utils.mustache new file mode 100644 index 0000000000..0563f81fd5 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/python-flask/typing_utils.mustache @@ -0,0 +1,32 @@ +# coding: utf-8 + +import sys + +if sys.version_info < (3, 7): + import typing + + def is_generic(klass): + """ Determine whether klass is a generic class """ + return type(klass) == typing.GenericMeta + + def is_dict(klass): + """ Determine whether klass is a Dict """ + return klass.__extra__ == dict + + def is_list(klass): + """ Determine whether klass is a List """ + return klass.__extra__ == list + +else: + + def is_generic(klass): + """ Determine whether klass is a generic class """ + return hasattr(klass, '__origin__') + + def is_dict(klass): + """ Determine whether klass is a Dict """ + return klass.__origin__ == dict + + def is_list(klass): + """ Determine whether klass is a List """ + return klass.__origin__ == list diff --git a/modules/openapi-generator/src/main/resources/python-flask/util.mustache b/modules/openapi-generator/src/main/resources/python-flask/util.mustache index c7340cd000..30ba3247ee 100644 --- a/modules/openapi-generator/src/main/resources/python-flask/util.mustache +++ b/modules/openapi-generator/src/main/resources/python-flask/util.mustache @@ -2,6 +2,7 @@ import datetime import six import typing +from {{packageName}} import typing_utils def _deserialize(data, klass): @@ -23,10 +24,10 @@ def _deserialize(data, klass): return deserialize_date(data) elif klass == datetime.datetime: return deserialize_datetime(data) - elif type(klass) == typing.GenericMeta: - if klass.__extra__ == list: + elif typing_utils.is_generic(klass): + if typing_utils.is_list(klass): return _deserialize_list(data, klass.__args__[0]) - if klass.__extra__ == dict: + if typing_utils.is_dict(klass): return _deserialize_dict(data, klass.__args__[1]) else: return deserialize_model(data, klass) diff --git a/modules/openapi-generator/src/main/resources/python/__init__test.mustache b/modules/openapi-generator/src/main/resources/python/__init__.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/python/__init__test.mustache rename to modules/openapi-generator/src/main/resources/python/__init__.mustache diff --git a/modules/openapi-generator/src/main/resources/python/api.mustache b/modules/openapi-generator/src/main/resources/python/api.mustache index e1f9f53dca..590299dc5f 100644 --- a/modules/openapi-generator/src/main/resources/python/api.mustache +++ b/modules/openapi-generator/src/main/resources/python/api.mustache @@ -46,20 +46,23 @@ class {{classname}}(object): {{/sortParamsByRequiredFlag}} >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously {{#allParams}} :param {{dataType}} {{paramName}}:{{#description}} {{{description}}}{{/description}}{{#required}} (required){{/required}}{{#optional}}(optional){{/optional}} {{/allParams}} + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}None{{/returnType}} If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.{{operationId}}_with_http_info({{#sortParamsByRequiredFlag}}{{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}{{/sortParamsByRequiredFlag}}**kwargs) # noqa: E501 - else: - (data) = self.{{operationId}}_with_http_info({{#sortParamsByRequiredFlag}}{{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}{{/sortParamsByRequiredFlag}}**kwargs) # noqa: E501 - return data + return self.{{operationId}}_with_http_info({{#sortParamsByRequiredFlag}}{{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}{{/sortParamsByRequiredFlag}}**kwargs) # noqa: E501 def {{operationId}}_with_http_info(self, {{#sortParamsByRequiredFlag}}{{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}{{/sortParamsByRequiredFlag}}**kwargs): # noqa: E501 """{{#summary}}{{{.}}}{{/summary}}{{^summary}}{{operationId}}{{/summary}} # noqa: E501 @@ -77,11 +80,20 @@ class {{classname}}(object): {{/sortParamsByRequiredFlag}} >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously {{#allParams}} :param {{dataType}} {{paramName}}:{{#description}} {{{description}}}{{/description}}{{#required}} (required){{/required}}{{#optional}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/optional}} {{/allParams}} - :return: {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}None{{/returnType}} + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: {{#returnType}}tuple({{returnType}}, status_code(int), headers(HTTPHeaderDict)){{/returnType}}{{^returnType}}None{{/returnType}} If the method is called asynchronously, returns the request thread. """ diff --git a/modules/openapi-generator/src/main/resources/python/api_doc.mustache b/modules/openapi-generator/src/main/resources/python/api_doc.mustache index 210ac86d2e..1df5389c5c 100644 --- a/modules/openapi-generator/src/main/resources/python/api_doc.mustache +++ b/modules/openapi-generator/src/main/resources/python/api_doc.mustache @@ -61,6 +61,15 @@ Name | Type | Description | Notes - **Content-Type**: {{#consumes}}{{{mediaType}}}{{#hasMore}}, {{/hasMore}}{{/consumes}}{{^consumes}}Not defined{{/consumes}} - **Accept**: {{#produces}}{{{mediaType}}}{{#hasMore}}, {{/hasMore}}{{/produces}}{{^produces}}Not defined{{/produces}} +{{#responses.0}} +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +{{#responses}} +**{{code}}** | {{message}} | {{#headers}} * {{baseName}} - {{description}}
{{/headers}}{{^headers.0}} - {{/headers.0}} | +{{/responses}} +{{/responses.0}} + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/python/configuration.mustache b/modules/openapi-generator/src/main/resources/python/configuration.mustache index a1a7e9babf..b6c134aa1c 100644 --- a/modules/openapi-generator/src/main/resources/python/configuration.mustache +++ b/modules/openapi-generator/src/main/resources/python/configuration.mustache @@ -19,9 +19,9 @@ class TypeWithDefault(type): super(TypeWithDefault, cls).__init__(name, bases, dct) cls._default = None - def __call__(cls): + def __call__(cls, **kwargs): if cls._default is None: - cls._default = type.__call__(cls) + cls._default = type.__call__(cls, **kwargs) return copy.copy(cls._default) def set_default(cls, default): @@ -33,77 +33,109 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)): Ref: https://openapi-generator.tech Do not edit the class manually. + + :param host: Base url + :param api_key: Dict to store API key(s) + :param api_key_prefix: Dict to store API prefix (e.g. Bearer) + :param username: Username for HTTP basic authentication + :param password: Password for HTTP basic authentication """ - def __init__(self): - """Constructor""" - # Default Base url - self.host = "{{{basePath}}}" - # Temp file folder for downloading files + def __init__(self, host="{{{basePath}}}", + api_key={}, api_key_prefix={}, + username="", password=""): + """Constructor + """ + self.host = host + """Default Base url + """ self.temp_folder_path = None - + """Temp file folder for downloading files + """ # Authentication Settings - # dict to store API key(s) - self.api_key = {} - # dict to store API prefix (e.g. Bearer) - self.api_key_prefix = {} - # Username for HTTP basic authentication - self.username = "" - # Password for HTTP basic authentication - self.password = "" + self.api_key = api_key + """dict to store API key(s) + """ + self.api_key_prefix = api_key_prefix + """dict to store API prefix (e.g. Bearer) + """ + self.username = username + """Username for HTTP basic authentication + """ + self.password = password + """Password for HTTP basic authentication + """ {{#hasOAuthMethods}} - # access token for OAuth/Bearer self.access_token = "" + """access token for OAuth/Bearer + """ {{/hasOAuthMethods}} {{^hasOAuthMethods}} {{#hasBearerMethods}} - # access token for OAuth/Bearer self.access_token = "" + """access token for OAuth/Bearer + """ {{/hasBearerMethods}} {{/hasOAuthMethods}} - # Logging Settings self.logger = {} + """Logging Settings + """ self.logger["package_logger"] = logging.getLogger("{{packageName}}") self.logger["urllib3_logger"] = logging.getLogger("urllib3") - # Log format self.logger_format = '%(asctime)s %(levelname)s %(message)s' - # Log stream handler + """Log format + """ self.logger_stream_handler = None - # Log file handler + """Log stream handler + """ self.logger_file_handler = None - # Debug file location + """Log file handler + """ self.logger_file = None - # Debug switch + """Debug file location + """ self.debug = False + """Debug switch + """ - # SSL/TLS verification - # Set this to false to skip verifying SSL certificate when calling API - # from https server. self.verify_ssl = True - # Set this to customize the certificate file to verify the peer. + """SSL/TLS verification + Set this to false to skip verifying SSL certificate when calling API + from https server. + """ self.ssl_ca_cert = None - # client certificate file + """Set this to customize the certificate file to verify the peer. + """ self.cert_file = None - # client key file + """client certificate file + """ self.key_file = None - # Set this to True/False to enable/disable SSL hostname verification. + """client key file + """ self.assert_hostname = None + """Set this to True/False to enable/disable SSL hostname verification. + """ - # urllib3 connection pool's maximum number of connections saved - # per pool. urllib3 uses 1 connection as default value, but this is - # not the best value when you are making a lot of possibly parallel - # requests to the same host, which is often the case here. - # cpu_count * 5 is used as default value to increase performance. self.connection_pool_maxsize = multiprocessing.cpu_count() * 5 + """urllib3 connection pool's maximum number of connections saved + per pool. urllib3 uses 1 connection as default value, but this is + not the best value when you are making a lot of possibly parallel + requests to the same host, which is often the case here. + cpu_count * 5 is used as default value to increase performance. + """ - # Proxy URL self.proxy = None - # Proxy headers + """Proxy URL + """ self.proxy_headers = None - # Safe chars for path_param + """Proxy headers + """ self.safe_chars_for_path_param = '' - # Adding retries to override urllib3 default value 3 + """Safe chars for path_param + """ self.retries = None + """Adding retries to override urllib3 default value 3 + """ @property def logger_file(self): diff --git a/modules/openapi-generator/src/main/resources/ruby-client/api.mustache b/modules/openapi-generator/src/main/resources/ruby-client/api.mustache index 8483305656..c92659ff2b 100644 --- a/modules/openapi-generator/src/main/resources/ruby-client/api.mustache +++ b/modules/openapi-generator/src/main/resources/ruby-client/api.mustache @@ -3,6 +3,7 @@ =end require 'uri' +require 'cgi' module {{moduleName}} {{#operations}} @@ -123,7 +124,7 @@ module {{moduleName}} {{/hasValidation}} {{/allParams}} # resource path - local_var_path = '{{{path}}}'{{#pathParams}}.sub('{' + '{{baseName}}' + '}', {{paramName}}.to_s){{/pathParams}} + local_var_path = '{{{path}}}'{{#pathParams}}.sub('{' + '{{baseName}}' + '}', CGI.escape({{paramName}}.to_s)){{/pathParams}} # query parameters query_params = opts[:query_params] || {} diff --git a/modules/openapi-generator/src/main/resources/finch/DataAccessor.mustache b/modules/openapi-generator/src/main/resources/scala-finch/DataAccessor.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/finch/DataAccessor.mustache rename to modules/openapi-generator/src/main/resources/scala-finch/DataAccessor.mustache diff --git a/modules/openapi-generator/src/main/resources/finch/JsonUtil.scala b/modules/openapi-generator/src/main/resources/scala-finch/JsonUtil.scala similarity index 100% rename from modules/openapi-generator/src/main/resources/finch/JsonUtil.scala rename to modules/openapi-generator/src/main/resources/scala-finch/JsonUtil.scala diff --git a/modules/openapi-generator/src/main/resources/finch/README.mustache b/modules/openapi-generator/src/main/resources/scala-finch/README.mustache similarity index 64% rename from modules/openapi-generator/src/main/resources/finch/README.mustache rename to modules/openapi-generator/src/main/resources/scala-finch/README.mustache index 4a1526522b..099ac4d904 100644 --- a/modules/openapi-generator/src/main/resources/finch/README.mustache +++ b/modules/openapi-generator/src/main/resources/scala-finch/README.mustache @@ -5,11 +5,8 @@ This server was generated by the [OpenAPI Generator](https://openapi-generator.t [OpenAPI-Spec](https://openapis.org) from a remote server, you can easily generate a server stub. This is an example of building a OpenAPI-enabled scalatra server. -This example uses the [finch](http://github.com/finagle/finch/) framework. To see how to make this your own, look here: - -[README](https://github.com/openapitools/openapi-generator/master/samples/server-generator/finch) - +This example uses the [finch](http://github.com/finagle/finch/) framework. ### After generation -Run `scalafix RemoveUnusedImports` to cleanup unused imports. \ No newline at end of file +Run `scalafix RemoveUnusedImports` to cleanup unused imports. diff --git a/modules/openapi-generator/src/main/resources/finch/Server.mustache b/modules/openapi-generator/src/main/resources/scala-finch/Server.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/finch/Server.mustache rename to modules/openapi-generator/src/main/resources/scala-finch/Server.mustache diff --git a/modules/openapi-generator/src/main/resources/finch/api.mustache b/modules/openapi-generator/src/main/resources/scala-finch/api.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/finch/api.mustache rename to modules/openapi-generator/src/main/resources/scala-finch/api.mustache diff --git a/modules/openapi-generator/src/main/resources/finch/bodyParam.mustache b/modules/openapi-generator/src/main/resources/scala-finch/bodyParam.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/finch/bodyParam.mustache rename to modules/openapi-generator/src/main/resources/scala-finch/bodyParam.mustache diff --git a/modules/openapi-generator/src/main/resources/finch/bodyParamOperation.mustache b/modules/openapi-generator/src/main/resources/scala-finch/bodyParamOperation.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/finch/bodyParamOperation.mustache rename to modules/openapi-generator/src/main/resources/scala-finch/bodyParamOperation.mustache diff --git a/modules/openapi-generator/src/main/resources/finch/build.sbt b/modules/openapi-generator/src/main/resources/scala-finch/build.sbt similarity index 100% rename from modules/openapi-generator/src/main/resources/finch/build.sbt rename to modules/openapi-generator/src/main/resources/scala-finch/build.sbt diff --git a/modules/openapi-generator/src/main/resources/finch/endpoint.mustache b/modules/openapi-generator/src/main/resources/scala-finch/endpoint.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/finch/endpoint.mustache rename to modules/openapi-generator/src/main/resources/scala-finch/endpoint.mustache diff --git a/modules/openapi-generator/src/main/resources/finch/errors.mustache b/modules/openapi-generator/src/main/resources/scala-finch/errors.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/finch/errors.mustache rename to modules/openapi-generator/src/main/resources/scala-finch/errors.mustache diff --git a/modules/openapi-generator/src/main/resources/finch/formParam.mustache b/modules/openapi-generator/src/main/resources/scala-finch/formParam.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/finch/formParam.mustache rename to modules/openapi-generator/src/main/resources/scala-finch/formParam.mustache diff --git a/modules/openapi-generator/src/main/resources/finch/formParamMustache.mustache b/modules/openapi-generator/src/main/resources/scala-finch/formParamMustache.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/finch/formParamMustache.mustache rename to modules/openapi-generator/src/main/resources/scala-finch/formParamMustache.mustache diff --git a/modules/openapi-generator/src/main/resources/finch/headerParam.mustache b/modules/openapi-generator/src/main/resources/scala-finch/headerParam.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/finch/headerParam.mustache rename to modules/openapi-generator/src/main/resources/scala-finch/headerParam.mustache diff --git a/modules/openapi-generator/src/main/resources/finch/headerParamOperation.mustache b/modules/openapi-generator/src/main/resources/scala-finch/headerParamOperation.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/finch/headerParamOperation.mustache rename to modules/openapi-generator/src/main/resources/scala-finch/headerParamOperation.mustache diff --git a/modules/openapi-generator/src/main/resources/finch/model.mustache b/modules/openapi-generator/src/main/resources/scala-finch/model.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/finch/model.mustache rename to modules/openapi-generator/src/main/resources/scala-finch/model.mustache diff --git a/modules/openapi-generator/src/main/resources/finch/pathParam.mustache b/modules/openapi-generator/src/main/resources/scala-finch/pathParam.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/finch/pathParam.mustache rename to modules/openapi-generator/src/main/resources/scala-finch/pathParam.mustache diff --git a/modules/openapi-generator/src/main/resources/finch/project/build.properties b/modules/openapi-generator/src/main/resources/scala-finch/project/build.properties similarity index 100% rename from modules/openapi-generator/src/main/resources/finch/project/build.properties rename to modules/openapi-generator/src/main/resources/scala-finch/project/build.properties diff --git a/modules/openapi-generator/src/main/resources/finch/project/plugins.sbt b/modules/openapi-generator/src/main/resources/scala-finch/project/plugins.sbt similarity index 100% rename from modules/openapi-generator/src/main/resources/finch/project/plugins.sbt rename to modules/openapi-generator/src/main/resources/scala-finch/project/plugins.sbt diff --git a/modules/openapi-generator/src/main/resources/finch/queryParam.mustache b/modules/openapi-generator/src/main/resources/scala-finch/queryParam.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/finch/queryParam.mustache rename to modules/openapi-generator/src/main/resources/scala-finch/queryParam.mustache diff --git a/modules/openapi-generator/src/main/resources/finch/queryParamOperation.mustache b/modules/openapi-generator/src/main/resources/scala-finch/queryParamOperation.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/finch/queryParamOperation.mustache rename to modules/openapi-generator/src/main/resources/scala-finch/queryParamOperation.mustache diff --git a/modules/openapi-generator/src/main/resources/finch/sbt b/modules/openapi-generator/src/main/resources/scala-finch/sbt old mode 100755 new mode 100644 similarity index 100% rename from modules/openapi-generator/src/main/resources/finch/sbt rename to modules/openapi-generator/src/main/resources/scala-finch/sbt diff --git a/modules/openapi-generator/src/main/resources/scala-httpclient/build.sbt.mustache b/modules/openapi-generator/src/main/resources/scala-httpclient/build.sbt.mustache index 6ecd89c0ea..328c251865 100644 --- a/modules/openapi-generator/src/main/resources/scala-httpclient/build.sbt.mustache +++ b/modules/openapi-generator/src/main/resources/scala-httpclient/build.sbt.mustache @@ -4,8 +4,8 @@ organization := "{{groupId}}" scalaVersion := "2.11.12" libraryDependencies ++= Seq( - "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.9.2", - "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.2", + "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.9.9", + "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9", "com.sun.jersey" % "jersey-core" % "1.19.4", "com.sun.jersey" % "jersey-client" % "1.19.4", "com.sun.jersey.contribs" % "jersey-multipart" % "1.19.4", diff --git a/modules/openapi-generator/src/main/resources/scala-httpclient/pom.mustache b/modules/openapi-generator/src/main/resources/scala-httpclient/pom.mustache index 495ff623d3..3f0d26bc5e 100644 --- a/modules/openapi-generator/src/main/resources/scala-httpclient/pom.mustache +++ b/modules/openapi-generator/src/main/resources/scala-httpclient/pom.mustache @@ -242,7 +242,7 @@ 1.5.18 1.0.5 1.0.0 - 2.9.2 + 2.9.9 4.12 3.1.5 diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/api.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/api.mustache index 13b63161d7..74e6058299 100644 --- a/modules/openapi-generator/src/main/resources/typescript-axios/api.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-axios/api.mustache @@ -3,7 +3,7 @@ {{>licenseInfo}} {{^withSeparateModelsAndApi}} -import * as url from 'url'; +import * as globalImportUrl from 'url'; import { Configuration } from './configuration'; import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from './base'; diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache index 9cfaf2aaa5..36f96f299a 100644 --- a/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache @@ -3,7 +3,7 @@ /// {{>licenseInfo}} -import * as url from 'url'; +import * as globalImportUrl from 'url'; import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; import { Configuration } from '{{apiRelativeToRoot}}configuration'; import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '{{apiRelativeToRoot}}base'; @@ -44,7 +44,7 @@ export const {{classname}}AxiosParamCreator = function (configuration?: Configur {{/allParams}} const localVarPath = `{{{path}}}`{{#pathParams}} .replace(`{${"{{baseName}}"}}`, encodeURIComponent(String({{paramName}}))){{/pathParams}}; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -188,7 +188,7 @@ export const {{classname}}AxiosParamCreator = function (configuration?: Configur {{/bodyParam}} return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache index 6f8038f5bd..cb7f747ea4 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache @@ -3,6 +3,8 @@ export const BASE_PATH = "{{{basePath}}}".replace(/\/+$/, ""); +const isBlob = (value: any) => typeof Blob !== 'undefined' && value instanceof Blob; + /** * This is the base class for all generated API classes. */ @@ -47,7 +49,9 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = context.body instanceof FormData ? context.body : JSON.stringify(context.body); + const body = (context.body instanceof FormData || isBlob(context.body)) + ? context.body + : JSON.stringify(context.body); const init = { method: context.method, headers: context.headers, diff --git a/modules/openapi-generator/src/main/resources/typescript-inversify/HttpClient.mustache b/modules/openapi-generator/src/main/resources/typescript-inversify/HttpClient.mustache index 64fe12a304..2599345d14 100644 --- a/modules/openapi-generator/src/main/resources/typescript-inversify/HttpClient.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-inversify/HttpClient.mustache @@ -1,28 +1,39 @@ import IHttpClient from "./IHttpClient"; + +{{^useRxJS6}} import { Observable } from "rxjs/Observable"; +{{/useRxJS6}} +{{#useRxJS6}} +import { Observable, from } from "rxjs"; +{{/useRxJS6}} + import "whatwg-fetch"; import HttpResponse from "./HttpResponse"; import {injectable} from "inversify"; -import "rxjs/add/observable/fromPromise"; import { Headers } from "./Headers"; @injectable() class HttpClient implements IHttpClient { get(url:string, headers?: Headers):Observable { - return this.performNetworkCall(url, "get", undefined, headers); + return this.performNetworkCall(url, "GET", undefined, headers); } post(url: string, body: {}|FormData, headers?: Headers): Observable { - return this.performNetworkCall(url, "post", this.getJsonBody(body), this.addJsonHeaders(headers)); + return this.performNetworkCall(url, "POST", this.getJsonBody(body), this.addJsonHeaders(headers)); } put(url: string, body: {}, headers?: Headers): Observable { - return this.performNetworkCall(url, "put", this.getJsonBody(body), this.addJsonHeaders(headers)); + return this.performNetworkCall(url, "PUT", this.getJsonBody(body), this.addJsonHeaders(headers)); } + patch(url: string, body: {}, headers?: Headers): Observable { + return this.performNetworkCall(url, "PATCH", this.getJsonBody(body), this.addJsonHeaders(headers)); + } + + delete(url: string, headers?: Headers): Observable { - return this.performNetworkCall(url, "delete", undefined, headers); + return this.performNetworkCall(url, "DELETE", undefined, headers); } private getJsonBody(body: {}|FormData) { @@ -56,7 +67,13 @@ class HttpClient implements IHttpClient { return httpResponse; }); }); - return Observable.fromPromise(promise); + + {{^useRxJS6}} + return Observable.fromPromise(promise); + {{/useRxJS6}} + {{#useRxJS6}} + return from(promise); + {{/useRxJS6}} } } diff --git a/modules/openapi-generator/src/main/resources/typescript-inversify/IHttpClient.mustache b/modules/openapi-generator/src/main/resources/typescript-inversify/IHttpClient.mustache index 22d9e07c90..8f89848190 100644 --- a/modules/openapi-generator/src/main/resources/typescript-inversify/IHttpClient.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-inversify/IHttpClient.mustache @@ -1,4 +1,9 @@ +{{^useRxJS6}} import { Observable } from "rxjs/Observable"; +{{/useRxJS6}} +{{#useRxJS6}} +import { Observable, from } from "rxjs"; +{{/useRxJS6}} import HttpResponse from "./HttpResponse"; import { Headers } from "./Headers"; @@ -6,6 +11,7 @@ interface IHttpClient { get(url:string, headers?: Headers):Observable post(url:string, body:{}|FormData, headers?: Headers):Observable put(url:string, body:{}, headers?: Headers):Observable + patch(url:string, body:{}, headers?: Headers):Observable delete(url:string, headers?: Headers):Observable } diff --git a/modules/openapi-generator/src/main/resources/typescript-inversify/api.service.mustache b/modules/openapi-generator/src/main/resources/typescript-inversify/api.service.mustache index 703a3d0573..547055863b 100644 --- a/modules/openapi-generator/src/main/resources/typescript-inversify/api.service.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-inversify/api.service.mustache @@ -1,9 +1,14 @@ {{>licenseInfo}} /* tslint:disable:no-unused-variable member-ordering */ +{{^useRxJS6}} import { Observable } from "rxjs/Observable"; -import 'rxjs/add/operator/map'; -import 'rxjs/add/operator/toPromise'; +{{/useRxJS6}} +{{#useRxJS6}} +import { Observable } from "rxjs"; +{{/useRxJS6}} + +import { map } from "rxjs/operators"; import IHttpClient from "../IHttpClient"; import { inject, injectable } from "inversify"; import { IAPIConfiguration } from "../IAPIConfiguration"; @@ -11,12 +16,12 @@ import { Headers } from "../Headers"; import HttpResponse from "../HttpResponse"; {{#imports}} -import { {{classname}} } from '../{{filename}}'; +import { {{classname}} } from "../{{filename}}"; {{/imports}} -import { COLLECTION_FORMATS } from '../variables'; +import { COLLECTION_FORMATS } from "../variables"; {{#withInterfaces}} -import { {{classname}}Interface } from './{{classname}}Interface'; +import { {{classname}}Interface } from "./{{classFilename}}Interface"; {{/withInterfaces}} {{#operations}} @@ -171,7 +176,9 @@ export class {{classname}} { {{/hasFormParams}} const response: Observable> = this.httpClient.{{httpMethod}}(`${this.basePath}{{{path}}}{{#hasQueryParams}}?${queryParameters.join('&')}{{/hasQueryParams}}`{{#bodyParam}}, {{paramName}} {{/bodyParam}}{{#hasFormParams}}, body{{/hasFormParams}}, headers); if (observe == 'body') { - return response.map(httpResponse => <{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>(httpResponse.response)){{#usePromise}}.toPromise(){{/usePromise}}; + return response.pipe( + map(httpResponse => <{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>(httpResponse.response)) + ){{#usePromise}}.toPromise(){{/usePromise}}; } return response{{#usePromise}}.toPromise(){{/usePromise}}; } diff --git a/modules/openapi-generator/src/main/resources/typescript-inversify/apiInterface.mustache b/modules/openapi-generator/src/main/resources/typescript-inversify/apiInterface.mustache index cb31c6396b..f6c4c03e5c 100644 --- a/modules/openapi-generator/src/main/resources/typescript-inversify/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-inversify/apiInterface.mustache @@ -1,7 +1,14 @@ {{>licenseInfo}} import { Headers } from "../Headers"; +{{^useRxJS6}} import { Observable } from "rxjs/Observable"; -import * as models from "../model/models"; +{{/useRxJS6}} +{{#useRxJS6}} +import { Observable } from "rxjs"; +{{/useRxJS6}} +{{#imports}} +import { {{classname}} } from "../{{filename}}"; +{{/imports}} import HttpResponse from "../HttpResponse"; {{#operations}} diff --git a/modules/openapi-generator/src/main/resources/typescript-inversify/package.mustache b/modules/openapi-generator/src/main/resources/typescript-inversify/package.mustache index 9f60773c2f..78a4c93bab 100644 --- a/modules/openapi-generator/src/main/resources/typescript-inversify/package.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-inversify/package.mustache @@ -16,9 +16,14 @@ }, "dependencies": { "inversify": "^4.3.0", - "rxjs": "~5.5.7", "whatwg-fetch": "~2.0.1", - "reflect-metadata": "0.1.8" + "reflect-metadata": "0.1.8", + {{^useRxJS6}} + "rxjs": "^6.0.0" + {{/useRxJS6}} + {{#useRxJS6}} + "rxjs": "^5.0.0" + {{/useRxJS6}} }, "devDependencies": { }{{#npmRepository}},{{/npmRepository}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/AbstractKotlinCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/AbstractKotlinCodegenTest.java index 1946ecc950..ff23d307d9 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/AbstractKotlinCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/AbstractKotlinCodegenTest.java @@ -2,8 +2,11 @@ package org.openapitools.codegen.kotlin; import org.openapitools.codegen.CodegenType; import org.openapitools.codegen.languages.AbstractKotlinCodegen; +import org.testng.Assert; import org.testng.annotations.Test; +import java.io.File; + import static org.openapitools.codegen.CodegenConstants.ENUM_PROPERTY_NAMING_TYPE.*; import static org.testng.Assert.*; @@ -136,4 +139,21 @@ public class AbstractKotlinCodegenTest { assertEquals(codegen.toApiName(""), "DefaultApi"); } + @Test + public void apIFileFolder() { + codegen.setOutputDir("/User/open/api/tools"); + codegen.setSourceFolder("src/folder"); + codegen.setApiPackage("org.openapitools.codegen.api"); + Assert.assertEquals(codegen.apiFileFolder(), "/User/open/api/tools/src/folder/org/openapitools/codegen/api".replace('/', File.separatorChar)); + } + + @Test + public void apiTestFileFolder() { + codegen.setOutputDir("/User/open/api/tools"); + codegen.setTestFolder("test/folder"); + codegen.setApiPackage("org.openapitools.codegen.api"); + Assert.assertEquals(codegen.apiTestFileFolder(), "/User/open/api/tools/test/folder/org/openapitools/codegen/api".replace('/', File.separatorChar)); + } + + } \ No newline at end of file diff --git a/pom.xml b/pom.xml index e3d8515f03..46100dd9ea 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,11 @@ openapi-generator-project pom openapi-generator-project +<<<<<<< HEAD 4.1.0-SNAPSHOT +======= + 4.0.2-SNAPSHOT +>>>>>>> origin/master https://github.com/openapitools/openapi-generator scm:git:git@github.com:openapitools/openapi-generator.git @@ -993,7 +997,7 @@ - java-undertowr + java-undertow env @@ -1001,7 +1005,7 @@ - samples/server/petstore/undertow + samples/server/petstore/java-undertow @@ -1114,7 +1118,7 @@ samples/server/petstore/java-play-framework-fake-endpoints samples/server/petstore/java-play-framework-controller-only samples/server/petstore/java-play-framework-api-package-override - samples/server/petstore/undertow + samples/server/petstore/java-undertow samples/server/petstore/jaxrs/jersey1 samples/server/petstore/jaxrs/jersey1-useTags diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION index afa6365606..d96260ba33 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.2-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md index 9459182101..bd485a13cd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/README.md @@ -6,7 +6,7 @@ This C# SDK is automatically generated by the [OpenAPI Generator](https://openap - API version: 1.0.0 - SDK version: 1.0.0 -- Build package: org.openapitools.codegen.languages.CSharpRefactorClientCodegen +- Build package: org.openapitools.codegen.languages.CSharpNetCoreClientCodegen ## Frameworks supported @@ -140,7 +140,14 @@ Class | Method | HTTP request | Description ## Documentation for Models + - [Model.AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md) + - [Model.AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md) + - [Model.AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md) - [Model.AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md) + - [Model.AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md) + - [Model.AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md) + - [Model.AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md) + - [Model.AdditionalPropertiesString](docs/AdditionalPropertiesString.md) - [Model.Animal](docs/Animal.md) - [Model.ApiResponse](docs/ApiResponse.md) - [Model.ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md) @@ -148,9 +155,11 @@ Class | Method | HTTP request | Description - [Model.ArrayTest](docs/ArrayTest.md) - [Model.Capitalization](docs/Capitalization.md) - [Model.Cat](docs/Cat.md) + - [Model.CatAllOf](docs/CatAllOf.md) - [Model.Category](docs/Category.md) - [Model.ClassModel](docs/ClassModel.md) - [Model.Dog](docs/Dog.md) + - [Model.DogAllOf](docs/DogAllOf.md) - [Model.EnumArrays](docs/EnumArrays.md) - [Model.EnumClass](docs/EnumClass.md) - [Model.EnumTest](docs/EnumTest.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesAnyType.md new file mode 100644 index 0000000000..2513b741ba --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesAnyType.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AdditionalPropertiesAnyType +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Name** | **string** | | [optional] + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesArray.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesArray.md new file mode 100644 index 0000000000..39a7c940c2 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesArray.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AdditionalPropertiesArray +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Name** | **string** | | [optional] + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesBoolean.md new file mode 100644 index 0000000000..e3b30ac619 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesBoolean.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AdditionalPropertiesBoolean +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Name** | **string** | | [optional] + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesClass.md index 057f5bd65d..b1de5006f8 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesClass.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesClass.md @@ -3,8 +3,17 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**MapProperty** | **Dictionary<string, string>** | | [optional] -**MapOfMapProperty** | **Dictionary<string, Dictionary<string, string>>** | | [optional] +**MapString** | **Dictionary<string, string>** | | [optional] +**MapNumber** | **Dictionary<string, decimal>** | | [optional] +**MapInteger** | **Dictionary<string, int>** | | [optional] +**MapBoolean** | **Dictionary<string, bool>** | | [optional] +**MapArrayInteger** | **Dictionary<string, List<int>>** | | [optional] +**MapArrayAnytype** | **Dictionary<string, List<Object>>** | | [optional] +**MapMapString** | **Dictionary<string, Dictionary<string, string>>** | | [optional] +**MapMapAnytype** | **Dictionary<string, Dictionary<string, Object>>** | | [optional] +**Anytype1** | [**Object**](.md) | | [optional] +**Anytype2** | [**Object**](.md) | | [optional] +**Anytype3** | [**Object**](.md) | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesInteger.md new file mode 100644 index 0000000000..e40cc1e54e --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesInteger.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AdditionalPropertiesInteger +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Name** | **string** | | [optional] + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesNumber.md new file mode 100644 index 0000000000..91764084c8 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesNumber.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AdditionalPropertiesNumber +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Name** | **string** | | [optional] + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesObject.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesObject.md new file mode 100644 index 0000000000..2fa66f43d6 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesObject.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AdditionalPropertiesObject +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Name** | **string** | | [optional] + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesString.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesString.md new file mode 100644 index 0000000000..008d3d4f33 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesString.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.AdditionalPropertiesString +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Name** | **string** | | [optional] + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/CatAllOf.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/CatAllOf.md new file mode 100644 index 0000000000..e6f320ac0d --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/CatAllOf.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.CatAllOf +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Declawed** | **bool** | | [optional] + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DogAllOf.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DogAllOf.md new file mode 100644 index 0000000000..ef32aeb714 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DogAllOf.md @@ -0,0 +1,9 @@ +# Org.OpenAPITools.Model.DogAllOf +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Breed** | **string** | | [optional] + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumTest.md index 3251659917..8bb7c4bab6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumTest.md +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumTest.md @@ -7,7 +7,7 @@ Name | Type | Description | Notes **EnumStringRequired** | **string** | | **EnumInteger** | **int** | | [optional] **EnumNumber** | **double** | | [optional] -**OuterEnum** | [**OuterEnum**](OuterEnum.md) | | [optional] +**OuterEnum** | **OuterEnum** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesAnyTypeTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesAnyTypeTests.cs new file mode 100644 index 0000000000..80e2d42cf5 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesAnyTypeTests.cs @@ -0,0 +1,71 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test +{ + /// + /// Class for testing AdditionalPropertiesAnyType + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AdditionalPropertiesAnyTypeTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AdditionalPropertiesAnyType + //private AdditionalPropertiesAnyType instance; + + public AdditionalPropertiesAnyTypeTests() + { + // TODO uncomment below to create an instance of AdditionalPropertiesAnyType + //instance = new AdditionalPropertiesAnyType(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AdditionalPropertiesAnyType + /// + [Fact] + public void AdditionalPropertiesAnyTypeInstanceTest() + { + // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesAnyType + //Assert.IsInstanceOfType (instance, "variable 'instance' is a AdditionalPropertiesAnyType"); + } + + + /// + /// Test the property 'Name' + /// + [Fact] + public void NameTest() + { + // TODO unit test for the property 'Name' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesArrayTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesArrayTests.cs new file mode 100644 index 0000000000..21adc82df4 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesArrayTests.cs @@ -0,0 +1,71 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test +{ + /// + /// Class for testing AdditionalPropertiesArray + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AdditionalPropertiesArrayTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AdditionalPropertiesArray + //private AdditionalPropertiesArray instance; + + public AdditionalPropertiesArrayTests() + { + // TODO uncomment below to create an instance of AdditionalPropertiesArray + //instance = new AdditionalPropertiesArray(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AdditionalPropertiesArray + /// + [Fact] + public void AdditionalPropertiesArrayInstanceTest() + { + // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesArray + //Assert.IsInstanceOfType (instance, "variable 'instance' is a AdditionalPropertiesArray"); + } + + + /// + /// Test the property 'Name' + /// + [Fact] + public void NameTest() + { + // TODO unit test for the property 'Name' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesBooleanTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesBooleanTests.cs new file mode 100644 index 0000000000..61505893ed --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesBooleanTests.cs @@ -0,0 +1,71 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test +{ + /// + /// Class for testing AdditionalPropertiesBoolean + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AdditionalPropertiesBooleanTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AdditionalPropertiesBoolean + //private AdditionalPropertiesBoolean instance; + + public AdditionalPropertiesBooleanTests() + { + // TODO uncomment below to create an instance of AdditionalPropertiesBoolean + //instance = new AdditionalPropertiesBoolean(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AdditionalPropertiesBoolean + /// + [Fact] + public void AdditionalPropertiesBooleanInstanceTest() + { + // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesBoolean + //Assert.IsInstanceOfType (instance, "variable 'instance' is a AdditionalPropertiesBoolean"); + } + + + /// + /// Test the property 'Name' + /// + [Fact] + public void NameTest() + { + // TODO unit test for the property 'Name' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesIntegerTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesIntegerTests.cs new file mode 100644 index 0000000000..45de798b24 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesIntegerTests.cs @@ -0,0 +1,71 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test +{ + /// + /// Class for testing AdditionalPropertiesInteger + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AdditionalPropertiesIntegerTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AdditionalPropertiesInteger + //private AdditionalPropertiesInteger instance; + + public AdditionalPropertiesIntegerTests() + { + // TODO uncomment below to create an instance of AdditionalPropertiesInteger + //instance = new AdditionalPropertiesInteger(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AdditionalPropertiesInteger + /// + [Fact] + public void AdditionalPropertiesIntegerInstanceTest() + { + // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesInteger + //Assert.IsInstanceOfType (instance, "variable 'instance' is a AdditionalPropertiesInteger"); + } + + + /// + /// Test the property 'Name' + /// + [Fact] + public void NameTest() + { + // TODO unit test for the property 'Name' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesNumberTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesNumberTests.cs new file mode 100644 index 0000000000..5a4b8eb3ea --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesNumberTests.cs @@ -0,0 +1,71 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test +{ + /// + /// Class for testing AdditionalPropertiesNumber + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AdditionalPropertiesNumberTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AdditionalPropertiesNumber + //private AdditionalPropertiesNumber instance; + + public AdditionalPropertiesNumberTests() + { + // TODO uncomment below to create an instance of AdditionalPropertiesNumber + //instance = new AdditionalPropertiesNumber(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AdditionalPropertiesNumber + /// + [Fact] + public void AdditionalPropertiesNumberInstanceTest() + { + // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesNumber + //Assert.IsInstanceOfType (instance, "variable 'instance' is a AdditionalPropertiesNumber"); + } + + + /// + /// Test the property 'Name' + /// + [Fact] + public void NameTest() + { + // TODO unit test for the property 'Name' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesObjectTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesObjectTests.cs new file mode 100644 index 0000000000..b4410816ce --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesObjectTests.cs @@ -0,0 +1,71 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test +{ + /// + /// Class for testing AdditionalPropertiesObject + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AdditionalPropertiesObjectTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AdditionalPropertiesObject + //private AdditionalPropertiesObject instance; + + public AdditionalPropertiesObjectTests() + { + // TODO uncomment below to create an instance of AdditionalPropertiesObject + //instance = new AdditionalPropertiesObject(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AdditionalPropertiesObject + /// + [Fact] + public void AdditionalPropertiesObjectInstanceTest() + { + // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesObject + //Assert.IsInstanceOfType (instance, "variable 'instance' is a AdditionalPropertiesObject"); + } + + + /// + /// Test the property 'Name' + /// + [Fact] + public void NameTest() + { + // TODO unit test for the property 'Name' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesStringTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesStringTests.cs new file mode 100644 index 0000000000..897ddaefc5 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/AdditionalPropertiesStringTests.cs @@ -0,0 +1,71 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test +{ + /// + /// Class for testing AdditionalPropertiesString + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class AdditionalPropertiesStringTests : IDisposable + { + // TODO uncomment below to declare an instance variable for AdditionalPropertiesString + //private AdditionalPropertiesString instance; + + public AdditionalPropertiesStringTests() + { + // TODO uncomment below to create an instance of AdditionalPropertiesString + //instance = new AdditionalPropertiesString(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of AdditionalPropertiesString + /// + [Fact] + public void AdditionalPropertiesStringInstanceTest() + { + // TODO uncomment below to test "IsInstanceOfType" AdditionalPropertiesString + //Assert.IsInstanceOfType (instance, "variable 'instance' is a AdditionalPropertiesString"); + } + + + /// + /// Test the property 'Name' + /// + [Fact] + public void NameTest() + { + // TODO unit test for the property 'Name' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs new file mode 100644 index 0000000000..68b84d01ba --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs @@ -0,0 +1,71 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test +{ + /// + /// Class for testing CatAllOf + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class CatAllOfTests : IDisposable + { + // TODO uncomment below to declare an instance variable for CatAllOf + //private CatAllOf instance; + + public CatAllOfTests() + { + // TODO uncomment below to create an instance of CatAllOf + //instance = new CatAllOf(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of CatAllOf + /// + [Fact] + public void CatAllOfInstanceTest() + { + // TODO uncomment below to test "IsInstanceOfType" CatAllOf + //Assert.IsInstanceOfType (instance, "variable 'instance' is a CatAllOf"); + } + + + /// + /// Test the property 'Declawed' + /// + [Fact] + public void DeclawedTest() + { + // TODO unit test for the property 'Declawed' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs new file mode 100644 index 0000000000..76905852d4 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs @@ -0,0 +1,71 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using Xunit; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test +{ + /// + /// Class for testing DogAllOf + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + public class DogAllOfTests : IDisposable + { + // TODO uncomment below to declare an instance variable for DogAllOf + //private DogAllOf instance; + + public DogAllOfTests() + { + // TODO uncomment below to create an instance of DogAllOf + //instance = new DogAllOf(); + } + + public void Dispose() + { + // Cleanup when everything is done. + } + + /// + /// Test an instance of DogAllOf + /// + [Fact] + public void DogAllOfInstanceTest() + { + // TODO uncomment below to test "IsInstanceOfType" DogAllOf + //Assert.IsInstanceOfType (instance, "variable 'instance' is a DogAllOf"); + } + + + /// + /// Test the property 'Breed' + /// + [Fact] + public void BreedTest() + { + // TODO unit test for the property 'Breed' + } + + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 10817d7dba..b6c5620b8b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -233,8 +233,8 @@ namespace Org.OpenAPITools.Api "application/json" }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs index d45e4931b8..8b68bb522b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -848,8 +848,8 @@ namespace Org.OpenAPITools.Api String[] @accepts = new String[] { }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -962,8 +962,8 @@ namespace Org.OpenAPITools.Api "*/*" }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -1068,8 +1068,8 @@ namespace Org.OpenAPITools.Api "*/*" }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -1174,8 +1174,8 @@ namespace Org.OpenAPITools.Api "*/*" }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -1280,8 +1280,8 @@ namespace Org.OpenAPITools.Api "*/*" }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -1389,8 +1389,8 @@ namespace Org.OpenAPITools.Api String[] @accepts = new String[] { }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -1507,8 +1507,8 @@ namespace Org.OpenAPITools.Api String[] @accepts = new String[] { }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -1647,8 +1647,8 @@ namespace Org.OpenAPITools.Api "application/json" }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -1799,8 +1799,8 @@ namespace Org.OpenAPITools.Api String[] @accepts = new String[] { }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -2081,8 +2081,8 @@ namespace Org.OpenAPITools.Api String[] @accepts = new String[] { }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -2322,8 +2322,8 @@ namespace Org.OpenAPITools.Api String[] @accepts = new String[] { }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -2537,8 +2537,8 @@ namespace Org.OpenAPITools.Api String[] @accepts = new String[] { }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -2655,8 +2655,8 @@ namespace Org.OpenAPITools.Api String[] @accepts = new String[] { }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 61b5a0d404..43c4ea339b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -233,8 +233,8 @@ namespace Org.OpenAPITools.Api "application/json" }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/PetApi.cs index 0068cdbccb..9ce10cba8b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/PetApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -596,8 +596,8 @@ namespace Org.OpenAPITools.Api String[] @accepts = new String[] { }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -722,8 +722,8 @@ namespace Org.OpenAPITools.Api String[] @accepts = new String[] { }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -855,8 +855,8 @@ namespace Org.OpenAPITools.Api "application/json" }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -1001,8 +1001,8 @@ namespace Org.OpenAPITools.Api "application/json" }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -1147,8 +1147,8 @@ namespace Org.OpenAPITools.Api "application/json" }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -1274,8 +1274,8 @@ namespace Org.OpenAPITools.Api String[] @accepts = new String[] { }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -1403,8 +1403,8 @@ namespace Org.OpenAPITools.Api String[] @accepts = new String[] { }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -1555,8 +1555,8 @@ namespace Org.OpenAPITools.Api "application/json" }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -1713,8 +1713,8 @@ namespace Org.OpenAPITools.Api "application/json" }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/StoreApi.cs index 25d14b5a54..58bb5c8842 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/StoreApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -352,8 +352,8 @@ namespace Org.OpenAPITools.Api String[] @accepts = new String[] { }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -460,8 +460,8 @@ namespace Org.OpenAPITools.Api "application/json" }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -577,8 +577,8 @@ namespace Org.OpenAPITools.Api "application/json" }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -695,8 +695,8 @@ namespace Org.OpenAPITools.Api "application/json" }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/UserApi.cs index 58721f5e62..dc22cbd1b4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/UserApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -528,8 +528,8 @@ namespace Org.OpenAPITools.Api String[] @accepts = new String[] { }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -638,8 +638,8 @@ namespace Org.OpenAPITools.Api String[] @accepts = new String[] { }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -748,8 +748,8 @@ namespace Org.OpenAPITools.Api String[] @accepts = new String[] { }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -858,8 +858,8 @@ namespace Org.OpenAPITools.Api String[] @accepts = new String[] { }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -973,8 +973,8 @@ namespace Org.OpenAPITools.Api "application/json" }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -1097,8 +1097,8 @@ namespace Org.OpenAPITools.Api "application/json" }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -1248,8 +1248,8 @@ namespace Org.OpenAPITools.Api String[] @accepts = new String[] { }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); @@ -1356,8 +1356,8 @@ namespace Org.OpenAPITools.Api String[] @accepts = new String[] { }; - var localVarConentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); - if (localVarConentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarConentType); + var localVarContentType = Org.OpenAPITools.Client.ClientUtils.SelectHeaderContentType(@contentTypes); + if (localVarContentType != null) requestOptions.HeaderParameters.Add("Content-Type", localVarContentType); var localVarAccept = Org.OpenAPITools.Client.ClientUtils.SelectHeaderAccept(@accepts); if (localVarAccept != null) requestOptions.HeaderParameters.Add("Accept", localVarAccept); diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs index 6879cf00a6..e3db56be21 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiException.cs index c419432a04..970215dd00 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiException.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiException.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiResponse.cs index 7d5adfe995..f56fd53e55 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiResponse.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs index 5825b8e790..eb88278470 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs index ca0b52df6a..25010fbef9 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Configuration.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ExceptionFactory.cs index 6969e6cd32..9c9885df0f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ExceptionFactory.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ExceptionFactory.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/GlobalConfiguration.cs index 3e118b15fa..f13df1ec98 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/GlobalConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/GlobalConfiguration.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpMethod.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpMethod.cs index 9200edf9f8..9ee30d81f7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpMethod.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpMethod.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IApiAccessor.cs index 0fdb137c34..5a24c17af6 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IApiAccessor.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IApiAccessor.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IAsynchronousClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IAsynchronousClient.cs index fdd9f05c73..750cf18393 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IAsynchronousClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IAsynchronousClient.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs index 76a5f5124f..23e1a0c2e1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ISynchronousClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ISynchronousClient.cs index 7b837ca506..5c139176e4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ISynchronousClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ISynchronousClient.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Multimap.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Multimap.cs index d0b3ad9b4a..2a069436de 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Multimap.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/Multimap.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs index 4f5c219d5c..a1bd6b08f3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/RequestOptions.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/RequestOptions.cs index 3e7846f24e..84fb305d80 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/RequestOptions.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/RequestOptions.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs new file mode 100644 index 0000000000..fe9de3aa27 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// AdditionalPropertiesAnyType + /// + [DataContract] + public partial class AdditionalPropertiesAnyType : Dictionary, IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// name. + public AdditionalPropertiesAnyType(string name = default(string)) : base() + { + this.Name = name; + } + + /// + /// Gets or Sets Name + /// + [DataMember(Name="name", EmitDefaultValue=false)] + public string Name { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class AdditionalPropertiesAnyType {\n"); + sb.Append(" ").Append(base.ToString().Replace("\n", "\n ")).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as AdditionalPropertiesAnyType).AreEqual; + } + + /// + /// Returns true if AdditionalPropertiesAnyType instances are equal + /// + /// Instance of AdditionalPropertiesAnyType to be compared + /// Boolean + public bool Equals(AdditionalPropertiesAnyType input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = base.GetHashCode(); + if (this.Name != null) + hashCode = hashCode * 59 + this.Name.GetHashCode(); + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs new file mode 100644 index 0000000000..46e6973df0 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// AdditionalPropertiesArray + /// + [DataContract] + public partial class AdditionalPropertiesArray : Dictionary, IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// name. + public AdditionalPropertiesArray(string name = default(string)) : base() + { + this.Name = name; + } + + /// + /// Gets or Sets Name + /// + [DataMember(Name="name", EmitDefaultValue=false)] + public string Name { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class AdditionalPropertiesArray {\n"); + sb.Append(" ").Append(base.ToString().Replace("\n", "\n ")).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as AdditionalPropertiesArray).AreEqual; + } + + /// + /// Returns true if AdditionalPropertiesArray instances are equal + /// + /// Instance of AdditionalPropertiesArray to be compared + /// Boolean + public bool Equals(AdditionalPropertiesArray input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = base.GetHashCode(); + if (this.Name != null) + hashCode = hashCode * 59 + this.Name.GetHashCode(); + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs new file mode 100644 index 0000000000..e21c5085ce --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// AdditionalPropertiesBoolean + /// + [DataContract] + public partial class AdditionalPropertiesBoolean : Dictionary, IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// name. + public AdditionalPropertiesBoolean(string name = default(string)) : base() + { + this.Name = name; + } + + /// + /// Gets or Sets Name + /// + [DataMember(Name="name", EmitDefaultValue=false)] + public string Name { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class AdditionalPropertiesBoolean {\n"); + sb.Append(" ").Append(base.ToString().Replace("\n", "\n ")).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as AdditionalPropertiesBoolean).AreEqual; + } + + /// + /// Returns true if AdditionalPropertiesBoolean instances are equal + /// + /// Instance of AdditionalPropertiesBoolean to be compared + /// Boolean + public bool Equals(AdditionalPropertiesBoolean input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = base.GetHashCode(); + if (this.Name != null) + hashCode = hashCode * 59 + this.Name.GetHashCode(); + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs index 32a19a7cc3..096cd93fa7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -35,25 +35,97 @@ namespace Org.OpenAPITools.Model /// /// Initializes a new instance of the class. /// - /// mapProperty. - /// mapOfMapProperty. - public AdditionalPropertiesClass(Dictionary mapProperty = default(Dictionary), Dictionary> mapOfMapProperty = default(Dictionary>)) + /// mapString. + /// mapNumber. + /// mapInteger. + /// mapBoolean. + /// mapArrayInteger. + /// mapArrayAnytype. + /// mapMapString. + /// mapMapAnytype. + /// anytype1. + /// anytype2. + /// anytype3. + public AdditionalPropertiesClass(Dictionary mapString = default(Dictionary), Dictionary mapNumber = default(Dictionary), Dictionary mapInteger = default(Dictionary), Dictionary mapBoolean = default(Dictionary), Dictionary> mapArrayInteger = default(Dictionary>), Dictionary> mapArrayAnytype = default(Dictionary>), Dictionary> mapMapString = default(Dictionary>), Dictionary> mapMapAnytype = default(Dictionary>), Object anytype1 = default(Object), Object anytype2 = default(Object), Object anytype3 = default(Object)) { - this.MapProperty = mapProperty; - this.MapOfMapProperty = mapOfMapProperty; + this.MapString = mapString; + this.MapNumber = mapNumber; + this.MapInteger = mapInteger; + this.MapBoolean = mapBoolean; + this.MapArrayInteger = mapArrayInteger; + this.MapArrayAnytype = mapArrayAnytype; + this.MapMapString = mapMapString; + this.MapMapAnytype = mapMapAnytype; + this.Anytype1 = anytype1; + this.Anytype2 = anytype2; + this.Anytype3 = anytype3; } /// - /// Gets or Sets MapProperty + /// Gets or Sets MapString /// - [DataMember(Name="map_property", EmitDefaultValue=false)] - public Dictionary MapProperty { get; set; } + [DataMember(Name="map_string", EmitDefaultValue=false)] + public Dictionary MapString { get; set; } /// - /// Gets or Sets MapOfMapProperty + /// Gets or Sets MapNumber /// - [DataMember(Name="map_of_map_property", EmitDefaultValue=false)] - public Dictionary> MapOfMapProperty { get; set; } + [DataMember(Name="map_number", EmitDefaultValue=false)] + public Dictionary MapNumber { get; set; } + + /// + /// Gets or Sets MapInteger + /// + [DataMember(Name="map_integer", EmitDefaultValue=false)] + public Dictionary MapInteger { get; set; } + + /// + /// Gets or Sets MapBoolean + /// + [DataMember(Name="map_boolean", EmitDefaultValue=false)] + public Dictionary MapBoolean { get; set; } + + /// + /// Gets or Sets MapArrayInteger + /// + [DataMember(Name="map_array_integer", EmitDefaultValue=false)] + public Dictionary> MapArrayInteger { get; set; } + + /// + /// Gets or Sets MapArrayAnytype + /// + [DataMember(Name="map_array_anytype", EmitDefaultValue=false)] + public Dictionary> MapArrayAnytype { get; set; } + + /// + /// Gets or Sets MapMapString + /// + [DataMember(Name="map_map_string", EmitDefaultValue=false)] + public Dictionary> MapMapString { get; set; } + + /// + /// Gets or Sets MapMapAnytype + /// + [DataMember(Name="map_map_anytype", EmitDefaultValue=false)] + public Dictionary> MapMapAnytype { get; set; } + + /// + /// Gets or Sets Anytype1 + /// + [DataMember(Name="anytype_1", EmitDefaultValue=false)] + public Object Anytype1 { get; set; } + + /// + /// Gets or Sets Anytype2 + /// + [DataMember(Name="anytype_2", EmitDefaultValue=false)] + public Object Anytype2 { get; set; } + + /// + /// Gets or Sets Anytype3 + /// + [DataMember(Name="anytype_3", EmitDefaultValue=false)] + public Object Anytype3 { get; set; } /// /// Returns the string presentation of the object @@ -63,8 +135,17 @@ namespace Org.OpenAPITools.Model { var sb = new StringBuilder(); sb.Append("class AdditionalPropertiesClass {\n"); - sb.Append(" MapProperty: ").Append(MapProperty).Append("\n"); - sb.Append(" MapOfMapProperty: ").Append(MapOfMapProperty).Append("\n"); + sb.Append(" MapString: ").Append(MapString).Append("\n"); + sb.Append(" MapNumber: ").Append(MapNumber).Append("\n"); + sb.Append(" MapInteger: ").Append(MapInteger).Append("\n"); + sb.Append(" MapBoolean: ").Append(MapBoolean).Append("\n"); + sb.Append(" MapArrayInteger: ").Append(MapArrayInteger).Append("\n"); + sb.Append(" MapArrayAnytype: ").Append(MapArrayAnytype).Append("\n"); + sb.Append(" MapMapString: ").Append(MapMapString).Append("\n"); + sb.Append(" MapMapAnytype: ").Append(MapMapAnytype).Append("\n"); + sb.Append(" Anytype1: ").Append(Anytype1).Append("\n"); + sb.Append(" Anytype2: ").Append(Anytype2).Append("\n"); + sb.Append(" Anytype3: ").Append(Anytype3).Append("\n"); sb.Append("}\n"); return sb.ToString(); } @@ -107,10 +188,28 @@ namespace Org.OpenAPITools.Model unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.MapProperty != null) - hashCode = hashCode * 59 + this.MapProperty.GetHashCode(); - if (this.MapOfMapProperty != null) - hashCode = hashCode * 59 + this.MapOfMapProperty.GetHashCode(); + if (this.MapString != null) + hashCode = hashCode * 59 + this.MapString.GetHashCode(); + if (this.MapNumber != null) + hashCode = hashCode * 59 + this.MapNumber.GetHashCode(); + if (this.MapInteger != null) + hashCode = hashCode * 59 + this.MapInteger.GetHashCode(); + if (this.MapBoolean != null) + hashCode = hashCode * 59 + this.MapBoolean.GetHashCode(); + if (this.MapArrayInteger != null) + hashCode = hashCode * 59 + this.MapArrayInteger.GetHashCode(); + if (this.MapArrayAnytype != null) + hashCode = hashCode * 59 + this.MapArrayAnytype.GetHashCode(); + if (this.MapMapString != null) + hashCode = hashCode * 59 + this.MapMapString.GetHashCode(); + if (this.MapMapAnytype != null) + hashCode = hashCode * 59 + this.MapMapAnytype.GetHashCode(); + if (this.Anytype1 != null) + hashCode = hashCode * 59 + this.Anytype1.GetHashCode(); + if (this.Anytype2 != null) + hashCode = hashCode * 59 + this.Anytype2.GetHashCode(); + if (this.Anytype3 != null) + hashCode = hashCode * 59 + this.Anytype3.GetHashCode(); return hashCode; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs new file mode 100644 index 0000000000..ceff9d7354 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// AdditionalPropertiesInteger + /// + [DataContract] + public partial class AdditionalPropertiesInteger : Dictionary, IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// name. + public AdditionalPropertiesInteger(string name = default(string)) : base() + { + this.Name = name; + } + + /// + /// Gets or Sets Name + /// + [DataMember(Name="name", EmitDefaultValue=false)] + public string Name { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class AdditionalPropertiesInteger {\n"); + sb.Append(" ").Append(base.ToString().Replace("\n", "\n ")).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as AdditionalPropertiesInteger).AreEqual; + } + + /// + /// Returns true if AdditionalPropertiesInteger instances are equal + /// + /// Instance of AdditionalPropertiesInteger to be compared + /// Boolean + public bool Equals(AdditionalPropertiesInteger input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = base.GetHashCode(); + if (this.Name != null) + hashCode = hashCode * 59 + this.Name.GetHashCode(); + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs new file mode 100644 index 0000000000..db37cf7ce6 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// AdditionalPropertiesNumber + /// + [DataContract] + public partial class AdditionalPropertiesNumber : Dictionary, IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// name. + public AdditionalPropertiesNumber(string name = default(string)) : base() + { + this.Name = name; + } + + /// + /// Gets or Sets Name + /// + [DataMember(Name="name", EmitDefaultValue=false)] + public string Name { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class AdditionalPropertiesNumber {\n"); + sb.Append(" ").Append(base.ToString().Replace("\n", "\n ")).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as AdditionalPropertiesNumber).AreEqual; + } + + /// + /// Returns true if AdditionalPropertiesNumber instances are equal + /// + /// Instance of AdditionalPropertiesNumber to be compared + /// Boolean + public bool Equals(AdditionalPropertiesNumber input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = base.GetHashCode(); + if (this.Name != null) + hashCode = hashCode * 59 + this.Name.GetHashCode(); + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs new file mode 100644 index 0000000000..ee5b67b2eb --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// AdditionalPropertiesObject + /// + [DataContract] + public partial class AdditionalPropertiesObject : Dictionary>, IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// name. + public AdditionalPropertiesObject(string name = default(string)) : base() + { + this.Name = name; + } + + /// + /// Gets or Sets Name + /// + [DataMember(Name="name", EmitDefaultValue=false)] + public string Name { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class AdditionalPropertiesObject {\n"); + sb.Append(" ").Append(base.ToString().Replace("\n", "\n ")).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as AdditionalPropertiesObject).AreEqual; + } + + /// + /// Returns true if AdditionalPropertiesObject instances are equal + /// + /// Instance of AdditionalPropertiesObject to be compared + /// Boolean + public bool Equals(AdditionalPropertiesObject input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = base.GetHashCode(); + if (this.Name != null) + hashCode = hashCode * 59 + this.Name.GetHashCode(); + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs new file mode 100644 index 0000000000..29dbad58ca --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs @@ -0,0 +1,119 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// AdditionalPropertiesString + /// + [DataContract] + public partial class AdditionalPropertiesString : Dictionary, IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// name. + public AdditionalPropertiesString(string name = default(string)) : base() + { + this.Name = name; + } + + /// + /// Gets or Sets Name + /// + [DataMember(Name="name", EmitDefaultValue=false)] + public string Name { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class AdditionalPropertiesString {\n"); + sb.Append(" ").Append(base.ToString().Replace("\n", "\n ")).Append("\n"); + sb.Append(" Name: ").Append(Name).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public string ToJson() + { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as AdditionalPropertiesString).AreEqual; + } + + /// + /// Returns true if AdditionalPropertiesString instances are equal + /// + /// Instance of AdditionalPropertiesString to be compared + /// Boolean + public bool Equals(AdditionalPropertiesString input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = base.GetHashCode(); + if (this.Name != null) + hashCode = hashCode * 59 + this.Name.GetHashCode(); + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs index 55afaa1308..8631afa2db 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Animal.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ApiResponse.cs index e28fc9795d..4eefb3a91a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -116,8 +116,7 @@ namespace Org.OpenAPITools.Model unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.Code != null) - hashCode = hashCode * 59 + this.Code.GetHashCode(); + hashCode = hashCode * 59 + this.Code.GetHashCode(); if (this.Type != null) hashCode = hashCode * 59 + this.Type.GetHashCode(); if (this.Message != null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs index 4de9ac9adf..f4b6d04b7e 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs index 2ee74e404a..1314156cd4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayTest.cs index 334cc67e61..eba80fa5bd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ArrayTest.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Capitalization.cs index 8af54f1e73..944d1399cf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Capitalization.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Capitalization.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs index 053b9409fd..84f1ca007a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Cat.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -106,8 +106,7 @@ namespace Org.OpenAPITools.Model unchecked // Overflow is fine, just wrap { int hashCode = base.GetHashCode(); - if (this.Declawed != null) - hashCode = hashCode * 59 + this.Declawed.GetHashCode(); + hashCode = hashCode * 59 + this.Declawed.GetHashCode(); return hashCode; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/CatAllOf.cs new file mode 100644 index 0000000000..b2a1c2a185 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/CatAllOf.cs @@ -0,0 +1,117 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// CatAllOf + /// + [DataContract] + public partial class CatAllOf : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// declawed. + public CatAllOf(bool declawed = default(bool)) + { + this.Declawed = declawed; + } + + /// + /// Gets or Sets Declawed + /// + [DataMember(Name="declawed", EmitDefaultValue=false)] + public bool Declawed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class CatAllOf {\n"); + sb.Append(" Declawed: ").Append(Declawed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as CatAllOf).AreEqual; + } + + /// + /// Returns true if CatAllOf instances are equal + /// + /// Instance of CatAllOf to be compared + /// Boolean + public bool Equals(CatAllOf input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + hashCode = hashCode * 59 + this.Declawed.GetHashCode(); + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs index c847814bf1..2d2d85c07b 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Category.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -121,8 +121,7 @@ namespace Org.OpenAPITools.Model unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.Id != null) - hashCode = hashCode * 59 + this.Id.GetHashCode(); + hashCode = hashCode * 59 + this.Id.GetHashCode(); if (this.Name != null) hashCode = hashCode * 59 + this.Name.GetHashCode(); return hashCode; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs index 5eccb61a4a..507cbff639 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ClassModel.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs index dc3e2b596e..ca4115b1e4 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Dog.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DogAllOf.cs new file mode 100644 index 0000000000..789a2bd936 --- /dev/null +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/DogAllOf.cs @@ -0,0 +1,118 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using System; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; +using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils; + +namespace Org.OpenAPITools.Model +{ + /// + /// DogAllOf + /// + [DataContract] + public partial class DogAllOf : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// breed. + public DogAllOf(string breed = default(string)) + { + this.Breed = breed; + } + + /// + /// Gets or Sets Breed + /// + [DataMember(Name="breed", EmitDefaultValue=false)] + public string Breed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class DogAllOf {\n"); + sb.Append(" Breed: ").Append(Breed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input as DogAllOf).AreEqual; + } + + /// + /// Returns true if DogAllOf instances are equal + /// + /// Instance of DogAllOf to be compared + /// Boolean + public bool Equals(DogAllOf input) + { + return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual; + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Breed != null) + hashCode = hashCode * 59 + this.Breed.GetHashCode(); + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs index 63fabba7f4..bba92d524f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs index db151c2c77..15b4105f20 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumClass.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumTest.cs index d45d1ad623..595a923315 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumTest.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -142,6 +142,11 @@ namespace Org.OpenAPITools.Model [DataMember(Name="enum_number", EmitDefaultValue=false)] public EnumNumberEnum? EnumNumber { get; set; } /// + /// Gets or Sets OuterEnum + /// + [DataMember(Name="outerEnum", EmitDefaultValue=false)] + public OuterEnum? OuterEnum { get; set; } + /// /// Initializes a new instance of the class. /// [JsonConstructorAttribute] @@ -163,12 +168,6 @@ namespace Org.OpenAPITools.Model this.OuterEnum = outerEnum; } - /// - /// Gets or Sets OuterEnum - /// - [DataMember(Name="outerEnum", EmitDefaultValue=false)] - public OuterEnum OuterEnum { get; set; } - /// /// Returns the string presentation of the object /// @@ -228,8 +227,7 @@ namespace Org.OpenAPITools.Model hashCode = hashCode * 59 + this.EnumStringRequired.GetHashCode(); hashCode = hashCode * 59 + this.EnumInteger.GetHashCode(); hashCode = hashCode * 59 + this.EnumNumber.GetHashCode(); - if (this.OuterEnum != null) - hashCode = hashCode * 59 + this.OuterEnum.GetHashCode(); + hashCode = hashCode * 59 + this.OuterEnum.GetHashCode(); return hashCode; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/File.cs index dabb0d97d3..6e126f1dac 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/File.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/File.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs index 5cdb9b7e3a..b79e9fc9fb 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs index 88f748b828..75e838eb3f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FormatTest.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -248,18 +248,12 @@ namespace Org.OpenAPITools.Model unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.Integer != null) - hashCode = hashCode * 59 + this.Integer.GetHashCode(); - if (this.Int32 != null) - hashCode = hashCode * 59 + this.Int32.GetHashCode(); - if (this.Int64 != null) - hashCode = hashCode * 59 + this.Int64.GetHashCode(); - if (this.Number != null) - hashCode = hashCode * 59 + this.Number.GetHashCode(); - if (this.Float != null) - hashCode = hashCode * 59 + this.Float.GetHashCode(); - if (this.Double != null) - hashCode = hashCode * 59 + this.Double.GetHashCode(); + hashCode = hashCode * 59 + this.Integer.GetHashCode(); + hashCode = hashCode * 59 + this.Int32.GetHashCode(); + hashCode = hashCode * 59 + this.Int64.GetHashCode(); + hashCode = hashCode * 59 + this.Number.GetHashCode(); + hashCode = hashCode * 59 + this.Float.GetHashCode(); + hashCode = hashCode * 59 + this.Double.GetHashCode(); if (this.String != null) hashCode = hashCode * 59 + this.String.GetHashCode(); if (this.Byte != null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs index 6174cd3765..7b081cdd45 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/List.cs index 0a4caa3d95..744373e91a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/List.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/List.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs index b04d1ed442..14c90960be 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index 8ae71edaf8..7cad7fa1e3 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs index 56010fc792..b756e5b7df 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Model200Response.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -107,8 +107,7 @@ namespace Org.OpenAPITools.Model unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.Name != null) - hashCode = hashCode * 59 + this.Name.GetHashCode(); + hashCode = hashCode * 59 + this.Name.GetHashCode(); if (this.Class != null) hashCode = hashCode * 59 + this.Class.GetHashCode(); return hashCode; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs index 04562c4e26..568e2e3e68 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ModelClient.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Name.cs index 9549d8f929..60adfe8af7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Name.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -135,14 +135,11 @@ namespace Org.OpenAPITools.Model unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this._Name != null) - hashCode = hashCode * 59 + this._Name.GetHashCode(); - if (this.SnakeCase != null) - hashCode = hashCode * 59 + this.SnakeCase.GetHashCode(); + hashCode = hashCode * 59 + this._Name.GetHashCode(); + hashCode = hashCode * 59 + this.SnakeCase.GetHashCode(); if (this.Property != null) hashCode = hashCode * 59 + this.Property.GetHashCode(); - if (this._123Number != null) - hashCode = hashCode * 59 + this._123Number.GetHashCode(); + hashCode = hashCode * 59 + this._123Number.GetHashCode(); return hashCode; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NumberOnly.cs index 8e838a08ed..ab9768a6b1 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -98,8 +98,7 @@ namespace Org.OpenAPITools.Model unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.JustNumber != null) - hashCode = hashCode * 59 + this.JustNumber.GetHashCode(); + hashCode = hashCode * 59 + this.JustNumber.GetHashCode(); return hashCode; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs index d13d7c8727..0c4a6a5b60 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Order.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -178,17 +178,13 @@ namespace Org.OpenAPITools.Model unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.Id != null) - hashCode = hashCode * 59 + this.Id.GetHashCode(); - if (this.PetId != null) - hashCode = hashCode * 59 + this.PetId.GetHashCode(); - if (this.Quantity != null) - hashCode = hashCode * 59 + this.Quantity.GetHashCode(); + hashCode = hashCode * 59 + this.Id.GetHashCode(); + hashCode = hashCode * 59 + this.PetId.GetHashCode(); + hashCode = hashCode * 59 + this.Quantity.GetHashCode(); if (this.ShipDate != null) hashCode = hashCode * 59 + this.ShipDate.GetHashCode(); hashCode = hashCode * 59 + this.Status.GetHashCode(); - if (this.Complete != null) - hashCode = hashCode * 59 + this.Complete.GetHashCode(); + hashCode = hashCode * 59 + this.Complete.GetHashCode(); return hashCode; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs index b3ea0bd5e0..af84cc0f00 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -116,12 +116,10 @@ namespace Org.OpenAPITools.Model unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.MyNumber != null) - hashCode = hashCode * 59 + this.MyNumber.GetHashCode(); + hashCode = hashCode * 59 + this.MyNumber.GetHashCode(); if (this.MyString != null) hashCode = hashCode * 59 + this.MyString.GetHashCode(); - if (this.MyBoolean != null) - hashCode = hashCode * 59 + this.MyBoolean.GetHashCode(); + hashCode = hashCode * 59 + this.MyBoolean.GetHashCode(); return hashCode; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs index 0ad7040640..6efcc88b0c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs index 9d217b2ad2..b7be3ee84f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pet.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -193,8 +193,7 @@ namespace Org.OpenAPITools.Model unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.Id != null) - hashCode = hashCode * 59 + this.Id.GetHashCode(); + hashCode = hashCode * 59 + this.Id.GetHashCode(); if (this.Category != null) hashCode = hashCode * 59 + this.Category.GetHashCode(); if (this.Name != null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs index bc10ad9317..0474c18959 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs index 8ec49c1390..621b6978bd 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Return.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -98,8 +98,7 @@ namespace Org.OpenAPITools.Model unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this._Return != null) - hashCode = hashCode * 59 + this._Return.GetHashCode(); + hashCode = hashCode * 59 + this._Return.GetHashCode(); return hashCode; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs index d7cff99d12..649854c60f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -98,8 +98,7 @@ namespace Org.OpenAPITools.Model unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.SpecialPropertyName != null) - hashCode = hashCode * 59 + this.SpecialPropertyName.GetHashCode(); + hashCode = hashCode * 59 + this.SpecialPropertyName.GetHashCode(); return hashCode; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Tag.cs index f7517d82f1..ec9dc62e55 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Tag.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -107,8 +107,7 @@ namespace Org.OpenAPITools.Model unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.Id != null) - hashCode = hashCode * 59 + this.Id.GetHashCode(); + hashCode = hashCode * 59 + this.Id.GetHashCode(); if (this.Name != null) hashCode = hashCode * 59 + this.Name.GetHashCode(); return hashCode; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TypeHolderDefault.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TypeHolderDefault.cs index 8be68877c7..62151f1edf 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TypeHolderDefault.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TypeHolderDefault.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -186,12 +186,9 @@ namespace Org.OpenAPITools.Model int hashCode = 41; if (this.StringItem != null) hashCode = hashCode * 59 + this.StringItem.GetHashCode(); - if (this.NumberItem != null) - hashCode = hashCode * 59 + this.NumberItem.GetHashCode(); - if (this.IntegerItem != null) - hashCode = hashCode * 59 + this.IntegerItem.GetHashCode(); - if (this.BoolItem != null) - hashCode = hashCode * 59 + this.BoolItem.GetHashCode(); + hashCode = hashCode * 59 + this.NumberItem.GetHashCode(); + hashCode = hashCode * 59 + this.IntegerItem.GetHashCode(); + hashCode = hashCode * 59 + this.BoolItem.GetHashCode(); if (this.ArrayItem != null) hashCode = hashCode * 59 + this.ArrayItem.GetHashCode(); return hashCode; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TypeHolderExample.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TypeHolderExample.cs index 83183b1d4a..9a1df28e4a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TypeHolderExample.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/TypeHolderExample.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -186,12 +186,9 @@ namespace Org.OpenAPITools.Model int hashCode = 41; if (this.StringItem != null) hashCode = hashCode * 59 + this.StringItem.GetHashCode(); - if (this.NumberItem != null) - hashCode = hashCode * 59 + this.NumberItem.GetHashCode(); - if (this.IntegerItem != null) - hashCode = hashCode * 59 + this.IntegerItem.GetHashCode(); - if (this.BoolItem != null) - hashCode = hashCode * 59 + this.BoolItem.GetHashCode(); + hashCode = hashCode * 59 + this.NumberItem.GetHashCode(); + hashCode = hashCode * 59 + this.IntegerItem.GetHashCode(); + hashCode = hashCode * 59 + this.BoolItem.GetHashCode(); if (this.ArrayItem != null) hashCode = hashCode * 59 + this.ArrayItem.GetHashCode(); return hashCode; diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/User.cs index 6905abd8c7..83ae8fd7b7 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/User.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -162,8 +162,7 @@ namespace Org.OpenAPITools.Model unchecked // Overflow is fine, just wrap { int hashCode = 41; - if (this.Id != null) - hashCode = hashCode * 59 + this.Id.GetHashCode(); + hashCode = hashCode * 59 + this.Id.GetHashCode(); if (this.Username != null) hashCode = hashCode * 59 + this.Username.GetHashCode(); if (this.FirstName != null) @@ -176,8 +175,7 @@ namespace Org.OpenAPITools.Model hashCode = hashCode * 59 + this.Password.GetHashCode(); if (this.Phone != null) hashCode = hashCode * 59 + this.Phone.GetHashCode(); - if (this.UserStatus != null) - hashCode = hashCode * 59 + this.UserStatus.GetHashCode(); + hashCode = hashCode * 59 + this.UserStatus.GetHashCode(); return hashCode; } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/XmlItem.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/XmlItem.cs index e09b9dde36..8f204d8814 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/XmlItem.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/XmlItem.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -352,58 +352,43 @@ namespace Org.OpenAPITools.Model int hashCode = 41; if (this.AttributeString != null) hashCode = hashCode * 59 + this.AttributeString.GetHashCode(); - if (this.AttributeNumber != null) - hashCode = hashCode * 59 + this.AttributeNumber.GetHashCode(); - if (this.AttributeInteger != null) - hashCode = hashCode * 59 + this.AttributeInteger.GetHashCode(); - if (this.AttributeBoolean != null) - hashCode = hashCode * 59 + this.AttributeBoolean.GetHashCode(); + hashCode = hashCode * 59 + this.AttributeNumber.GetHashCode(); + hashCode = hashCode * 59 + this.AttributeInteger.GetHashCode(); + hashCode = hashCode * 59 + this.AttributeBoolean.GetHashCode(); if (this.WrappedArray != null) hashCode = hashCode * 59 + this.WrappedArray.GetHashCode(); if (this.NameString != null) hashCode = hashCode * 59 + this.NameString.GetHashCode(); - if (this.NameNumber != null) - hashCode = hashCode * 59 + this.NameNumber.GetHashCode(); - if (this.NameInteger != null) - hashCode = hashCode * 59 + this.NameInteger.GetHashCode(); - if (this.NameBoolean != null) - hashCode = hashCode * 59 + this.NameBoolean.GetHashCode(); + hashCode = hashCode * 59 + this.NameNumber.GetHashCode(); + hashCode = hashCode * 59 + this.NameInteger.GetHashCode(); + hashCode = hashCode * 59 + this.NameBoolean.GetHashCode(); if (this.NameArray != null) hashCode = hashCode * 59 + this.NameArray.GetHashCode(); if (this.NameWrappedArray != null) hashCode = hashCode * 59 + this.NameWrappedArray.GetHashCode(); if (this.PrefixString != null) hashCode = hashCode * 59 + this.PrefixString.GetHashCode(); - if (this.PrefixNumber != null) - hashCode = hashCode * 59 + this.PrefixNumber.GetHashCode(); - if (this.PrefixInteger != null) - hashCode = hashCode * 59 + this.PrefixInteger.GetHashCode(); - if (this.PrefixBoolean != null) - hashCode = hashCode * 59 + this.PrefixBoolean.GetHashCode(); + hashCode = hashCode * 59 + this.PrefixNumber.GetHashCode(); + hashCode = hashCode * 59 + this.PrefixInteger.GetHashCode(); + hashCode = hashCode * 59 + this.PrefixBoolean.GetHashCode(); if (this.PrefixArray != null) hashCode = hashCode * 59 + this.PrefixArray.GetHashCode(); if (this.PrefixWrappedArray != null) hashCode = hashCode * 59 + this.PrefixWrappedArray.GetHashCode(); if (this.NamespaceString != null) hashCode = hashCode * 59 + this.NamespaceString.GetHashCode(); - if (this.NamespaceNumber != null) - hashCode = hashCode * 59 + this.NamespaceNumber.GetHashCode(); - if (this.NamespaceInteger != null) - hashCode = hashCode * 59 + this.NamespaceInteger.GetHashCode(); - if (this.NamespaceBoolean != null) - hashCode = hashCode * 59 + this.NamespaceBoolean.GetHashCode(); + hashCode = hashCode * 59 + this.NamespaceNumber.GetHashCode(); + hashCode = hashCode * 59 + this.NamespaceInteger.GetHashCode(); + hashCode = hashCode * 59 + this.NamespaceBoolean.GetHashCode(); if (this.NamespaceArray != null) hashCode = hashCode * 59 + this.NamespaceArray.GetHashCode(); if (this.NamespaceWrappedArray != null) hashCode = hashCode * 59 + this.NamespaceWrappedArray.GetHashCode(); if (this.PrefixNsString != null) hashCode = hashCode * 59 + this.PrefixNsString.GetHashCode(); - if (this.PrefixNsNumber != null) - hashCode = hashCode * 59 + this.PrefixNsNumber.GetHashCode(); - if (this.PrefixNsInteger != null) - hashCode = hashCode * 59 + this.PrefixNsInteger.GetHashCode(); - if (this.PrefixNsBoolean != null) - hashCode = hashCode * 59 + this.PrefixNsBoolean.GetHashCode(); + hashCode = hashCode * 59 + this.PrefixNsNumber.GetHashCode(); + hashCode = hashCode * 59 + this.PrefixNsInteger.GetHashCode(); + hashCode = hashCode * 59 + this.PrefixNsBoolean.GetHashCode(); if (this.PrefixNsArray != null) hashCode = hashCode * 59 + this.PrefixNsArray.GetHashCode(); if (this.PrefixNsWrappedArray != null) diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj index cf727d2fde..77d93cd219 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -18,6 +18,7 @@ true Org.OpenAPITools 1.0.0 + bin\$(Configuration)\$(TargetFramework)\Org.OpenAPITools.xml diff --git a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/csharp/OpenAPIClient/README.md b/samples/client/petstore/csharp/OpenAPIClient/README.md index 6319d9193e..7a849134a1 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/README.md +++ b/samples/client/petstore/csharp/OpenAPIClient/README.md @@ -64,7 +64,6 @@ Then, publish to a [local feed](https://docs.microsoft.com/en-us/nuget/hosting-p ## Getting Started ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -74,10 +73,11 @@ namespace Example { public class Example { - public void main() + public static void Main() { - var apiInstance = new AnotherFakeApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new AnotherFakeApi(Configuration.Default); var body = new ModelClient(); // ModelClient | client model try @@ -86,9 +86,11 @@ namespace Example ModelClient result = apiInstance.Call123TestSpecialTags(body); Debug.WriteLine(result); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling AnotherFakeApi.Call123TestSpecialTags: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/AnotherFakeApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/AnotherFakeApi.md index d13566caf3..14ac2c12f2 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/docs/AnotherFakeApi.md +++ b/samples/client/petstore/csharp/OpenAPIClient/docs/AnotherFakeApi.md @@ -19,7 +19,6 @@ To test special tags and operation ID starting with number ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -29,9 +28,10 @@ namespace Example { public class Call123TestSpecialTagsExample { - public void main() + public static void Main() { - var apiInstance = new AnotherFakeApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new AnotherFakeApi(Configuration.Default); var body = new ModelClient(); // ModelClient | client model try @@ -40,9 +40,11 @@ namespace Example ModelClient result = apiInstance.Call123TestSpecialTags(body); Debug.WriteLine(result); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling AnotherFakeApi.Call123TestSpecialTags: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/EnumTest.md b/samples/client/petstore/csharp/OpenAPIClient/docs/EnumTest.md index 17d159dc8a..8e213c3335 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/docs/EnumTest.md +++ b/samples/client/petstore/csharp/OpenAPIClient/docs/EnumTest.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **EnumStringRequired** | **string** | | **EnumInteger** | **int?** | | [optional] **EnumNumber** | **double?** | | [optional] -**OuterEnum** | [**OuterEnum**](OuterEnum.md) | | [optional] +**OuterEnum** | **OuterEnum** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md index a2284ba8f3..2f97f3017d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md +++ b/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md @@ -31,7 +31,6 @@ this route creates an XmlItem ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -41,9 +40,10 @@ namespace Example { public class CreateXmlItemExample { - public void main() + public static void Main() { - var apiInstance = new FakeApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(Configuration.Default); var xmlItem = new XmlItem(); // XmlItem | XmlItem Body try @@ -51,9 +51,11 @@ namespace Example // creates an XmlItem apiInstance.CreateXmlItem(xmlItem); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling FakeApi.CreateXmlItem: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -97,7 +99,6 @@ Test serialization of outer boolean types ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -107,9 +108,10 @@ namespace Example { public class FakeOuterBooleanSerializeExample { - public void main() + public static void Main() { - var apiInstance = new FakeApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(Configuration.Default); var body = true; // bool? | Input boolean as post body (optional) try @@ -117,9 +119,11 @@ namespace Example bool? result = apiInstance.FakeOuterBooleanSerialize(body); Debug.WriteLine(result); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling FakeApi.FakeOuterBooleanSerialize: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -163,7 +167,6 @@ Test serialization of object with outer number type ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -173,9 +176,10 @@ namespace Example { public class FakeOuterCompositeSerializeExample { - public void main() + public static void Main() { - var apiInstance = new FakeApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(Configuration.Default); var body = new OuterComposite(); // OuterComposite | Input composite as post body (optional) try @@ -183,9 +187,11 @@ namespace Example OuterComposite result = apiInstance.FakeOuterCompositeSerialize(body); Debug.WriteLine(result); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling FakeApi.FakeOuterCompositeSerialize: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -229,7 +235,6 @@ Test serialization of outer number types ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -239,9 +244,10 @@ namespace Example { public class FakeOuterNumberSerializeExample { - public void main() + public static void Main() { - var apiInstance = new FakeApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(Configuration.Default); var body = 8.14; // decimal? | Input number as post body (optional) try @@ -249,9 +255,11 @@ namespace Example decimal? result = apiInstance.FakeOuterNumberSerialize(body); Debug.WriteLine(result); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling FakeApi.FakeOuterNumberSerialize: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -295,7 +303,6 @@ Test serialization of outer string types ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -305,9 +312,10 @@ namespace Example { public class FakeOuterStringSerializeExample { - public void main() + public static void Main() { - var apiInstance = new FakeApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(Configuration.Default); var body = body_example; // string | Input string as post body (optional) try @@ -315,9 +323,11 @@ namespace Example string result = apiInstance.FakeOuterStringSerialize(body); Debug.WriteLine(result); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling FakeApi.FakeOuterStringSerialize: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -361,7 +371,6 @@ For this test, the body for this request much reference a schema named `File`. ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -371,18 +380,21 @@ namespace Example { public class TestBodyWithFileSchemaExample { - public void main() + public static void Main() { - var apiInstance = new FakeApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(Configuration.Default); var body = new FileSchemaTestClass(); // FileSchemaTestClass | try { apiInstance.TestBodyWithFileSchema(body); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling FakeApi.TestBodyWithFileSchema: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -424,7 +436,6 @@ No authorization required ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -434,9 +445,10 @@ namespace Example { public class TestBodyWithQueryParamsExample { - public void main() + public static void Main() { - var apiInstance = new FakeApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(Configuration.Default); var query = query_example; // string | var body = new User(); // User | @@ -444,9 +456,11 @@ namespace Example { apiInstance.TestBodyWithQueryParams(query, body); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling FakeApi.TestBodyWithQueryParams: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -491,7 +505,6 @@ To test \"client\" model ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -501,9 +514,10 @@ namespace Example { public class TestClientModelExample { - public void main() + public static void Main() { - var apiInstance = new FakeApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(Configuration.Default); var body = new ModelClient(); // ModelClient | client model try @@ -512,9 +526,11 @@ namespace Example ModelClient result = apiInstance.TestClientModel(body); Debug.WriteLine(result); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling FakeApi.TestClientModel: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -558,7 +574,6 @@ Fake endpoint for testing various parameters 假端點 偽のエンドポイン ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -568,13 +583,14 @@ namespace Example { public class TestEndpointParametersExample { - public void main() + public static void Main() { + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; // Configure HTTP basic authorization: http_basic_test Configuration.Default.Username = "YOUR_USERNAME"; Configuration.Default.Password = "YOUR_PASSWORD"; - var apiInstance = new FakeApi(); + var apiInstance = new FakeApi(Configuration.Default); var number = 8.14; // decimal? | None var _double = 1.2D; // double? | None var patternWithoutDelimiter = patternWithoutDelimiter_example; // string | None @@ -595,9 +611,11 @@ namespace Example // Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 apiInstance.TestEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, _string, binary, date, dateTime, password, callback); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling FakeApi.TestEndpointParameters: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -654,7 +672,6 @@ To test enum parameters ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -664,9 +681,10 @@ namespace Example { public class TestEnumParametersExample { - public void main() + public static void Main() { - var apiInstance = new FakeApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(Configuration.Default); var enumHeaderStringArray = enumHeaderStringArray_example; // List | Header parameter enum test (string array) (optional) var enumHeaderString = enumHeaderString_example; // string | Header parameter enum test (string) (optional) (default to -efg) var enumQueryStringArray = enumQueryStringArray_example; // List | Query parameter enum test (string array) (optional) @@ -681,9 +699,11 @@ namespace Example // To test enum parameters apiInstance.TestEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling FakeApi.TestEnumParameters: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -734,7 +754,6 @@ Fake endpoint to test group parameters (optional) ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -744,9 +763,10 @@ namespace Example { public class TestGroupParametersExample { - public void main() + public static void Main() { - var apiInstance = new FakeApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(Configuration.Default); var requiredStringGroup = 56; // int? | Required String in group parameters var requiredBooleanGroup = true; // bool? | Required Boolean in group parameters var requiredInt64Group = 789; // long? | Required Integer in group parameters @@ -759,9 +779,11 @@ namespace Example // Fake endpoint to test group parameters (optional) apiInstance.TestGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling FakeApi.TestGroupParameters: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -808,7 +830,6 @@ test inline additionalProperties ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -818,9 +839,10 @@ namespace Example { public class TestInlineAdditionalPropertiesExample { - public void main() + public static void Main() { - var apiInstance = new FakeApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(Configuration.Default); var param = new Dictionary(); // Dictionary | request body try @@ -828,9 +850,11 @@ namespace Example // test inline additionalProperties apiInstance.TestInlineAdditionalProperties(param); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling FakeApi.TestInlineAdditionalProperties: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -872,7 +896,6 @@ test json serialization of form data ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -882,9 +905,10 @@ namespace Example { public class TestJsonFormDataExample { - public void main() + public static void Main() { - var apiInstance = new FakeApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new FakeApi(Configuration.Default); var param = param_example; // string | field1 var param2 = param2_example; // string | field2 @@ -893,9 +917,11 @@ namespace Example // test json serialization of form data apiInstance.TestJsonFormData(param, param2); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling FakeApi.TestJsonFormData: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/OpenAPIClient/docs/FakeClassnameTags123Api.md index cc0cd83d12..acc5f0799f 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/docs/FakeClassnameTags123Api.md +++ b/samples/client/petstore/csharp/OpenAPIClient/docs/FakeClassnameTags123Api.md @@ -19,7 +19,6 @@ To test class name in snake case ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -29,14 +28,15 @@ namespace Example { public class TestClassnameExample { - public void main() + public static void Main() { + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; // Configure API key authorization: api_key_query Configuration.Default.AddApiKey("api_key_query", "YOUR_API_KEY"); // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed // Configuration.Default.AddApiKeyPrefix("api_key_query", "Bearer"); - var apiInstance = new FakeClassnameTags123Api(); + var apiInstance = new FakeClassnameTags123Api(Configuration.Default); var body = new ModelClient(); // ModelClient | client model try @@ -45,9 +45,11 @@ namespace Example ModelClient result = apiInstance.TestClassname(body); Debug.WriteLine(result); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling FakeClassnameTags123Api.TestClassname: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/PetApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/PetApi.md index d2e2075bfd..3b09a06942 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/docs/PetApi.md +++ b/samples/client/petstore/csharp/OpenAPIClient/docs/PetApi.md @@ -25,7 +25,6 @@ Add a new pet to the store ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -35,12 +34,13 @@ namespace Example { public class AddPetExample { - public void main() + public static void Main() { + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; // Configure OAuth2 access token for authorization: petstore_auth Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - var apiInstance = new PetApi(); + var apiInstance = new PetApi(Configuration.Default); var body = new Pet(); // Pet | Pet object that needs to be added to the store try @@ -48,9 +48,11 @@ namespace Example // Add a new pet to the store apiInstance.AddPet(body); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling PetApi.AddPet: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -92,7 +94,6 @@ Deletes a pet ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -102,12 +103,13 @@ namespace Example { public class DeletePetExample { - public void main() + public static void Main() { + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; // Configure OAuth2 access token for authorization: petstore_auth Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - var apiInstance = new PetApi(); + var apiInstance = new PetApi(Configuration.Default); var petId = 789; // long? | Pet id to delete var apiKey = apiKey_example; // string | (optional) @@ -116,9 +118,11 @@ namespace Example // Deletes a pet apiInstance.DeletePet(petId, apiKey); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling PetApi.DeletePet: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -163,7 +167,6 @@ Multiple status values can be provided with comma separated strings ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -173,12 +176,13 @@ namespace Example { public class FindPetsByStatusExample { - public void main() + public static void Main() { + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; // Configure OAuth2 access token for authorization: petstore_auth Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - var apiInstance = new PetApi(); + var apiInstance = new PetApi(Configuration.Default); var status = status_example; // List | Status values that need to be considered for filter try @@ -187,9 +191,11 @@ namespace Example List<Pet> result = apiInstance.FindPetsByStatus(status); Debug.WriteLine(result); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling PetApi.FindPetsByStatus: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -233,7 +239,6 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -243,12 +248,13 @@ namespace Example { public class FindPetsByTagsExample { - public void main() + public static void Main() { + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; // Configure OAuth2 access token for authorization: petstore_auth Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - var apiInstance = new PetApi(); + var apiInstance = new PetApi(Configuration.Default); var tags = new List(); // List | Tags to filter by try @@ -257,9 +263,11 @@ namespace Example List<Pet> result = apiInstance.FindPetsByTags(tags); Debug.WriteLine(result); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling PetApi.FindPetsByTags: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -303,7 +311,6 @@ Returns a single pet ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -313,14 +320,15 @@ namespace Example { public class GetPetByIdExample { - public void main() + public static void Main() { + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; // Configure API key authorization: api_key Configuration.Default.AddApiKey("api_key", "YOUR_API_KEY"); // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed // Configuration.Default.AddApiKeyPrefix("api_key", "Bearer"); - var apiInstance = new PetApi(); + var apiInstance = new PetApi(Configuration.Default); var petId = 789; // long? | ID of pet to return try @@ -329,9 +337,11 @@ namespace Example Pet result = apiInstance.GetPetById(petId); Debug.WriteLine(result); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling PetApi.GetPetById: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -373,7 +383,6 @@ Update an existing pet ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -383,12 +392,13 @@ namespace Example { public class UpdatePetExample { - public void main() + public static void Main() { + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; // Configure OAuth2 access token for authorization: petstore_auth Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - var apiInstance = new PetApi(); + var apiInstance = new PetApi(Configuration.Default); var body = new Pet(); // Pet | Pet object that needs to be added to the store try @@ -396,9 +406,11 @@ namespace Example // Update an existing pet apiInstance.UpdatePet(body); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling PetApi.UpdatePet: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -440,7 +452,6 @@ Updates a pet in the store with form data ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -450,12 +461,13 @@ namespace Example { public class UpdatePetWithFormExample { - public void main() + public static void Main() { + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; // Configure OAuth2 access token for authorization: petstore_auth Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - var apiInstance = new PetApi(); + var apiInstance = new PetApi(Configuration.Default); var petId = 789; // long? | ID of pet that needs to be updated var name = name_example; // string | Updated name of the pet (optional) var status = status_example; // string | Updated status of the pet (optional) @@ -465,9 +477,11 @@ namespace Example // Updates a pet in the store with form data apiInstance.UpdatePetWithForm(petId, name, status); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling PetApi.UpdatePetWithForm: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -511,7 +525,6 @@ uploads an image ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -521,12 +534,13 @@ namespace Example { public class UploadFileExample { - public void main() + public static void Main() { + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; // Configure OAuth2 access token for authorization: petstore_auth Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - var apiInstance = new PetApi(); + var apiInstance = new PetApi(Configuration.Default); var petId = 789; // long? | ID of pet to update var additionalMetadata = additionalMetadata_example; // string | Additional data to pass to server (optional) var file = BINARY_DATA_HERE; // System.IO.Stream | file to upload (optional) @@ -537,9 +551,11 @@ namespace Example ApiResponse result = apiInstance.UploadFile(petId, additionalMetadata, file); Debug.WriteLine(result); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling PetApi.UploadFile: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -583,7 +599,6 @@ uploads an image (required) ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -593,12 +608,13 @@ namespace Example { public class UploadFileWithRequiredFileExample { - public void main() + public static void Main() { + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; // Configure OAuth2 access token for authorization: petstore_auth Configuration.Default.AccessToken = "YOUR_ACCESS_TOKEN"; - var apiInstance = new PetApi(); + var apiInstance = new PetApi(Configuration.Default); var petId = 789; // long? | ID of pet to update var requiredFile = BINARY_DATA_HERE; // System.IO.Stream | file to upload var additionalMetadata = additionalMetadata_example; // string | Additional data to pass to server (optional) @@ -609,9 +625,11 @@ namespace Example ApiResponse result = apiInstance.UploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); Debug.WriteLine(result); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling PetApi.UploadFileWithRequiredFile: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/StoreApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/StoreApi.md index 0f6d9e4e3d..379c4ef394 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/docs/StoreApi.md +++ b/samples/client/petstore/csharp/OpenAPIClient/docs/StoreApi.md @@ -22,7 +22,6 @@ For valid response try integer IDs with value < 1000. Anything above 1000 or non ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -32,9 +31,10 @@ namespace Example { public class DeleteOrderExample { - public void main() + public static void Main() { - var apiInstance = new StoreApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new StoreApi(Configuration.Default); var orderId = orderId_example; // string | ID of the order that needs to be deleted try @@ -42,9 +42,11 @@ namespace Example // Delete purchase order by ID apiInstance.DeleteOrder(orderId); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling StoreApi.DeleteOrder: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -88,7 +90,6 @@ Returns a map of status codes to quantities ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -98,14 +99,15 @@ namespace Example { public class GetInventoryExample { - public void main() + public static void Main() { + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; // Configure API key authorization: api_key Configuration.Default.AddApiKey("api_key", "YOUR_API_KEY"); // Uncomment below to setup prefix (e.g. Bearer) for API key, if needed // Configuration.Default.AddApiKeyPrefix("api_key", "Bearer"); - var apiInstance = new StoreApi(); + var apiInstance = new StoreApi(Configuration.Default); try { @@ -113,9 +115,11 @@ namespace Example Dictionary<string, int?> result = apiInstance.GetInventory(); Debug.WriteLine(result); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling StoreApi.GetInventory: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -156,7 +160,6 @@ For valid response try integer IDs with value <= 5 or > 10. Other values will ge ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -166,9 +169,10 @@ namespace Example { public class GetOrderByIdExample { - public void main() + public static void Main() { - var apiInstance = new StoreApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new StoreApi(Configuration.Default); var orderId = 789; // long? | ID of pet that needs to be fetched try @@ -177,9 +181,11 @@ namespace Example Order result = apiInstance.GetOrderById(orderId); Debug.WriteLine(result); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling StoreApi.GetOrderById: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -221,7 +227,6 @@ Place an order for a pet ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -231,9 +236,10 @@ namespace Example { public class PlaceOrderExample { - public void main() + public static void Main() { - var apiInstance = new StoreApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new StoreApi(Configuration.Default); var body = new Order(); // Order | order placed for purchasing the pet try @@ -242,9 +248,11 @@ namespace Example Order result = apiInstance.PlaceOrder(body); Debug.WriteLine(result); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling StoreApi.PlaceOrder: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/UserApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/UserApi.md index b9f592bdd7..8d41e64c6b 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/docs/UserApi.md +++ b/samples/client/petstore/csharp/OpenAPIClient/docs/UserApi.md @@ -26,7 +26,6 @@ This can only be done by the logged in user. ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -36,9 +35,10 @@ namespace Example { public class CreateUserExample { - public void main() + public static void Main() { - var apiInstance = new UserApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new UserApi(Configuration.Default); var body = new User(); // User | Created user object try @@ -46,9 +46,11 @@ namespace Example // Create user apiInstance.CreateUser(body); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling UserApi.CreateUser: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -90,7 +92,6 @@ Creates list of users with given input array ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -100,9 +101,10 @@ namespace Example { public class CreateUsersWithArrayInputExample { - public void main() + public static void Main() { - var apiInstance = new UserApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new UserApi(Configuration.Default); var body = new List(); // List | List of user object try @@ -110,9 +112,11 @@ namespace Example // Creates list of users with given input array apiInstance.CreateUsersWithArrayInput(body); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling UserApi.CreateUsersWithArrayInput: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -154,7 +158,6 @@ Creates list of users with given input array ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -164,9 +167,10 @@ namespace Example { public class CreateUsersWithListInputExample { - public void main() + public static void Main() { - var apiInstance = new UserApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new UserApi(Configuration.Default); var body = new List(); // List | List of user object try @@ -174,9 +178,11 @@ namespace Example // Creates list of users with given input array apiInstance.CreateUsersWithListInput(body); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling UserApi.CreateUsersWithListInput: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -220,7 +226,6 @@ This can only be done by the logged in user. ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -230,9 +235,10 @@ namespace Example { public class DeleteUserExample { - public void main() + public static void Main() { - var apiInstance = new UserApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new UserApi(Configuration.Default); var username = username_example; // string | The name that needs to be deleted try @@ -240,9 +246,11 @@ namespace Example // Delete user apiInstance.DeleteUser(username); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling UserApi.DeleteUser: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -284,7 +292,6 @@ Get user by user name ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -294,9 +301,10 @@ namespace Example { public class GetUserByNameExample { - public void main() + public static void Main() { - var apiInstance = new UserApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new UserApi(Configuration.Default); var username = username_example; // string | The name that needs to be fetched. Use user1 for testing. try @@ -305,9 +313,11 @@ namespace Example User result = apiInstance.GetUserByName(username); Debug.WriteLine(result); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling UserApi.GetUserByName: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -349,7 +359,6 @@ Logs user into the system ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -359,9 +368,10 @@ namespace Example { public class LoginUserExample { - public void main() + public static void Main() { - var apiInstance = new UserApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new UserApi(Configuration.Default); var username = username_example; // string | The user name for login var password = password_example; // string | The password for login in clear text @@ -371,9 +381,11 @@ namespace Example string result = apiInstance.LoginUser(username, password); Debug.WriteLine(result); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling UserApi.LoginUser: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -416,7 +428,6 @@ Logs out current logged in user session ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -426,18 +437,21 @@ namespace Example { public class LogoutUserExample { - public void main() + public static void Main() { - var apiInstance = new UserApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new UserApi(Configuration.Default); try { // Logs out current logged in user session apiInstance.LogoutUser(); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling UserApi.LogoutUser: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } @@ -478,7 +492,6 @@ This can only be done by the logged in user. ### Example ```csharp -using System; using System.Diagnostics; using Org.OpenAPITools.Api; using Org.OpenAPITools.Client; @@ -488,9 +501,10 @@ namespace Example { public class UpdateUserExample { - public void main() + public static void Main() { - var apiInstance = new UserApi(); + Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2"; + var apiInstance = new UserApi(Configuration.Default); var username = username_example; // string | name that need to be deleted var body = new User(); // User | Updated user object @@ -499,9 +513,11 @@ namespace Example // Updated user apiInstance.UpdateUser(username, body); } - catch (Exception e) + catch (ApiException e) { Debug.Print("Exception when calling UserApi.UpdateUser: " + e.Message ); + Debug.Print("Status Code: "+ e.ErrorCode); + Debug.Print(e.StackTrace); } } } diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs index 145e11d6fb..48a0f2fa08 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumTest.cs @@ -140,6 +140,11 @@ namespace Org.OpenAPITools.Model [DataMember(Name="enum_number", EmitDefaultValue=false)] public EnumNumberEnum? EnumNumber { get; set; } /// + /// Gets or Sets OuterEnum + /// + [DataMember(Name="outerEnum", EmitDefaultValue=false)] + public OuterEnum? OuterEnum { get; set; } + /// /// Initializes a new instance of the class. /// [JsonConstructorAttribute] @@ -174,11 +179,6 @@ namespace Org.OpenAPITools.Model - /// - /// Gets or Sets OuterEnum - /// - [DataMember(Name="outerEnum", EmitDefaultValue=false)] - public OuterEnum OuterEnum { get; set; } /// /// Returns the string presentation of the object diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj index 83904ca54e..bd27e1ca75 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj +++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -28,6 +28,7 @@ The version of the OpenAPI document: 1.0.0 DEBUG;TRACE prompt 4 + bin\Debug\Org.OpenAPITools.xml pdbonly @@ -36,6 +37,7 @@ The version of the OpenAPI document: 1.0.0 TRACE prompt 4 + bin\Release\Org.OpenAPITools.xml diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClientNet35/.openapi-generator/VERSION index afa6365606..06b5019af3 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/README.md b/samples/client/petstore/csharp/OpenAPIClientNet35/README.md index 53a2a70da9..6319d9193e 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/README.md +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/README.md @@ -157,9 +157,11 @@ Class | Method | HTTP request | Description - [Model.ArrayTest](docs/ArrayTest.md) - [Model.Capitalization](docs/Capitalization.md) - [Model.Cat](docs/Cat.md) + - [Model.CatAllOf](docs/CatAllOf.md) - [Model.Category](docs/Category.md) - [Model.ClassModel](docs/ClassModel.md) - [Model.Dog](docs/Dog.md) + - [Model.DogAllOf](docs/DogAllOf.md) - [Model.EnumArrays](docs/EnumArrays.md) - [Model.EnumClass](docs/EnumClass.md) - [Model.EnumTest](docs/EnumTest.md) diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/docs/CatAllOf.md b/samples/client/petstore/csharp/OpenAPIClientNet35/docs/CatAllOf.md new file mode 100644 index 0000000000..1a63076045 --- /dev/null +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/docs/CatAllOf.md @@ -0,0 +1,13 @@ + +# Org.OpenAPITools.Model.CatAllOf + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Declawed** | **bool?** | | [optional] + +[[Back to Model list]](../README.md#documentation-for-models) +[[Back to API list]](../README.md#documentation-for-api-endpoints) +[[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/docs/DogAllOf.md b/samples/client/petstore/csharp/OpenAPIClientNet35/docs/DogAllOf.md new file mode 100644 index 0000000000..d72134a0f5 --- /dev/null +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/docs/DogAllOf.md @@ -0,0 +1,13 @@ + +# Org.OpenAPITools.Model.DogAllOf + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Breed** | **string** | | [optional] + +[[Back to Model list]](../README.md#documentation-for-models) +[[Back to API list]](../README.md#documentation-for-api-endpoints) +[[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/docs/EnumTest.md b/samples/client/petstore/csharp/OpenAPIClientNet35/docs/EnumTest.md index 17d159dc8a..8e213c3335 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/docs/EnumTest.md +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/docs/EnumTest.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **EnumStringRequired** | **string** | | **EnumInteger** | **int?** | | [optional] **EnumNumber** | **double?** | | [optional] -**OuterEnum** | [**OuterEnum**](OuterEnum.md) | | [optional] +**OuterEnum** | **OuterEnum** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs new file mode 100644 index 0000000000..568d813749 --- /dev/null +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs @@ -0,0 +1,80 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using NUnit.Framework; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test +{ + /// + /// Class for testing CatAllOf + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + [TestFixture] + public class CatAllOfTests + { + // TODO uncomment below to declare an instance variable for CatAllOf + //private CatAllOf instance; + + /// + /// Setup before each test + /// + [SetUp] + public void Init() + { + // TODO uncomment below to create an instance of CatAllOf + //instance = new CatAllOf(); + } + + /// + /// Clean up after each test + /// + [TearDown] + public void Cleanup() + { + + } + + /// + /// Test an instance of CatAllOf + /// + [Test] + public void CatAllOfInstanceTest() + { + // TODO uncomment below to test "IsInstanceOfType" CatAllOf + //Assert.IsInstanceOfType (instance, "variable 'instance' is a CatAllOf"); + } + + + /// + /// Test the property 'Declawed' + /// + [Test] + public void DeclawedTest() + { + // TODO unit test for the property 'Declawed' + } + + } + +} diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs new file mode 100644 index 0000000000..993e29f6d0 --- /dev/null +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs @@ -0,0 +1,80 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using NUnit.Framework; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test +{ + /// + /// Class for testing DogAllOf + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + [TestFixture] + public class DogAllOfTests + { + // TODO uncomment below to declare an instance variable for DogAllOf + //private DogAllOf instance; + + /// + /// Setup before each test + /// + [SetUp] + public void Init() + { + // TODO uncomment below to create an instance of DogAllOf + //instance = new DogAllOf(); + } + + /// + /// Clean up after each test + /// + [TearDown] + public void Cleanup() + { + + } + + /// + /// Test an instance of DogAllOf + /// + [Test] + public void DogAllOfInstanceTest() + { + // TODO uncomment below to test "IsInstanceOfType" DogAllOf + //Assert.IsInstanceOfType (instance, "variable 'instance' is a DogAllOf"); + } + + + /// + /// Test the property 'Breed' + /// + [Test] + public void BreedTest() + { + // TODO unit test for the property 'Breed' + } + + } + +} diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj index 5f2733c677..9e22db187c 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj @@ -4,7 +4,7 @@ OpenAPI Petstore This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ -OpenAPI spec version: 1.0.0 +The version of the OpenAPI document: 1.0.0 --> diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index cbe2464ac8..6d129b8a74 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/FakeApi.cs index fa602a34e9..40a419d09b 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/FakeApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 8ca54f6e6a..239dafb914 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/PetApi.cs index 562ed4d5ae..f9413810c0 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/PetApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/StoreApi.cs index fd2c23bdfb..49bf78ae6a 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/StoreApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/UserApi.cs index 5f09ccc238..818fb173f6 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Api/UserApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/ApiClient.cs index 901335f629..82cc839063 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/ApiClient.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/ApiClient.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/ApiException.cs index d15fd1df8f..31d7a6c635 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/ApiException.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/ApiException.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/ApiResponse.cs index 3e395de9df..4b462cf542 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/ApiResponse.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/ApiResponse.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/Configuration.cs index 6a082c1953..cc21a23b31 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/Configuration.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/Configuration.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/ExceptionFactory.cs index 66c4aa3a14..d855d96821 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/ExceptionFactory.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/ExceptionFactory.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/GlobalConfiguration.cs index 309e385f25..a79bea966b 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/GlobalConfiguration.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/GlobalConfiguration.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/IApiAccessor.cs index 3b4834c409..cd03e8c1f9 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/IApiAccessor.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/IApiAccessor.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/IReadableConfiguration.cs index 76a5f5124f..23e1a0c2e1 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/IReadableConfiguration.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/IReadableConfiguration.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs index 4f5c219d5c..a1bd6b08f3 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs index d20d7e825c..20bc01f4d7 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs index 3c87982577..a48978c498 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs index d3aab7771a..cc42cdc1d5 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs index ff50011195..98b1850613 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs index 932d28e138..815d32d51a 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs index 7a12916678..9e9437dbb7 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs index 9b2da0d2ef..10aa35f0cd 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs index 0ee1b8b937..49d0565ffc 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Animal.cs index ca06f8cfe3..5068caf52d 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Animal.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ApiResponse.cs index df2be1621b..5792ae8a10 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs index 80cc909239..809bec2676 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs index 68a75417be..169674bf0e 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ArrayTest.cs index e17b73fe82..1cd33865f7 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ArrayTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ArrayTest.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Capitalization.cs index a26db78061..4b4f476d1b 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Capitalization.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Capitalization.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Cat.cs index a9ded4c869..4eed9cb028 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Cat.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/CatAllOf.cs new file mode 100644 index 0000000000..c29f4154b2 --- /dev/null +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/CatAllOf.cs @@ -0,0 +1,115 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// CatAllOf + /// + [DataContract] + public partial class CatAllOf : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// declawed. + public CatAllOf(bool? declawed = default(bool?)) + { + this.Declawed = declawed; + } + + /// + /// Gets or Sets Declawed + /// + [DataMember(Name="declawed", EmitDefaultValue=false)] + public bool? Declawed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class CatAllOf {\n"); + sb.Append(" Declawed: ").Append(Declawed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as CatAllOf); + } + + /// + /// Returns true if CatAllOf instances are equal + /// + /// Instance of CatAllOf to be compared + /// Boolean + public bool Equals(CatAllOf input) + { + if (input == null) + return false; + + return + ( + this.Declawed == input.Declawed || + (this.Declawed != null && + this.Declawed.Equals(input.Declawed)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Declawed != null) + hashCode = hashCode * 59 + this.Declawed.GetHashCode(); + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Category.cs index 9886bbc1f8..d80ae817b5 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Category.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ClassModel.cs index fcd2496b72..01c9a83299 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ClassModel.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Dog.cs index 73ad9a6675..bc15d11136 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Dog.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/DogAllOf.cs new file mode 100644 index 0000000000..58659dc514 --- /dev/null +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/DogAllOf.cs @@ -0,0 +1,115 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// DogAllOf + /// + [DataContract] + public partial class DogAllOf : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// breed. + public DogAllOf(string breed = default(string)) + { + this.Breed = breed; + } + + /// + /// Gets or Sets Breed + /// + [DataMember(Name="breed", EmitDefaultValue=false)] + public string Breed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class DogAllOf {\n"); + sb.Append(" Breed: ").Append(Breed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as DogAllOf); + } + + /// + /// Returns true if DogAllOf instances are equal + /// + /// Instance of DogAllOf to be compared + /// Boolean + public bool Equals(DogAllOf input) + { + if (input == null) + return false; + + return + ( + this.Breed == input.Breed || + (this.Breed != null && + this.Breed.Equals(input.Breed)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Breed != null) + hashCode = hashCode * 59 + this.Breed.GetHashCode(); + return hashCode; + } + } + + } + +} diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/EnumArrays.cs index 8d643d37d0..3f6744d95d 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/EnumClass.cs index 33643e475f..96e427f9b3 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/EnumClass.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/EnumTest.cs index 544b1543c6..824b6d8571 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/EnumTest.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -140,6 +140,11 @@ namespace Org.OpenAPITools.Model [DataMember(Name="enum_number", EmitDefaultValue=false)] public EnumNumberEnum? EnumNumber { get; set; } /// + /// Gets or Sets OuterEnum + /// + [DataMember(Name="outerEnum", EmitDefaultValue=false)] + public OuterEnum? OuterEnum { get; set; } + /// /// Initializes a new instance of the class. /// [JsonConstructorAttribute] @@ -174,11 +179,6 @@ namespace Org.OpenAPITools.Model - /// - /// Gets or Sets OuterEnum - /// - [DataMember(Name="outerEnum", EmitDefaultValue=false)] - public OuterEnum OuterEnum { get; set; } /// /// Returns the string presentation of the object diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/File.cs index 22367be1c2..e55ed620ea 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/File.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/File.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs index b679477f7a..5fe2f91e82 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/FormatTest.cs index f89aeb7e6f..25daf7c774 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/FormatTest.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs index 7636ce026d..91e9a6fbf7 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/List.cs index e697ad21ff..6f8bfb2f9b 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/List.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/List.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/MapTest.cs index 804a11c4f6..22a5518ea7 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/MapTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/MapTest.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index 8edb41201c..aa3345e1d9 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Model200Response.cs index 8891d8dd48..450c50836a 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Model200Response.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ModelClient.cs index 26bfeb6930..223e922d2e 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ModelClient.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ModelClient.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Name.cs index a2645d8ec8..164e7a4b99 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Name.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/NumberOnly.cs index e129386965..09e3dacc36 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Order.cs index 80bab785b7..4bee5ab82d 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Order.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/OuterComposite.cs index 5e7c7c05b5..90db696ba1 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/OuterEnum.cs index be116aff60..e902802e0d 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Pet.cs index 748ff6dbbd..6438aab75f 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Pet.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs index b30b5034da..e2af8b80b7 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Return.cs index b1474d94f3..6a8b71bd45 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Return.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/SpecialModelName.cs index 0ebe6ab62a..5528fbc994 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Tag.cs index 2085f24c4f..281c4dc2dd 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/Tag.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/TypeHolderDefault.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/TypeHolderDefault.cs index ab410c0052..e5002e562e 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/TypeHolderDefault.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/TypeHolderDefault.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/TypeHolderExample.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/TypeHolderExample.cs index 7f63275418..78e317bdfe 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/TypeHolderExample.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/TypeHolderExample.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/User.cs index 4470b4e69a..d8b52ce422 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/User.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/XmlItem.cs b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/XmlItem.cs index 8831868f20..c07a13af9d 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/XmlItem.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Model/XmlItem.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Org.OpenAPITools.csproj index 470e343575..dcba006076 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Org.OpenAPITools.csproj +++ b/samples/client/petstore/csharp/OpenAPIClientNet35/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -4,7 +4,7 @@ OpenAPI Petstore This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ -OpenAPI spec version: 1.0.0 +The version of the OpenAPI document: 1.0.0 --> @@ -28,6 +28,7 @@ OpenAPI spec version: 1.0.0 DEBUG;TRACE prompt 4 + bin\Debug\Org.OpenAPITools.xml pdbonly @@ -36,6 +37,7 @@ OpenAPI spec version: 1.0.0 TRACE prompt 4 + bin\Release\Org.OpenAPITools.xml diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClientNet40/.openapi-generator/VERSION index afa6365606..06b5019af3 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/README.md b/samples/client/petstore/csharp/OpenAPIClientNet40/README.md index 53a2a70da9..6319d9193e 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/README.md +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/README.md @@ -157,9 +157,11 @@ Class | Method | HTTP request | Description - [Model.ArrayTest](docs/ArrayTest.md) - [Model.Capitalization](docs/Capitalization.md) - [Model.Cat](docs/Cat.md) + - [Model.CatAllOf](docs/CatAllOf.md) - [Model.Category](docs/Category.md) - [Model.ClassModel](docs/ClassModel.md) - [Model.Dog](docs/Dog.md) + - [Model.DogAllOf](docs/DogAllOf.md) - [Model.EnumArrays](docs/EnumArrays.md) - [Model.EnumClass](docs/EnumClass.md) - [Model.EnumTest](docs/EnumTest.md) diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/docs/CatAllOf.md b/samples/client/petstore/csharp/OpenAPIClientNet40/docs/CatAllOf.md new file mode 100644 index 0000000000..1a63076045 --- /dev/null +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/docs/CatAllOf.md @@ -0,0 +1,13 @@ + +# Org.OpenAPITools.Model.CatAllOf + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Declawed** | **bool?** | | [optional] + +[[Back to Model list]](../README.md#documentation-for-models) +[[Back to API list]](../README.md#documentation-for-api-endpoints) +[[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/docs/DogAllOf.md b/samples/client/petstore/csharp/OpenAPIClientNet40/docs/DogAllOf.md new file mode 100644 index 0000000000..d72134a0f5 --- /dev/null +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/docs/DogAllOf.md @@ -0,0 +1,13 @@ + +# Org.OpenAPITools.Model.DogAllOf + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Breed** | **string** | | [optional] + +[[Back to Model list]](../README.md#documentation-for-models) +[[Back to API list]](../README.md#documentation-for-api-endpoints) +[[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/docs/EnumTest.md b/samples/client/petstore/csharp/OpenAPIClientNet40/docs/EnumTest.md index 17d159dc8a..8e213c3335 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/docs/EnumTest.md +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/docs/EnumTest.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **EnumStringRequired** | **string** | | **EnumInteger** | **int?** | | [optional] **EnumNumber** | **double?** | | [optional] -**OuterEnum** | [**OuterEnum**](OuterEnum.md) | | [optional] +**OuterEnum** | **OuterEnum** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Client/JsonSubTypesTests.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Client/JsonSubTypesTests.cs index db376d11b8..0df08ed75e 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Client/JsonSubTypesTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Client/JsonSubTypesTests.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs new file mode 100644 index 0000000000..568d813749 --- /dev/null +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs @@ -0,0 +1,80 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using NUnit.Framework; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test +{ + /// + /// Class for testing CatAllOf + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + [TestFixture] + public class CatAllOfTests + { + // TODO uncomment below to declare an instance variable for CatAllOf + //private CatAllOf instance; + + /// + /// Setup before each test + /// + [SetUp] + public void Init() + { + // TODO uncomment below to create an instance of CatAllOf + //instance = new CatAllOf(); + } + + /// + /// Clean up after each test + /// + [TearDown] + public void Cleanup() + { + + } + + /// + /// Test an instance of CatAllOf + /// + [Test] + public void CatAllOfInstanceTest() + { + // TODO uncomment below to test "IsInstanceOfType" CatAllOf + //Assert.IsInstanceOfType (instance, "variable 'instance' is a CatAllOf"); + } + + + /// + /// Test the property 'Declawed' + /// + [Test] + public void DeclawedTest() + { + // TODO unit test for the property 'Declawed' + } + + } + +} diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs new file mode 100644 index 0000000000..993e29f6d0 --- /dev/null +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs @@ -0,0 +1,80 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using NUnit.Framework; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test +{ + /// + /// Class for testing DogAllOf + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + [TestFixture] + public class DogAllOfTests + { + // TODO uncomment below to declare an instance variable for DogAllOf + //private DogAllOf instance; + + /// + /// Setup before each test + /// + [SetUp] + public void Init() + { + // TODO uncomment below to create an instance of DogAllOf + //instance = new DogAllOf(); + } + + /// + /// Clean up after each test + /// + [TearDown] + public void Cleanup() + { + + } + + /// + /// Test an instance of DogAllOf + /// + [Test] + public void DogAllOfInstanceTest() + { + // TODO uncomment below to test "IsInstanceOfType" DogAllOf + //Assert.IsInstanceOfType (instance, "variable 'instance' is a DogAllOf"); + } + + + /// + /// Test the property 'Breed' + /// + [Test] + public void BreedTest() + { + // TODO unit test for the property 'Breed' + } + + } + +} diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj index 25c5a97117..f977b43d8a 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj @@ -4,7 +4,7 @@ OpenAPI Petstore This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ -OpenAPI spec version: 1.0.0 +The version of the OpenAPI document: 1.0.0 --> diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 5e352872b6..8ea2b0befa 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/FakeApi.cs index 56dd842977..cf5d3eaf93 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/FakeApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 20beae0db8..071bb0b27b 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/PetApi.cs index e39ff67687..3fdb793b6c 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/PetApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/StoreApi.cs index d42023788f..6336580069 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/StoreApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/UserApi.cs index 27e6ad33cb..ede5bff28b 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Api/UserApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/ApiClient.cs index 901335f629..82cc839063 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/ApiClient.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/ApiClient.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/ApiException.cs index d15fd1df8f..31d7a6c635 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/ApiException.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/ApiException.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/ApiResponse.cs index 3e395de9df..4b462cf542 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/ApiResponse.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/ApiResponse.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/Configuration.cs index b530746cb5..926007e22c 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/Configuration.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/Configuration.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/ExceptionFactory.cs index 66c4aa3a14..d855d96821 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/ExceptionFactory.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/ExceptionFactory.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/GlobalConfiguration.cs index 309e385f25..a79bea966b 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/GlobalConfiguration.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/GlobalConfiguration.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/IApiAccessor.cs index 3b4834c409..cd03e8c1f9 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/IApiAccessor.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/IApiAccessor.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/IReadableConfiguration.cs index 76a5f5124f..23e1a0c2e1 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/IReadableConfiguration.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/IReadableConfiguration.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs index 4f5c219d5c..a1bd6b08f3 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/ReadOnlyDictionary.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/ReadOnlyDictionary.cs index d0f7198f5e..a9d37e8406 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/ReadOnlyDictionary.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Client/ReadOnlyDictionary.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs index a659e54bc6..acdc11b54b 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs index ff4c969b4e..f317c15537 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs index 0cd59d895d..bb8bb6475e 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs index ff12e67bf1..661333e127 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs index b5035599f5..dacca87d55 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs index e3882f1310..316ac1b811 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs index f866f05763..cb6e05daeb 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs index bb1766c203..677c32fde0 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Animal.cs index 9d88ed1560..d158ed573a 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Animal.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ApiResponse.cs index da35fa03b6..ca5099c2e1 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs index 1bf2bf1bd2..2ca48dc1b1 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs index 8c4140dbc4..9b600f4a79 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ArrayTest.cs index 5c44643bc0..3738a4e447 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ArrayTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ArrayTest.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Capitalization.cs index eba3bc6859..058ce89df0 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Capitalization.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Capitalization.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Cat.cs index 1504638f6f..8dd338b3e5 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Cat.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/CatAllOf.cs new file mode 100644 index 0000000000..e17ff89769 --- /dev/null +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/CatAllOf.cs @@ -0,0 +1,124 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// CatAllOf + /// + [DataContract] + public partial class CatAllOf : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// declawed. + public CatAllOf(bool? declawed = default(bool?)) + { + this.Declawed = declawed; + } + + /// + /// Gets or Sets Declawed + /// + [DataMember(Name="declawed", EmitDefaultValue=false)] + public bool? Declawed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class CatAllOf {\n"); + sb.Append(" Declawed: ").Append(Declawed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as CatAllOf); + } + + /// + /// Returns true if CatAllOf instances are equal + /// + /// Instance of CatAllOf to be compared + /// Boolean + public bool Equals(CatAllOf input) + { + if (input == null) + return false; + + return + ( + this.Declawed == input.Declawed || + (this.Declawed != null && + this.Declawed.Equals(input.Declawed)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Declawed != null) + hashCode = hashCode * 59 + this.Declawed.GetHashCode(); + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Category.cs index c625284285..e8827551b5 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Category.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ClassModel.cs index 30753a34e6..4a7d5372a1 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ClassModel.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Dog.cs index ecd67f40b6..96e568628f 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Dog.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/DogAllOf.cs new file mode 100644 index 0000000000..24d4b43de8 --- /dev/null +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/DogAllOf.cs @@ -0,0 +1,124 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// DogAllOf + /// + [DataContract] + public partial class DogAllOf : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// breed. + public DogAllOf(string breed = default(string)) + { + this.Breed = breed; + } + + /// + /// Gets or Sets Breed + /// + [DataMember(Name="breed", EmitDefaultValue=false)] + public string Breed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class DogAllOf {\n"); + sb.Append(" Breed: ").Append(Breed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as DogAllOf); + } + + /// + /// Returns true if DogAllOf instances are equal + /// + /// Instance of DogAllOf to be compared + /// Boolean + public bool Equals(DogAllOf input) + { + if (input == null) + return false; + + return + ( + this.Breed == input.Breed || + (this.Breed != null && + this.Breed.Equals(input.Breed)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Breed != null) + hashCode = hashCode * 59 + this.Breed.GetHashCode(); + return hashCode; + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/EnumArrays.cs index 1fb6adf688..6887c901d1 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/EnumClass.cs index 33643e475f..96e427f9b3 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/EnumClass.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/EnumTest.cs index 512f0e87ca..48a0f2fa08 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/EnumTest.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -140,6 +140,11 @@ namespace Org.OpenAPITools.Model [DataMember(Name="enum_number", EmitDefaultValue=false)] public EnumNumberEnum? EnumNumber { get; set; } /// + /// Gets or Sets OuterEnum + /// + [DataMember(Name="outerEnum", EmitDefaultValue=false)] + public OuterEnum? OuterEnum { get; set; } + /// /// Initializes a new instance of the class. /// [JsonConstructorAttribute] @@ -174,11 +179,6 @@ namespace Org.OpenAPITools.Model - /// - /// Gets or Sets OuterEnum - /// - [DataMember(Name="outerEnum", EmitDefaultValue=false)] - public OuterEnum OuterEnum { get; set; } /// /// Returns the string presentation of the object diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/File.cs index 68d564d17e..3cf268524f 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/File.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/File.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs index 95983ccdb2..73a8b61aa7 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/FormatTest.cs index 14a74c99d9..4fd444a4e1 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/FormatTest.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs index 5206403669..10b9939f5a 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/List.cs index 14c7ed746a..6b3ace11cf 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/List.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/List.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/MapTest.cs index a64cd89eec..01f5a9b784 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/MapTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/MapTest.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index 26df7b3b14..c9cf10c0cb 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Model200Response.cs index 69767330c0..9abadca143 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Model200Response.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ModelClient.cs index 2e9d79ef14..2d93513c76 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ModelClient.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ModelClient.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Name.cs index 6d2bee0b25..603c7d8870 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Name.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/NumberOnly.cs index 0d3c613d18..00a4f3281e 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Order.cs index f895f03519..6bc71d339c 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Order.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/OuterComposite.cs index 3bb7254021..7a1aaea94e 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/OuterEnum.cs index be116aff60..e902802e0d 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Pet.cs index d839db6fb5..83103aaf28 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Pet.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs index 6e82eb5819..bb1c7edde0 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Return.cs index 401b8e2c70..f66b4ae50f 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Return.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/SpecialModelName.cs index 54ea66dd81..32c04672a4 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Tag.cs index f95860219e..9929598f0e 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/Tag.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/TypeHolderDefault.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/TypeHolderDefault.cs index 5cf9cf5c16..ae501fb3ac 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/TypeHolderDefault.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/TypeHolderDefault.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/TypeHolderExample.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/TypeHolderExample.cs index 9798485f8d..f6ef807487 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/TypeHolderExample.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/TypeHolderExample.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/User.cs index cf491294ec..173ac15c2d 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/User.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/XmlItem.cs b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/XmlItem.cs index bdda629737..2fc1cda565 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/XmlItem.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Model/XmlItem.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Org.OpenAPITools.csproj index 6d1a2889c4..0087e256c5 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Org.OpenAPITools.csproj +++ b/samples/client/petstore/csharp/OpenAPIClientNet40/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -4,7 +4,7 @@ OpenAPI Petstore This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ -OpenAPI spec version: 1.0.0 +The version of the OpenAPI document: 1.0.0 --> @@ -28,6 +28,7 @@ OpenAPI spec version: 1.0.0 DEBUG;TRACE prompt 4 + bin\Debug\Org.OpenAPITools.xml pdbonly @@ -36,6 +37,7 @@ OpenAPI spec version: 1.0.0 TRACE prompt 4 + bin\Release\Org.OpenAPITools.xml diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClientNetStandard/.openapi-generator/VERSION index afa6365606..06b5019af3 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/README.md b/samples/client/petstore/csharp/OpenAPIClientNetStandard/README.md index 6d55528116..b61a540036 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/README.md +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/README.md @@ -133,9 +133,11 @@ Class | Method | HTTP request | Description - [Model.ArrayTest](docs/ArrayTest.md) - [Model.Capitalization](docs/Capitalization.md) - [Model.Cat](docs/Cat.md) + - [Model.CatAllOf](docs/CatAllOf.md) - [Model.Category](docs/Category.md) - [Model.ClassModel](docs/ClassModel.md) - [Model.Dog](docs/Dog.md) + - [Model.DogAllOf](docs/DogAllOf.md) - [Model.EnumArrays](docs/EnumArrays.md) - [Model.EnumClass](docs/EnumClass.md) - [Model.EnumTest](docs/EnumTest.md) diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/docs/CatAllOf.md b/samples/client/petstore/csharp/OpenAPIClientNetStandard/docs/CatAllOf.md new file mode 100644 index 0000000000..1a63076045 --- /dev/null +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/docs/CatAllOf.md @@ -0,0 +1,13 @@ + +# Org.OpenAPITools.Model.CatAllOf + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Declawed** | **bool?** | | [optional] + +[[Back to Model list]](../README.md#documentation-for-models) +[[Back to API list]](../README.md#documentation-for-api-endpoints) +[[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/docs/DogAllOf.md b/samples/client/petstore/csharp/OpenAPIClientNetStandard/docs/DogAllOf.md new file mode 100644 index 0000000000..d72134a0f5 --- /dev/null +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/docs/DogAllOf.md @@ -0,0 +1,13 @@ + +# Org.OpenAPITools.Model.DogAllOf + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Breed** | **string** | | [optional] + +[[Back to Model list]](../README.md#documentation-for-models) +[[Back to API list]](../README.md#documentation-for-api-endpoints) +[[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/docs/EnumTest.md b/samples/client/petstore/csharp/OpenAPIClientNetStandard/docs/EnumTest.md index 17d159dc8a..8e213c3335 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/docs/EnumTest.md +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/docs/EnumTest.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **EnumStringRequired** | **string** | | **EnumInteger** | **int?** | | [optional] **EnumNumber** | **double?** | | [optional] -**OuterEnum** | [**OuterEnum**](OuterEnum.md) | | [optional] +**OuterEnum** | **OuterEnum** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 1c6d4dd3df..76d5194e5a 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/FakeApi.cs index 5beb88ecc7..7f0b649598 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/FakeApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 9189e6cbb8..15a124d69b 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/PetApi.cs index 7d389591e7..9cf187dae4 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/PetApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/StoreApi.cs index cc079412b2..2823afda29 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/StoreApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/UserApi.cs index 526fd7e481..27a34b44a5 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Api/UserApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/ApiClient.cs index 9030e01174..0311cd3aef 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/ApiClient.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/ApiClient.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/ApiException.cs index 875026e65f..e7ac15569b 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/ApiException.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/ApiException.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/ApiResponse.cs index 3e395de9df..4b462cf542 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/ApiResponse.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/ApiResponse.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/Configuration.cs index 1283c692cd..e10bf1c07e 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/Configuration.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/Configuration.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/ExceptionFactory.cs index d5b663b3cb..343ea7ae2b 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/ExceptionFactory.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/ExceptionFactory.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/GlobalConfiguration.cs index 309e385f25..a79bea966b 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/GlobalConfiguration.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/GlobalConfiguration.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/IApiAccessor.cs index bf20655ef1..df00c43800 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/IApiAccessor.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/IApiAccessor.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/IReadableConfiguration.cs index 76a5f5124f..23e1a0c2e1 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/IReadableConfiguration.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/IReadableConfiguration.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs index 4f5c219d5c..a1bd6b08f3 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs index 22fcd7cf46..0b66cfaa72 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs index 174edd94de..74e73ae5e6 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs index 42329742d7..9cff36e9c6 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs index a962da564f..45cb4e1ec3 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs index 7bded4e1ae..bf955fdfa3 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs index 2616be0ee5..884374ab27 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs index 0580d8d4fa..d5e694f3fd 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs index bffe6e495b..0c211e824d 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Animal.cs index 70730d7257..7f63524790 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Animal.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ApiResponse.cs index d50d067212..ac9b07f03e 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs index 5f8e9a0a5c..3fc75a4437 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs index a5c3582224..b9f18a8f27 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ArrayTest.cs index e2fe6b3bad..8ae8514483 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ArrayTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ArrayTest.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Capitalization.cs index bdb5ed77da..ca01a9ea1d 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Capitalization.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Capitalization.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Cat.cs index c4a1704371..57ff36b41d 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Cat.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/CatAllOf.cs new file mode 100644 index 0000000000..f8cd1ab68d --- /dev/null +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/CatAllOf.cs @@ -0,0 +1,112 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Linq; +using System.IO; +using System.Text; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// CatAllOf + /// + [DataContract] + public partial class CatAllOf : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// declawed. + public CatAllOf(bool? declawed = default(bool?)) + { + this.Declawed = declawed; + } + + /// + /// Gets or Sets Declawed + /// + [DataMember(Name="declawed", EmitDefaultValue=false)] + public bool? Declawed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class CatAllOf {\n"); + sb.Append(" Declawed: ").Append(Declawed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as CatAllOf); + } + + /// + /// Returns true if CatAllOf instances are equal + /// + /// Instance of CatAllOf to be compared + /// Boolean + public bool Equals(CatAllOf input) + { + if (input == null) + return false; + + return + ( + this.Declawed == input.Declawed || + (this.Declawed != null && + this.Declawed.Equals(input.Declawed)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Declawed != null) + hashCode = hashCode * 59 + this.Declawed.GetHashCode(); + return hashCode; + } + } + } + +} diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Category.cs index 2a750e0dc3..a53ef65cbf 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Category.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ClassModel.cs index 6ef81a1f05..bf180e2fd3 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ClassModel.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Dog.cs index 902c5ed92c..503fe9a20a 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Dog.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/DogAllOf.cs new file mode 100644 index 0000000000..d4d0ee3f47 --- /dev/null +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/DogAllOf.cs @@ -0,0 +1,112 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Linq; +using System.IO; +using System.Text; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// DogAllOf + /// + [DataContract] + public partial class DogAllOf : IEquatable + { + /// + /// Initializes a new instance of the class. + /// + /// breed. + public DogAllOf(string breed = default(string)) + { + this.Breed = breed; + } + + /// + /// Gets or Sets Breed + /// + [DataMember(Name="breed", EmitDefaultValue=false)] + public string Breed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class DogAllOf {\n"); + sb.Append(" Breed: ").Append(Breed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as DogAllOf); + } + + /// + /// Returns true if DogAllOf instances are equal + /// + /// Instance of DogAllOf to be compared + /// Boolean + public bool Equals(DogAllOf input) + { + if (input == null) + return false; + + return + ( + this.Breed == input.Breed || + (this.Breed != null && + this.Breed.Equals(input.Breed)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Breed != null) + hashCode = hashCode * 59 + this.Breed.GetHashCode(); + return hashCode; + } + } + } + +} diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/EnumArrays.cs index 1b2ace3163..4c0e96fd21 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/EnumClass.cs index cfeef31c19..3f26d63237 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/EnumClass.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/EnumTest.cs index 77a40aee7b..8854d4e961 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/EnumTest.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -138,6 +138,11 @@ namespace Org.OpenAPITools.Model [DataMember(Name="enum_number", EmitDefaultValue=false)] public EnumNumberEnum? EnumNumber { get; set; } /// + /// Gets or Sets OuterEnum + /// + [DataMember(Name="outerEnum", EmitDefaultValue=false)] + public OuterEnum? OuterEnum { get; set; } + /// /// Initializes a new instance of the class. /// [JsonConstructorAttribute] @@ -172,11 +177,6 @@ namespace Org.OpenAPITools.Model - /// - /// Gets or Sets OuterEnum - /// - [DataMember(Name="outerEnum", EmitDefaultValue=false)] - public OuterEnum OuterEnum { get; set; } /// /// Returns the string presentation of the object diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/File.cs index e9addc9d7e..8d182f792e 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/File.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/File.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs index 1c8a4f43c8..06713e9cd8 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/FormatTest.cs index f4ebe5467a..9ac7967429 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/FormatTest.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs index 90add77981..d5afdb16cc 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/List.cs index e1c67fa88e..fd3153ee90 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/List.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/List.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/MapTest.cs index e9ff16a5d6..68cde151bf 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/MapTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/MapTest.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index e29d80ce71..6215ed4a00 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Model200Response.cs index 97ab9e3a9e..c29e2a2924 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Model200Response.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ModelClient.cs index e08521dd8e..8636e753b2 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ModelClient.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ModelClient.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Name.cs index f547122916..c1c01fd369 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Name.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/NumberOnly.cs index 4890d031a3..af8ca238a5 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Order.cs index 713657125c..2b42e6adbd 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Order.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/OuterComposite.cs index 794408b87d..5c8fa1b440 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/OuterEnum.cs index cdf6a7e916..38f979216b 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Pet.cs index 348520db91..15811f9001 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Pet.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs index a3b2f783aa..8b66e4f7dd 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Return.cs index f40725403f..96b60164ff 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Return.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/SpecialModelName.cs index b105ce3593..92d0bf7756 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Tag.cs index 8de8009d39..1ad145982c 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/Tag.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/TypeHolderDefault.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/TypeHolderDefault.cs index d670c86306..b5507bbf25 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/TypeHolderDefault.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/TypeHolderDefault.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/TypeHolderExample.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/TypeHolderExample.cs index bcf6056c09..7603fe142d 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/TypeHolderExample.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/TypeHolderExample.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/User.cs index 3e680bc864..9933c347cb 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/User.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/XmlItem.cs b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/XmlItem.cs index e7998ec563..e80b6bac4b 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/XmlItem.cs +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Model/XmlItem.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Org.OpenAPITools.csproj index 42c68cc74b..7c827a81c3 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Org.OpenAPITools.csproj +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -4,7 +4,7 @@ OpenAPI Petstore This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ -OpenAPI spec version: 1.0.0 +The version of the OpenAPI document: 1.0.0 --> @@ -29,6 +29,7 @@ OpenAPI spec version: 1.0.0 DEBUG;TRACE prompt 4 + bin\Debug\Org.OpenAPITools.xml pdbonly @@ -37,6 +38,7 @@ OpenAPI spec version: 1.0.0 TRACE prompt 4 + bin\Release\Org.OpenAPITools.xml diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/.openapi-generator/VERSION index afa6365606..06b5019af3 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/README.md b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/README.md index 53a2a70da9..6319d9193e 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/README.md +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/README.md @@ -157,9 +157,11 @@ Class | Method | HTTP request | Description - [Model.ArrayTest](docs/ArrayTest.md) - [Model.Capitalization](docs/Capitalization.md) - [Model.Cat](docs/Cat.md) + - [Model.CatAllOf](docs/CatAllOf.md) - [Model.Category](docs/Category.md) - [Model.ClassModel](docs/ClassModel.md) - [Model.Dog](docs/Dog.md) + - [Model.DogAllOf](docs/DogAllOf.md) - [Model.EnumArrays](docs/EnumArrays.md) - [Model.EnumClass](docs/EnumClass.md) - [Model.EnumTest](docs/EnumTest.md) diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/docs/CatAllOf.md b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/docs/CatAllOf.md new file mode 100644 index 0000000000..1a63076045 --- /dev/null +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/docs/CatAllOf.md @@ -0,0 +1,13 @@ + +# Org.OpenAPITools.Model.CatAllOf + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Declawed** | **bool?** | | [optional] + +[[Back to Model list]](../README.md#documentation-for-models) +[[Back to API list]](../README.md#documentation-for-api-endpoints) +[[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/docs/DogAllOf.md b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/docs/DogAllOf.md new file mode 100644 index 0000000000..d72134a0f5 --- /dev/null +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/docs/DogAllOf.md @@ -0,0 +1,13 @@ + +# Org.OpenAPITools.Model.DogAllOf + +## Properties + +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Breed** | **string** | | [optional] + +[[Back to Model list]](../README.md#documentation-for-models) +[[Back to API list]](../README.md#documentation-for-api-endpoints) +[[Back to README]](../README.md) + diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/docs/EnumTest.md b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/docs/EnumTest.md index 17d159dc8a..8e213c3335 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/docs/EnumTest.md +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/docs/EnumTest.md @@ -9,7 +9,7 @@ Name | Type | Description | Notes **EnumStringRequired** | **string** | | **EnumInteger** | **int?** | | [optional] **EnumNumber** | **double?** | | [optional] -**OuterEnum** | [**OuterEnum**](OuterEnum.md) | | [optional] +**OuterEnum** | **OuterEnum** | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs new file mode 100644 index 0000000000..568d813749 --- /dev/null +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs @@ -0,0 +1,80 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using NUnit.Framework; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test +{ + /// + /// Class for testing CatAllOf + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + [TestFixture] + public class CatAllOfTests + { + // TODO uncomment below to declare an instance variable for CatAllOf + //private CatAllOf instance; + + /// + /// Setup before each test + /// + [SetUp] + public void Init() + { + // TODO uncomment below to create an instance of CatAllOf + //instance = new CatAllOf(); + } + + /// + /// Clean up after each test + /// + [TearDown] + public void Cleanup() + { + + } + + /// + /// Test an instance of CatAllOf + /// + [Test] + public void CatAllOfInstanceTest() + { + // TODO uncomment below to test "IsInstanceOfType" CatAllOf + //Assert.IsInstanceOfType (instance, "variable 'instance' is a CatAllOf"); + } + + + /// + /// Test the property 'Declawed' + /// + [Test] + public void DeclawedTest() + { + // TODO unit test for the property 'Declawed' + } + + } + +} diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs new file mode 100644 index 0000000000..993e29f6d0 --- /dev/null +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs @@ -0,0 +1,80 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + + +using NUnit.Framework; + +using System; +using System.Linq; +using System.IO; +using System.Collections.Generic; +using Org.OpenAPITools.Api; +using Org.OpenAPITools.Model; +using Org.OpenAPITools.Client; +using System.Reflection; +using Newtonsoft.Json; + +namespace Org.OpenAPITools.Test +{ + /// + /// Class for testing DogAllOf + /// + /// + /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech). + /// Please update the test case below to test the model. + /// + [TestFixture] + public class DogAllOfTests + { + // TODO uncomment below to declare an instance variable for DogAllOf + //private DogAllOf instance; + + /// + /// Setup before each test + /// + [SetUp] + public void Init() + { + // TODO uncomment below to create an instance of DogAllOf + //instance = new DogAllOf(); + } + + /// + /// Clean up after each test + /// + [TearDown] + public void Cleanup() + { + + } + + /// + /// Test an instance of DogAllOf + /// + [Test] + public void DogAllOfInstanceTest() + { + // TODO uncomment below to test "IsInstanceOfType" DogAllOf + //Assert.IsInstanceOfType (instance, "variable 'instance' is a DogAllOf"); + } + + + /// + /// Test the property 'Breed' + /// + [Test] + public void BreedTest() + { + // TODO unit test for the property 'Breed' + } + + } + +} diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj index 94ba473c07..13b29c8ed5 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj @@ -4,7 +4,7 @@ OpenAPI Petstore This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ -OpenAPI spec version: 1.0.0 +The version of the OpenAPI document: 1.0.0 --> diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 3dcdcb7258..91ad0c3c29 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/FakeApi.cs index e1bac68cf7..e9fbcf1cca 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/FakeApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index ce81e9db6d..34496dfc87 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/PetApi.cs index cce1d9d5a4..e5abf7996e 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/PetApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/StoreApi.cs index 63aed225ad..418c570854 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/StoreApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/UserApi.cs index 290bcc4e48..e842bd8769 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Api/UserApi.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/ApiClient.cs index 030d56543c..216469e1c8 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/ApiClient.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/ApiClient.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/ApiException.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/ApiException.cs index 875026e65f..e7ac15569b 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/ApiException.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/ApiException.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/ApiResponse.cs index 3e395de9df..4b462cf542 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/ApiResponse.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/ApiResponse.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/Configuration.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/Configuration.cs index b530746cb5..926007e22c 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/Configuration.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/Configuration.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/ExceptionFactory.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/ExceptionFactory.cs index 66c4aa3a14..d855d96821 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/ExceptionFactory.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/ExceptionFactory.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/GlobalConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/GlobalConfiguration.cs index 309e385f25..a79bea966b 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/GlobalConfiguration.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/GlobalConfiguration.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/IApiAccessor.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/IApiAccessor.cs index 3b4834c409..cd03e8c1f9 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/IApiAccessor.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/IApiAccessor.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/IReadableConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/IReadableConfiguration.cs index 76a5f5124f..23e1a0c2e1 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/IReadableConfiguration.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/IReadableConfiguration.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs index 4f5c219d5c..a1bd6b08f3 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs index d00c6124c2..a46fbf75e0 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesAnyType.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs index 144e421ddb..813824c7dc 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesArray.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs index b1a3900af5..388d1e04dd 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesBoolean.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs index 940f598817..4a33ca5525 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -184,41 +184,49 @@ namespace Org.OpenAPITools.Model ( this.MapString == input.MapString || this.MapString != null && + input.MapString != null && this.MapString.SequenceEqual(input.MapString) ) && ( this.MapNumber == input.MapNumber || this.MapNumber != null && + input.MapNumber != null && this.MapNumber.SequenceEqual(input.MapNumber) ) && ( this.MapInteger == input.MapInteger || this.MapInteger != null && + input.MapInteger != null && this.MapInteger.SequenceEqual(input.MapInteger) ) && ( this.MapBoolean == input.MapBoolean || this.MapBoolean != null && + input.MapBoolean != null && this.MapBoolean.SequenceEqual(input.MapBoolean) ) && ( this.MapArrayInteger == input.MapArrayInteger || this.MapArrayInteger != null && + input.MapArrayInteger != null && this.MapArrayInteger.SequenceEqual(input.MapArrayInteger) ) && ( this.MapArrayAnytype == input.MapArrayAnytype || this.MapArrayAnytype != null && + input.MapArrayAnytype != null && this.MapArrayAnytype.SequenceEqual(input.MapArrayAnytype) ) && ( this.MapMapString == input.MapMapString || this.MapMapString != null && + input.MapMapString != null && this.MapMapString.SequenceEqual(input.MapMapString) ) && ( this.MapMapAnytype == input.MapMapAnytype || this.MapMapAnytype != null && + input.MapMapAnytype != null && this.MapMapAnytype.SequenceEqual(input.MapMapAnytype) ) && ( diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs index 5061459e45..e8e3b80151 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesInteger.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs index a3969c0536..516539fe81 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesNumber.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs index 5c6e7657b2..8ee4299a05 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesObject.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs index af7b7be680..9cbd3fda48 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesString.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Animal.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Animal.cs index a3dcb9af94..17a34c03a3 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Animal.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Animal.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ApiResponse.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ApiResponse.cs index 949c892fb6..548a95be3b 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ApiResponse.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ApiResponse.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs index 278fc25f91..71d3030f3e 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ArrayOfArrayOfNumberOnly.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs index 3909cffdb8..2ba13f02e6 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ArrayOfNumberOnly.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ArrayTest.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ArrayTest.cs index b21bb64784..8a9cf58871 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ArrayTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ArrayTest.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Capitalization.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Capitalization.cs index f822dda932..0771efe621 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Capitalization.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Capitalization.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Cat.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Cat.cs index ea9ef6d75c..1768b04317 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Cat.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Cat.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/CatAllOf.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/CatAllOf.cs new file mode 100644 index 0000000000..b54a65aec9 --- /dev/null +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/CatAllOf.cs @@ -0,0 +1,147 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using PropertyChanged; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// CatAllOf + /// + [DataContract] + [ImplementPropertyChanged] + public partial class CatAllOf : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// declawed. + public CatAllOf(bool? declawed = default(bool?)) + { + this.Declawed = declawed; + } + + /// + /// Gets or Sets Declawed + /// + [DataMember(Name="declawed", EmitDefaultValue=false)] + public bool? Declawed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class CatAllOf {\n"); + sb.Append(" Declawed: ").Append(Declawed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as CatAllOf); + } + + /// + /// Returns true if CatAllOf instances are equal + /// + /// Instance of CatAllOf to be compared + /// Boolean + public bool Equals(CatAllOf input) + { + if (input == null) + return false; + + return + ( + this.Declawed == input.Declawed || + (this.Declawed != null && + this.Declawed.Equals(input.Declawed)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Declawed != null) + hashCode = hashCode * 59 + this.Declawed.GetHashCode(); + return hashCode; + } + } + + /// + /// Property changed event handler + /// + public event PropertyChangedEventHandler PropertyChanged; + + /// + /// Trigger when a property changed + /// + /// Property Name + public virtual void OnPropertyChanged(string propertyName) + { + // NOTE: property changed is handled via "code weaving" using Fody. + // Properties with setters are modified at compile time to notify of changes. + var propertyChanged = PropertyChanged; + if (propertyChanged != null) + { + propertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Category.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Category.cs index 231bb01b50..511604c24f 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Category.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Category.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ClassModel.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ClassModel.cs index e3bf4d450d..3aeb9165c9 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ClassModel.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ClassModel.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Dog.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Dog.cs index 6e10198b04..8f2f3c44f9 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Dog.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Dog.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/DogAllOf.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/DogAllOf.cs new file mode 100644 index 0000000000..44b7100102 --- /dev/null +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/DogAllOf.cs @@ -0,0 +1,147 @@ +/* + * OpenAPI Petstore + * + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * Generated by: https://github.com/openapitools/openapi-generator.git + */ + +using System; +using System.Linq; +using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Runtime.Serialization; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using PropertyChanged; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter; + +namespace Org.OpenAPITools.Model +{ + /// + /// DogAllOf + /// + [DataContract] + [ImplementPropertyChanged] + public partial class DogAllOf : IEquatable, IValidatableObject + { + /// + /// Initializes a new instance of the class. + /// + /// breed. + public DogAllOf(string breed = default(string)) + { + this.Breed = breed; + } + + /// + /// Gets or Sets Breed + /// + [DataMember(Name="breed", EmitDefaultValue=false)] + public string Breed { get; set; } + + /// + /// Returns the string presentation of the object + /// + /// String presentation of the object + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append("class DogAllOf {\n"); + sb.Append(" Breed: ").Append(Breed).Append("\n"); + sb.Append("}\n"); + return sb.ToString(); + } + + /// + /// Returns the JSON string presentation of the object + /// + /// JSON string presentation of the object + public virtual string ToJson() + { + return JsonConvert.SerializeObject(this, Formatting.Indented); + } + + /// + /// Returns true if objects are equal + /// + /// Object to be compared + /// Boolean + public override bool Equals(object input) + { + return this.Equals(input as DogAllOf); + } + + /// + /// Returns true if DogAllOf instances are equal + /// + /// Instance of DogAllOf to be compared + /// Boolean + public bool Equals(DogAllOf input) + { + if (input == null) + return false; + + return + ( + this.Breed == input.Breed || + (this.Breed != null && + this.Breed.Equals(input.Breed)) + ); + } + + /// + /// Gets the hash code + /// + /// Hash code + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + int hashCode = 41; + if (this.Breed != null) + hashCode = hashCode * 59 + this.Breed.GetHashCode(); + return hashCode; + } + } + + /// + /// Property changed event handler + /// + public event PropertyChangedEventHandler PropertyChanged; + + /// + /// Trigger when a property changed + /// + /// Property Name + public virtual void OnPropertyChanged(string propertyName) + { + // NOTE: property changed is handled via "code weaving" using Fody. + // Properties with setters are modified at compile time to notify of changes. + var propertyChanged = PropertyChanged; + if (propertyChanged != null) + { + propertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + + /// + /// To validate all properties of the instance + /// + /// Validation context + /// Validation Result + IEnumerable IValidatableObject.Validate(ValidationContext validationContext) + { + yield break; + } + } + +} diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/EnumArrays.cs index 7e94b135a4..9e406df897 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/EnumArrays.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/EnumArrays.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/EnumClass.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/EnumClass.cs index a5ba8367ed..5703d185d5 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/EnumClass.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/EnumClass.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/EnumTest.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/EnumTest.cs index 32f2dad11b..c203d90263 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/EnumTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/EnumTest.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ @@ -143,6 +143,11 @@ namespace Org.OpenAPITools.Model [DataMember(Name="enum_number", EmitDefaultValue=false)] public EnumNumberEnum? EnumNumber { get; set; } /// + /// Gets or Sets OuterEnum + /// + [DataMember(Name="outerEnum", EmitDefaultValue=false)] + public OuterEnum? OuterEnum { get; set; } + /// /// Initializes a new instance of the class. /// [JsonConstructorAttribute] @@ -177,11 +182,6 @@ namespace Org.OpenAPITools.Model - /// - /// Gets or Sets OuterEnum - /// - [DataMember(Name="outerEnum", EmitDefaultValue=false)] - public OuterEnum OuterEnum { get; set; } /// /// Returns the string presentation of the object diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/File.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/File.cs index 685931366a..5c620ce678 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/File.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/File.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs index a8e7ace6c6..c4d1be9b8f 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/FileSchemaTestClass.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/FormatTest.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/FormatTest.cs index 4e64f3b077..d5e62e6762 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/FormatTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/FormatTest.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs index 3d7c9c33fd..d11ee66fb6 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/List.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/List.cs index e9120359ba..d99b5931f2 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/List.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/List.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/MapTest.cs index 91810a3ad8..137f03fa78 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/MapTest.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/MapTest.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs index 6721b623da..26882a579b 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/MixedPropertiesAndAdditionalPropertiesClass.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Model200Response.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Model200Response.cs index 9e393124d0..466c41ff74 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Model200Response.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Model200Response.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ModelClient.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ModelClient.cs index 29ab233289..f1fed19b89 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ModelClient.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ModelClient.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Name.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Name.cs index 43e2a0f0e9..72ecf4504c 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Name.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Name.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/NumberOnly.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/NumberOnly.cs index de50e61957..0da26edb60 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/NumberOnly.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/NumberOnly.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Order.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Order.cs index 235777cad5..46542d45ea 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Order.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Order.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/OuterComposite.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/OuterComposite.cs index 585d2f0d58..a09a24caf1 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/OuterComposite.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/OuterComposite.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/OuterEnum.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/OuterEnum.cs index 8ac5f891d0..904a68eb89 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/OuterEnum.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/OuterEnum.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Pet.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Pet.cs index 85fd917d8f..430a5ad8a2 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Pet.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Pet.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs index 1a586a85fa..b3d461ac4e 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/ReadOnlyFirst.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Return.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Return.cs index 12c5e9db53..85512f01a3 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Return.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Return.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/SpecialModelName.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/SpecialModelName.cs index 2310e0054d..6d71bc0156 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/SpecialModelName.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/SpecialModelName.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Tag.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Tag.cs index 0c90b20ab3..224a2066cb 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Tag.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/Tag.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/TypeHolderDefault.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/TypeHolderDefault.cs index f4a0b2bda3..a108b77599 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/TypeHolderDefault.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/TypeHolderDefault.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/TypeHolderExample.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/TypeHolderExample.cs index 5579922122..f708e96e84 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/TypeHolderExample.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/TypeHolderExample.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/User.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/User.cs index 07556efd88..3d370092df 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/User.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/User.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/XmlItem.cs b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/XmlItem.cs index b15c76e149..8e24dc8478 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/XmlItem.cs +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/XmlItem.cs @@ -3,7 +3,7 @@ * * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://github.com/openapitools/openapi-generator.git */ diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Org.OpenAPITools.csproj index f55feb2d2e..21d6a6d9c1 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Org.OpenAPITools.csproj +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -4,7 +4,7 @@ OpenAPI Petstore This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ -OpenAPI spec version: 1.0.0 +The version of the OpenAPI document: 1.0.0 --> @@ -28,6 +28,7 @@ OpenAPI spec version: 1.0.0 DEBUG;TRACE prompt 4 + bin\Debug\Org.OpenAPITools.xml pdbonly @@ -36,6 +37,7 @@ OpenAPI spec version: 1.0.0 TRACE prompt 4 + bin\Release\Org.OpenAPITools.xml diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/.openapi-generator/VERSION b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/.openapi-generator/VERSION index afa6365606..06b5019af3 100644 --- a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/.openapi-generator/VERSION +++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/.travis.yml b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/.travis.yml new file mode 100644 index 0000000000..82b19541fa --- /dev/null +++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/.travis.yml @@ -0,0 +1,11 @@ +# https://docs.travis-ci.com/user/languages/dart/ +# +language: dart +dart: +# Install a specific stable release +- "1.24.3" +install: +- pub get + +script: +- pub run test diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md index 4d6a829998..f69aa42028 100644 --- a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md +++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md @@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project: - API version: 1.0.0 -- Build date: 2019-03-01T12:01:27.554664+01:00[Europe/Paris] +- Build date: 2019-05-27T21:20:43.835+08:00[Asia/Hong_Kong] - Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen ## Requirements diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/api_response_test.dart b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/api_response_test.dart new file mode 100644 index 0000000000..ebf142904e --- /dev/null +++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/api_response_test.dart @@ -0,0 +1,27 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for ApiResponse +void main() { + var instance = new Pet(); + + group('test ApiResponse', () { + // int code (default value: null) + test('to test the property `code`', () async { + // TODO + }); + + // String type (default value: null) + test('to test the property `type`', () async { + // TODO + }); + + // String message (default value: null) + test('to test the property `message`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/category_test.dart b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/category_test.dart new file mode 100644 index 0000000000..c5cea4b5bc --- /dev/null +++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/category_test.dart @@ -0,0 +1,22 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Category +void main() { + var instance = new Pet(); + + group('test Category', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/order_test.dart b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/order_test.dart new file mode 100644 index 0000000000..9982020d8c --- /dev/null +++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/order_test.dart @@ -0,0 +1,43 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Order +void main() { + var instance = new Pet(); + + group('test Order', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // int petId (default value: null) + test('to test the property `petId`', () async { + // TODO + }); + + // int quantity (default value: null) + test('to test the property `quantity`', () async { + // TODO + }); + + // DateTime shipDate (default value: null) + test('to test the property `shipDate`', () async { + // TODO + }); + + // Order Status + // String status (default value: null) + test('to test the property `status`', () async { + // TODO + }); + + // bool complete (default value: false) + test('to test the property `complete`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/pet_api_test.dart b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/pet_api_test.dart new file mode 100644 index 0000000000..fa95dccad3 --- /dev/null +++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/pet_api_test.dart @@ -0,0 +1,73 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for PetApi +void main() { + var instance = new PetApi(); + + group('tests for PetApi', () { + // Add a new pet to the store + // + //Future addPet(Pet body) async + test('test addPet', () async { + // TODO + }); + + // Deletes a pet + // + //Future deletePet(int petId, { String apiKey }) async + test('test deletePet', () async { + // TODO + }); + + // Finds Pets by status + // + // Multiple status values can be provided with comma separated strings + // + //Future> findPetsByStatus(List status) async + test('test findPetsByStatus', () async { + // TODO + }); + + // Finds Pets by tags + // + // Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + // + //Future> findPetsByTags(List tags) async + test('test findPetsByTags', () async { + // TODO + }); + + // Find pet by ID + // + // Returns a single pet + // + //Future getPetById(int petId) async + test('test getPetById', () async { + // TODO + }); + + // Update an existing pet + // + //Future updatePet(Pet body) async + test('test updatePet', () async { + // TODO + }); + + // Updates a pet in the store with form data + // + //Future updatePetWithForm(int petId, { String name, String status }) async + test('test updatePetWithForm', () async { + // TODO + }); + + // uploads an image + // + //Future uploadFile(int petId, { String additionalMetadata, MultipartFile file }) async + test('test uploadFile', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/pet_test.dart b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/pet_test.dart new file mode 100644 index 0000000000..38e74f087f --- /dev/null +++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/pet_test.dart @@ -0,0 +1,43 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Pet +void main() { + var instance = new Pet(); + + group('test Pet', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // Category category (default value: null) + test('to test the property `category`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + // List photoUrls (default value: const []) + test('to test the property `photoUrls`', () async { + // TODO + }); + + // List tags (default value: const []) + test('to test the property `tags`', () async { + // TODO + }); + + // pet status in the store + // String status (default value: null) + test('to test the property `status`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/store_api_test.dart b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/store_api_test.dart new file mode 100644 index 0000000000..496d051e83 --- /dev/null +++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/store_api_test.dart @@ -0,0 +1,45 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for StoreApi +void main() { + var instance = new StoreApi(); + + group('tests for StoreApi', () { + // Delete purchase order by ID + // + // For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + // + //Future deleteOrder(String orderId) async + test('test deleteOrder', () async { + // TODO + }); + + // Returns pet inventories by status + // + // Returns a map of status codes to quantities + // + //Future> getInventory() async + test('test getInventory', () async { + // TODO + }); + + // Find purchase order by ID + // + // For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + // + //Future getOrderById(int orderId) async + test('test getOrderById', () async { + // TODO + }); + + // Place an order for a pet + // + //Future placeOrder(Order body) async + test('test placeOrder', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/tag_test.dart b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/tag_test.dart new file mode 100644 index 0000000000..6ee16c51bb --- /dev/null +++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/tag_test.dart @@ -0,0 +1,22 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Tag +void main() { + var instance = new Pet(); + + group('test Tag', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/user_api_test.dart b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/user_api_test.dart new file mode 100644 index 0000000000..f040b01bf4 --- /dev/null +++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/user_api_test.dart @@ -0,0 +1,73 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for UserApi +void main() { + var instance = new UserApi(); + + group('tests for UserApi', () { + // Create user + // + // This can only be done by the logged in user. + // + //Future createUser(User body) async + test('test createUser', () async { + // TODO + }); + + // Creates list of users with given input array + // + //Future createUsersWithArrayInput(List body) async + test('test createUsersWithArrayInput', () async { + // TODO + }); + + // Creates list of users with given input array + // + //Future createUsersWithListInput(List body) async + test('test createUsersWithListInput', () async { + // TODO + }); + + // Delete user + // + // This can only be done by the logged in user. + // + //Future deleteUser(String username) async + test('test deleteUser', () async { + // TODO + }); + + // Get user by user name + // + //Future getUserByName(String username) async + test('test getUserByName', () async { + // TODO + }); + + // Logs user into the system + // + //Future loginUser(String username, String password) async + test('test loginUser', () async { + // TODO + }); + + // Logs out current logged in user session + // + //Future logoutUser() async + test('test logoutUser', () async { + // TODO + }); + + // Updated user + // + // This can only be done by the logged in user. + // + //Future updateUser(String username, User body) async + test('test updateUser', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/user_test.dart b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/user_test.dart new file mode 100644 index 0000000000..5a6340c4f4 --- /dev/null +++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/test/user_test.dart @@ -0,0 +1,53 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for User +void main() { + var instance = new Pet(); + + group('test User', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String username (default value: null) + test('to test the property `username`', () async { + // TODO + }); + + // String firstName (default value: null) + test('to test the property `firstName`', () async { + // TODO + }); + + // String lastName (default value: null) + test('to test the property `lastName`', () async { + // TODO + }); + + // String email (default value: null) + test('to test the property `email`', () async { + // TODO + }); + + // String password (default value: null) + test('to test the property `password`', () async { + // TODO + }); + + // String phone (default value: null) + test('to test the property `phone`', () async { + // TODO + }); + + // User Status + // int userStatus (default value: null) + test('to test the property `userStatus`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/.openapi-generator/VERSION b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/.openapi-generator/VERSION index afa6365606..06b5019af3 100644 --- a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/.openapi-generator/VERSION +++ b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/.travis.yml b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/.travis.yml new file mode 100644 index 0000000000..82b19541fa --- /dev/null +++ b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/.travis.yml @@ -0,0 +1,11 @@ +# https://docs.travis-ci.com/user/languages/dart/ +# +language: dart +dart: +# Install a specific stable release +- "1.24.3" +install: +- pub get + +script: +- pub run test diff --git a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/README.md b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/README.md index 754298dd42..a7ea7da6fe 100644 --- a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/README.md +++ b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/README.md @@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project: - API version: 1.0.0 -- Build date: 2019-03-01T12:01:29.772495+01:00[Europe/Paris] +- Build date: 2019-05-27T21:20:45.456+08:00[Asia/Hong_Kong] - Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen ## Requirements diff --git a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/api_response_test.dart b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/api_response_test.dart new file mode 100644 index 0000000000..ebf142904e --- /dev/null +++ b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/api_response_test.dart @@ -0,0 +1,27 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for ApiResponse +void main() { + var instance = new Pet(); + + group('test ApiResponse', () { + // int code (default value: null) + test('to test the property `code`', () async { + // TODO + }); + + // String type (default value: null) + test('to test the property `type`', () async { + // TODO + }); + + // String message (default value: null) + test('to test the property `message`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/category_test.dart b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/category_test.dart new file mode 100644 index 0000000000..c5cea4b5bc --- /dev/null +++ b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/category_test.dart @@ -0,0 +1,22 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Category +void main() { + var instance = new Pet(); + + group('test Category', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/order_test.dart b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/order_test.dart new file mode 100644 index 0000000000..9982020d8c --- /dev/null +++ b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/order_test.dart @@ -0,0 +1,43 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Order +void main() { + var instance = new Pet(); + + group('test Order', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // int petId (default value: null) + test('to test the property `petId`', () async { + // TODO + }); + + // int quantity (default value: null) + test('to test the property `quantity`', () async { + // TODO + }); + + // DateTime shipDate (default value: null) + test('to test the property `shipDate`', () async { + // TODO + }); + + // Order Status + // String status (default value: null) + test('to test the property `status`', () async { + // TODO + }); + + // bool complete (default value: false) + test('to test the property `complete`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/pet_api_test.dart b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/pet_api_test.dart new file mode 100644 index 0000000000..fa95dccad3 --- /dev/null +++ b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/pet_api_test.dart @@ -0,0 +1,73 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for PetApi +void main() { + var instance = new PetApi(); + + group('tests for PetApi', () { + // Add a new pet to the store + // + //Future addPet(Pet body) async + test('test addPet', () async { + // TODO + }); + + // Deletes a pet + // + //Future deletePet(int petId, { String apiKey }) async + test('test deletePet', () async { + // TODO + }); + + // Finds Pets by status + // + // Multiple status values can be provided with comma separated strings + // + //Future> findPetsByStatus(List status) async + test('test findPetsByStatus', () async { + // TODO + }); + + // Finds Pets by tags + // + // Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + // + //Future> findPetsByTags(List tags) async + test('test findPetsByTags', () async { + // TODO + }); + + // Find pet by ID + // + // Returns a single pet + // + //Future getPetById(int petId) async + test('test getPetById', () async { + // TODO + }); + + // Update an existing pet + // + //Future updatePet(Pet body) async + test('test updatePet', () async { + // TODO + }); + + // Updates a pet in the store with form data + // + //Future updatePetWithForm(int petId, { String name, String status }) async + test('test updatePetWithForm', () async { + // TODO + }); + + // uploads an image + // + //Future uploadFile(int petId, { String additionalMetadata, MultipartFile file }) async + test('test uploadFile', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/pet_test.dart b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/pet_test.dart new file mode 100644 index 0000000000..38e74f087f --- /dev/null +++ b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/pet_test.dart @@ -0,0 +1,43 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Pet +void main() { + var instance = new Pet(); + + group('test Pet', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // Category category (default value: null) + test('to test the property `category`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + // List photoUrls (default value: const []) + test('to test the property `photoUrls`', () async { + // TODO + }); + + // List tags (default value: const []) + test('to test the property `tags`', () async { + // TODO + }); + + // pet status in the store + // String status (default value: null) + test('to test the property `status`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/store_api_test.dart b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/store_api_test.dart new file mode 100644 index 0000000000..496d051e83 --- /dev/null +++ b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/store_api_test.dart @@ -0,0 +1,45 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for StoreApi +void main() { + var instance = new StoreApi(); + + group('tests for StoreApi', () { + // Delete purchase order by ID + // + // For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + // + //Future deleteOrder(String orderId) async + test('test deleteOrder', () async { + // TODO + }); + + // Returns pet inventories by status + // + // Returns a map of status codes to quantities + // + //Future> getInventory() async + test('test getInventory', () async { + // TODO + }); + + // Find purchase order by ID + // + // For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + // + //Future getOrderById(int orderId) async + test('test getOrderById', () async { + // TODO + }); + + // Place an order for a pet + // + //Future placeOrder(Order body) async + test('test placeOrder', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/tag_test.dart b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/tag_test.dart new file mode 100644 index 0000000000..6ee16c51bb --- /dev/null +++ b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/tag_test.dart @@ -0,0 +1,22 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Tag +void main() { + var instance = new Pet(); + + group('test Tag', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/user_api_test.dart b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/user_api_test.dart new file mode 100644 index 0000000000..f040b01bf4 --- /dev/null +++ b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/user_api_test.dart @@ -0,0 +1,73 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for UserApi +void main() { + var instance = new UserApi(); + + group('tests for UserApi', () { + // Create user + // + // This can only be done by the logged in user. + // + //Future createUser(User body) async + test('test createUser', () async { + // TODO + }); + + // Creates list of users with given input array + // + //Future createUsersWithArrayInput(List body) async + test('test createUsersWithArrayInput', () async { + // TODO + }); + + // Creates list of users with given input array + // + //Future createUsersWithListInput(List body) async + test('test createUsersWithListInput', () async { + // TODO + }); + + // Delete user + // + // This can only be done by the logged in user. + // + //Future deleteUser(String username) async + test('test deleteUser', () async { + // TODO + }); + + // Get user by user name + // + //Future getUserByName(String username) async + test('test getUserByName', () async { + // TODO + }); + + // Logs user into the system + // + //Future loginUser(String username, String password) async + test('test loginUser', () async { + // TODO + }); + + // Logs out current logged in user session + // + //Future logoutUser() async + test('test logoutUser', () async { + // TODO + }); + + // Updated user + // + // This can only be done by the logged in user. + // + //Future updateUser(String username, User body) async + test('test updateUser', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/user_test.dart b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/user_test.dart new file mode 100644 index 0000000000..5a6340c4f4 --- /dev/null +++ b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/test/user_test.dart @@ -0,0 +1,53 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for User +void main() { + var instance = new Pet(); + + group('test User', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String username (default value: null) + test('to test the property `username`', () async { + // TODO + }); + + // String firstName (default value: null) + test('to test the property `firstName`', () async { + // TODO + }); + + // String lastName (default value: null) + test('to test the property `lastName`', () async { + // TODO + }); + + // String email (default value: null) + test('to test the property `email`', () async { + // TODO + }); + + // String password (default value: null) + test('to test the property `password`', () async { + // TODO + }); + + // String phone (default value: null) + test('to test the property `phone`', () async { + // TODO + }); + + // User Status + // int userStatus (default value: null) + test('to test the property `userStatus`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/openapi/.openapi-generator/VERSION b/samples/client/petstore/dart-jaguar/openapi/.openapi-generator/VERSION index afa6365606..06b5019af3 100644 --- a/samples/client/petstore/dart-jaguar/openapi/.openapi-generator/VERSION +++ b/samples/client/petstore/dart-jaguar/openapi/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/dart-jaguar/openapi/.travis.yml b/samples/client/petstore/dart-jaguar/openapi/.travis.yml new file mode 100644 index 0000000000..82b19541fa --- /dev/null +++ b/samples/client/petstore/dart-jaguar/openapi/.travis.yml @@ -0,0 +1,11 @@ +# https://docs.travis-ci.com/user/languages/dart/ +# +language: dart +dart: +# Install a specific stable release +- "1.24.3" +install: +- pub get + +script: +- pub run test diff --git a/samples/client/petstore/dart-jaguar/openapi/README.md b/samples/client/petstore/dart-jaguar/openapi/README.md index c1aaa00be5..917b232f21 100644 --- a/samples/client/petstore/dart-jaguar/openapi/README.md +++ b/samples/client/petstore/dart-jaguar/openapi/README.md @@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project: - API version: 1.0.0 -- Build date: 2019-03-01T12:01:24.840508+01:00[Europe/Paris] +- Build date: 2019-05-27T21:20:42.193+08:00[Asia/Hong_Kong] - Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen ## Requirements diff --git a/samples/client/petstore/dart-jaguar/openapi/test/api_response_test.dart b/samples/client/petstore/dart-jaguar/openapi/test/api_response_test.dart new file mode 100644 index 0000000000..ba2202d24c --- /dev/null +++ b/samples/client/petstore/dart-jaguar/openapi/test/api_response_test.dart @@ -0,0 +1,27 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for ApiResponse +void main() { + var instance = new ApiResponse(); + + group('test ApiResponse', () { + // int code (default value: null) + test('to test the property `code`', () async { + // TODO + }); + + // String type (default value: null) + test('to test the property `type`', () async { + // TODO + }); + + // String message (default value: null) + test('to test the property `message`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/openapi/test/category_test.dart b/samples/client/petstore/dart-jaguar/openapi/test/category_test.dart new file mode 100644 index 0000000000..0dcaa8b797 --- /dev/null +++ b/samples/client/petstore/dart-jaguar/openapi/test/category_test.dart @@ -0,0 +1,22 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Category +void main() { + var instance = new Category(); + + group('test Category', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/openapi/test/order_test.dart b/samples/client/petstore/dart-jaguar/openapi/test/order_test.dart new file mode 100644 index 0000000000..aa9dcc69c4 --- /dev/null +++ b/samples/client/petstore/dart-jaguar/openapi/test/order_test.dart @@ -0,0 +1,43 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Order +void main() { + var instance = new Order(); + + group('test Order', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // int petId (default value: null) + test('to test the property `petId`', () async { + // TODO + }); + + // int quantity (default value: null) + test('to test the property `quantity`', () async { + // TODO + }); + + // DateTime shipDate (default value: null) + test('to test the property `shipDate`', () async { + // TODO + }); + + // Order Status + // String status (default value: null) + test('to test the property `status`', () async { + // TODO + }); + + // bool complete (default value: false) + test('to test the property `complete`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/openapi/test/pet_api_test.dart b/samples/client/petstore/dart-jaguar/openapi/test/pet_api_test.dart new file mode 100644 index 0000000000..fa95dccad3 --- /dev/null +++ b/samples/client/petstore/dart-jaguar/openapi/test/pet_api_test.dart @@ -0,0 +1,73 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for PetApi +void main() { + var instance = new PetApi(); + + group('tests for PetApi', () { + // Add a new pet to the store + // + //Future addPet(Pet body) async + test('test addPet', () async { + // TODO + }); + + // Deletes a pet + // + //Future deletePet(int petId, { String apiKey }) async + test('test deletePet', () async { + // TODO + }); + + // Finds Pets by status + // + // Multiple status values can be provided with comma separated strings + // + //Future> findPetsByStatus(List status) async + test('test findPetsByStatus', () async { + // TODO + }); + + // Finds Pets by tags + // + // Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + // + //Future> findPetsByTags(List tags) async + test('test findPetsByTags', () async { + // TODO + }); + + // Find pet by ID + // + // Returns a single pet + // + //Future getPetById(int petId) async + test('test getPetById', () async { + // TODO + }); + + // Update an existing pet + // + //Future updatePet(Pet body) async + test('test updatePet', () async { + // TODO + }); + + // Updates a pet in the store with form data + // + //Future updatePetWithForm(int petId, { String name, String status }) async + test('test updatePetWithForm', () async { + // TODO + }); + + // uploads an image + // + //Future uploadFile(int petId, { String additionalMetadata, MultipartFile file }) async + test('test uploadFile', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart-jaguar/openapi/test/pet_test.dart b/samples/client/petstore/dart-jaguar/openapi/test/pet_test.dart new file mode 100644 index 0000000000..38e74f087f --- /dev/null +++ b/samples/client/petstore/dart-jaguar/openapi/test/pet_test.dart @@ -0,0 +1,43 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Pet +void main() { + var instance = new Pet(); + + group('test Pet', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // Category category (default value: null) + test('to test the property `category`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + // List photoUrls (default value: const []) + test('to test the property `photoUrls`', () async { + // TODO + }); + + // List tags (default value: const []) + test('to test the property `tags`', () async { + // TODO + }); + + // pet status in the store + // String status (default value: null) + test('to test the property `status`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/openapi/test/store_api_test.dart b/samples/client/petstore/dart-jaguar/openapi/test/store_api_test.dart new file mode 100644 index 0000000000..496d051e83 --- /dev/null +++ b/samples/client/petstore/dart-jaguar/openapi/test/store_api_test.dart @@ -0,0 +1,45 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for StoreApi +void main() { + var instance = new StoreApi(); + + group('tests for StoreApi', () { + // Delete purchase order by ID + // + // For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + // + //Future deleteOrder(String orderId) async + test('test deleteOrder', () async { + // TODO + }); + + // Returns pet inventories by status + // + // Returns a map of status codes to quantities + // + //Future> getInventory() async + test('test getInventory', () async { + // TODO + }); + + // Find purchase order by ID + // + // For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + // + //Future getOrderById(int orderId) async + test('test getOrderById', () async { + // TODO + }); + + // Place an order for a pet + // + //Future placeOrder(Order body) async + test('test placeOrder', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart-jaguar/openapi/test/tag_test.dart b/samples/client/petstore/dart-jaguar/openapi/test/tag_test.dart new file mode 100644 index 0000000000..58477c9e75 --- /dev/null +++ b/samples/client/petstore/dart-jaguar/openapi/test/tag_test.dart @@ -0,0 +1,22 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Tag +void main() { + var instance = new Tag(); + + group('test Tag', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/openapi/test/user_api_test.dart b/samples/client/petstore/dart-jaguar/openapi/test/user_api_test.dart new file mode 100644 index 0000000000..f040b01bf4 --- /dev/null +++ b/samples/client/petstore/dart-jaguar/openapi/test/user_api_test.dart @@ -0,0 +1,73 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for UserApi +void main() { + var instance = new UserApi(); + + group('tests for UserApi', () { + // Create user + // + // This can only be done by the logged in user. + // + //Future createUser(User body) async + test('test createUser', () async { + // TODO + }); + + // Creates list of users with given input array + // + //Future createUsersWithArrayInput(List body) async + test('test createUsersWithArrayInput', () async { + // TODO + }); + + // Creates list of users with given input array + // + //Future createUsersWithListInput(List body) async + test('test createUsersWithListInput', () async { + // TODO + }); + + // Delete user + // + // This can only be done by the logged in user. + // + //Future deleteUser(String username) async + test('test deleteUser', () async { + // TODO + }); + + // Get user by user name + // + //Future getUserByName(String username) async + test('test getUserByName', () async { + // TODO + }); + + // Logs user into the system + // + //Future loginUser(String username, String password) async + test('test loginUser', () async { + // TODO + }); + + // Logs out current logged in user session + // + //Future logoutUser() async + test('test logoutUser', () async { + // TODO + }); + + // Updated user + // + // This can only be done by the logged in user. + // + //Future updateUser(String username, User body) async + test('test updateUser', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart-jaguar/openapi/test/user_test.dart b/samples/client/petstore/dart-jaguar/openapi/test/user_test.dart new file mode 100644 index 0000000000..ae6096d0f5 --- /dev/null +++ b/samples/client/petstore/dart-jaguar/openapi/test/user_test.dart @@ -0,0 +1,53 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for User +void main() { + var instance = new User(); + + group('test User', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String username (default value: null) + test('to test the property `username`', () async { + // TODO + }); + + // String firstName (default value: null) + test('to test the property `firstName`', () async { + // TODO + }); + + // String lastName (default value: null) + test('to test the property `lastName`', () async { + // TODO + }); + + // String email (default value: null) + test('to test the property `email`', () async { + // TODO + }); + + // String password (default value: null) + test('to test the property `password`', () async { + // TODO + }); + + // String phone (default value: null) + test('to test the property `phone`', () async { + // TODO + }); + + // User Status + // int userStatus (default value: null) + test('to test the property `userStatus`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/openapi_proto/.openapi-generator/VERSION b/samples/client/petstore/dart-jaguar/openapi_proto/.openapi-generator/VERSION index afa6365606..06b5019af3 100644 --- a/samples/client/petstore/dart-jaguar/openapi_proto/.openapi-generator/VERSION +++ b/samples/client/petstore/dart-jaguar/openapi_proto/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/dart-jaguar/openapi_proto/.travis.yml b/samples/client/petstore/dart-jaguar/openapi_proto/.travis.yml new file mode 100644 index 0000000000..82b19541fa --- /dev/null +++ b/samples/client/petstore/dart-jaguar/openapi_proto/.travis.yml @@ -0,0 +1,11 @@ +# https://docs.travis-ci.com/user/languages/dart/ +# +language: dart +dart: +# Install a specific stable release +- "1.24.3" +install: +- pub get + +script: +- pub run test diff --git a/samples/client/petstore/dart-jaguar/openapi_proto/README.md b/samples/client/petstore/dart-jaguar/openapi_proto/README.md index ce0ec5d232..310e0d221e 100644 --- a/samples/client/petstore/dart-jaguar/openapi_proto/README.md +++ b/samples/client/petstore/dart-jaguar/openapi_proto/README.md @@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project: - API version: 1.0.0 -- Build date: 2019-03-01T12:01:34.442031+01:00[Europe/Paris] +- Build date: 2019-05-27T21:20:47.082+08:00[Asia/Hong_Kong] - Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen ## Requirements diff --git a/samples/client/petstore/dart-jaguar/openapi_proto/test/api_response_test.dart b/samples/client/petstore/dart-jaguar/openapi_proto/test/api_response_test.dart new file mode 100644 index 0000000000..ebf142904e --- /dev/null +++ b/samples/client/petstore/dart-jaguar/openapi_proto/test/api_response_test.dart @@ -0,0 +1,27 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for ApiResponse +void main() { + var instance = new Pet(); + + group('test ApiResponse', () { + // int code (default value: null) + test('to test the property `code`', () async { + // TODO + }); + + // String type (default value: null) + test('to test the property `type`', () async { + // TODO + }); + + // String message (default value: null) + test('to test the property `message`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/openapi_proto/test/category_test.dart b/samples/client/petstore/dart-jaguar/openapi_proto/test/category_test.dart new file mode 100644 index 0000000000..c5cea4b5bc --- /dev/null +++ b/samples/client/petstore/dart-jaguar/openapi_proto/test/category_test.dart @@ -0,0 +1,22 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Category +void main() { + var instance = new Pet(); + + group('test Category', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/openapi_proto/test/order_test.dart b/samples/client/petstore/dart-jaguar/openapi_proto/test/order_test.dart new file mode 100644 index 0000000000..9982020d8c --- /dev/null +++ b/samples/client/petstore/dart-jaguar/openapi_proto/test/order_test.dart @@ -0,0 +1,43 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Order +void main() { + var instance = new Pet(); + + group('test Order', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // int petId (default value: null) + test('to test the property `petId`', () async { + // TODO + }); + + // int quantity (default value: null) + test('to test the property `quantity`', () async { + // TODO + }); + + // DateTime shipDate (default value: null) + test('to test the property `shipDate`', () async { + // TODO + }); + + // Order Status + // String status (default value: null) + test('to test the property `status`', () async { + // TODO + }); + + // bool complete (default value: false) + test('to test the property `complete`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/openapi_proto/test/pet_api_test.dart b/samples/client/petstore/dart-jaguar/openapi_proto/test/pet_api_test.dart new file mode 100644 index 0000000000..fa95dccad3 --- /dev/null +++ b/samples/client/petstore/dart-jaguar/openapi_proto/test/pet_api_test.dart @@ -0,0 +1,73 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for PetApi +void main() { + var instance = new PetApi(); + + group('tests for PetApi', () { + // Add a new pet to the store + // + //Future addPet(Pet body) async + test('test addPet', () async { + // TODO + }); + + // Deletes a pet + // + //Future deletePet(int petId, { String apiKey }) async + test('test deletePet', () async { + // TODO + }); + + // Finds Pets by status + // + // Multiple status values can be provided with comma separated strings + // + //Future> findPetsByStatus(List status) async + test('test findPetsByStatus', () async { + // TODO + }); + + // Finds Pets by tags + // + // Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + // + //Future> findPetsByTags(List tags) async + test('test findPetsByTags', () async { + // TODO + }); + + // Find pet by ID + // + // Returns a single pet + // + //Future getPetById(int petId) async + test('test getPetById', () async { + // TODO + }); + + // Update an existing pet + // + //Future updatePet(Pet body) async + test('test updatePet', () async { + // TODO + }); + + // Updates a pet in the store with form data + // + //Future updatePetWithForm(int petId, { String name, String status }) async + test('test updatePetWithForm', () async { + // TODO + }); + + // uploads an image + // + //Future uploadFile(int petId, { String additionalMetadata, MultipartFile file }) async + test('test uploadFile', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart-jaguar/openapi_proto/test/pet_test.dart b/samples/client/petstore/dart-jaguar/openapi_proto/test/pet_test.dart new file mode 100644 index 0000000000..38e74f087f --- /dev/null +++ b/samples/client/petstore/dart-jaguar/openapi_proto/test/pet_test.dart @@ -0,0 +1,43 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Pet +void main() { + var instance = new Pet(); + + group('test Pet', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // Category category (default value: null) + test('to test the property `category`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + // List photoUrls (default value: const []) + test('to test the property `photoUrls`', () async { + // TODO + }); + + // List tags (default value: const []) + test('to test the property `tags`', () async { + // TODO + }); + + // pet status in the store + // String status (default value: null) + test('to test the property `status`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/openapi_proto/test/store_api_test.dart b/samples/client/petstore/dart-jaguar/openapi_proto/test/store_api_test.dart new file mode 100644 index 0000000000..496d051e83 --- /dev/null +++ b/samples/client/petstore/dart-jaguar/openapi_proto/test/store_api_test.dart @@ -0,0 +1,45 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for StoreApi +void main() { + var instance = new StoreApi(); + + group('tests for StoreApi', () { + // Delete purchase order by ID + // + // For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + // + //Future deleteOrder(String orderId) async + test('test deleteOrder', () async { + // TODO + }); + + // Returns pet inventories by status + // + // Returns a map of status codes to quantities + // + //Future> getInventory() async + test('test getInventory', () async { + // TODO + }); + + // Find purchase order by ID + // + // For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + // + //Future getOrderById(int orderId) async + test('test getOrderById', () async { + // TODO + }); + + // Place an order for a pet + // + //Future placeOrder(Order body) async + test('test placeOrder', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart-jaguar/openapi_proto/test/tag_test.dart b/samples/client/petstore/dart-jaguar/openapi_proto/test/tag_test.dart new file mode 100644 index 0000000000..6ee16c51bb --- /dev/null +++ b/samples/client/petstore/dart-jaguar/openapi_proto/test/tag_test.dart @@ -0,0 +1,22 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Tag +void main() { + var instance = new Pet(); + + group('test Tag', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart-jaguar/openapi_proto/test/user_api_test.dart b/samples/client/petstore/dart-jaguar/openapi_proto/test/user_api_test.dart new file mode 100644 index 0000000000..f040b01bf4 --- /dev/null +++ b/samples/client/petstore/dart-jaguar/openapi_proto/test/user_api_test.dart @@ -0,0 +1,73 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for UserApi +void main() { + var instance = new UserApi(); + + group('tests for UserApi', () { + // Create user + // + // This can only be done by the logged in user. + // + //Future createUser(User body) async + test('test createUser', () async { + // TODO + }); + + // Creates list of users with given input array + // + //Future createUsersWithArrayInput(List body) async + test('test createUsersWithArrayInput', () async { + // TODO + }); + + // Creates list of users with given input array + // + //Future createUsersWithListInput(List body) async + test('test createUsersWithListInput', () async { + // TODO + }); + + // Delete user + // + // This can only be done by the logged in user. + // + //Future deleteUser(String username) async + test('test deleteUser', () async { + // TODO + }); + + // Get user by user name + // + //Future getUserByName(String username) async + test('test getUserByName', () async { + // TODO + }); + + // Logs user into the system + // + //Future loginUser(String username, String password) async + test('test loginUser', () async { + // TODO + }); + + // Logs out current logged in user session + // + //Future logoutUser() async + test('test logoutUser', () async { + // TODO + }); + + // Updated user + // + // This can only be done by the logged in user. + // + //Future updateUser(String username, User body) async + test('test updateUser', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart-jaguar/openapi_proto/test/user_test.dart b/samples/client/petstore/dart-jaguar/openapi_proto/test/user_test.dart new file mode 100644 index 0000000000..5a6340c4f4 --- /dev/null +++ b/samples/client/petstore/dart-jaguar/openapi_proto/test/user_test.dart @@ -0,0 +1,53 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for User +void main() { + var instance = new Pet(); + + group('test User', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String username (default value: null) + test('to test the property `username`', () async { + // TODO + }); + + // String firstName (default value: null) + test('to test the property `firstName`', () async { + // TODO + }); + + // String lastName (default value: null) + test('to test the property `lastName`', () async { + // TODO + }); + + // String email (default value: null) + test('to test the property `email`', () async { + // TODO + }); + + // String password (default value: null) + test('to test the property `password`', () async { + // TODO + }); + + // String phone (default value: null) + test('to test the property `phone`', () async { + // TODO + }); + + // User Status + // int userStatus (default value: null) + test('to test the property `userStatus`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart/flutter_petstore/openapi/.openapi-generator/VERSION b/samples/client/petstore/dart/flutter_petstore/openapi/.openapi-generator/VERSION index afa6365606..06b5019af3 100644 --- a/samples/client/petstore/dart/flutter_petstore/openapi/.openapi-generator/VERSION +++ b/samples/client/petstore/dart/flutter_petstore/openapi/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/dart/flutter_petstore/openapi/.travis.yml b/samples/client/petstore/dart/flutter_petstore/openapi/.travis.yml new file mode 100644 index 0000000000..82b19541fa --- /dev/null +++ b/samples/client/petstore/dart/flutter_petstore/openapi/.travis.yml @@ -0,0 +1,11 @@ +# https://docs.travis-ci.com/user/languages/dart/ +# +language: dart +dart: +# Install a specific stable release +- "1.24.3" +install: +- pub get + +script: +- pub run test diff --git a/samples/client/petstore/dart/flutter_petstore/openapi/pubspec.yaml b/samples/client/petstore/dart/flutter_petstore/openapi/pubspec.yaml index 79e5223fcd..b63f835e89 100644 --- a/samples/client/petstore/dart/flutter_petstore/openapi/pubspec.yaml +++ b/samples/client/petstore/dart/flutter_petstore/openapi/pubspec.yaml @@ -3,3 +3,5 @@ version: 1.0.0 description: OpenAPI API client dependencies: http: '>=0.11.1 <0.13.0' +dev_dependencies: + test: ^1.3.0 diff --git a/samples/client/petstore/dart/flutter_petstore/openapi/test/api_response_test.dart b/samples/client/petstore/dart/flutter_petstore/openapi/test/api_response_test.dart new file mode 100644 index 0000000000..ba2202d24c --- /dev/null +++ b/samples/client/petstore/dart/flutter_petstore/openapi/test/api_response_test.dart @@ -0,0 +1,27 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for ApiResponse +void main() { + var instance = new ApiResponse(); + + group('test ApiResponse', () { + // int code (default value: null) + test('to test the property `code`', () async { + // TODO + }); + + // String type (default value: null) + test('to test the property `type`', () async { + // TODO + }); + + // String message (default value: null) + test('to test the property `message`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart/flutter_petstore/openapi/test/category_test.dart b/samples/client/petstore/dart/flutter_petstore/openapi/test/category_test.dart new file mode 100644 index 0000000000..0dcaa8b797 --- /dev/null +++ b/samples/client/petstore/dart/flutter_petstore/openapi/test/category_test.dart @@ -0,0 +1,22 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Category +void main() { + var instance = new Category(); + + group('test Category', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart/flutter_petstore/openapi/test/order_test.dart b/samples/client/petstore/dart/flutter_petstore/openapi/test/order_test.dart new file mode 100644 index 0000000000..aa9dcc69c4 --- /dev/null +++ b/samples/client/petstore/dart/flutter_petstore/openapi/test/order_test.dart @@ -0,0 +1,43 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Order +void main() { + var instance = new Order(); + + group('test Order', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // int petId (default value: null) + test('to test the property `petId`', () async { + // TODO + }); + + // int quantity (default value: null) + test('to test the property `quantity`', () async { + // TODO + }); + + // DateTime shipDate (default value: null) + test('to test the property `shipDate`', () async { + // TODO + }); + + // Order Status + // String status (default value: null) + test('to test the property `status`', () async { + // TODO + }); + + // bool complete (default value: false) + test('to test the property `complete`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart/flutter_petstore/openapi/test/pet_api_test.dart b/samples/client/petstore/dart/flutter_petstore/openapi/test/pet_api_test.dart new file mode 100644 index 0000000000..fa95dccad3 --- /dev/null +++ b/samples/client/petstore/dart/flutter_petstore/openapi/test/pet_api_test.dart @@ -0,0 +1,73 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for PetApi +void main() { + var instance = new PetApi(); + + group('tests for PetApi', () { + // Add a new pet to the store + // + //Future addPet(Pet body) async + test('test addPet', () async { + // TODO + }); + + // Deletes a pet + // + //Future deletePet(int petId, { String apiKey }) async + test('test deletePet', () async { + // TODO + }); + + // Finds Pets by status + // + // Multiple status values can be provided with comma separated strings + // + //Future> findPetsByStatus(List status) async + test('test findPetsByStatus', () async { + // TODO + }); + + // Finds Pets by tags + // + // Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + // + //Future> findPetsByTags(List tags) async + test('test findPetsByTags', () async { + // TODO + }); + + // Find pet by ID + // + // Returns a single pet + // + //Future getPetById(int petId) async + test('test getPetById', () async { + // TODO + }); + + // Update an existing pet + // + //Future updatePet(Pet body) async + test('test updatePet', () async { + // TODO + }); + + // Updates a pet in the store with form data + // + //Future updatePetWithForm(int petId, { String name, String status }) async + test('test updatePetWithForm', () async { + // TODO + }); + + // uploads an image + // + //Future uploadFile(int petId, { String additionalMetadata, MultipartFile file }) async + test('test uploadFile', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart/flutter_petstore/openapi/test/pet_test.dart b/samples/client/petstore/dart/flutter_petstore/openapi/test/pet_test.dart new file mode 100644 index 0000000000..cfd94b9e36 --- /dev/null +++ b/samples/client/petstore/dart/flutter_petstore/openapi/test/pet_test.dart @@ -0,0 +1,43 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Pet +void main() { + var instance = new Pet(); + + group('test Pet', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // Category category (default value: null) + test('to test the property `category`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + // List photoUrls (default value: []) + test('to test the property `photoUrls`', () async { + // TODO + }); + + // List tags (default value: []) + test('to test the property `tags`', () async { + // TODO + }); + + // pet status in the store + // String status (default value: null) + test('to test the property `status`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart/flutter_petstore/openapi/test/store_api_test.dart b/samples/client/petstore/dart/flutter_petstore/openapi/test/store_api_test.dart new file mode 100644 index 0000000000..496d051e83 --- /dev/null +++ b/samples/client/petstore/dart/flutter_petstore/openapi/test/store_api_test.dart @@ -0,0 +1,45 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for StoreApi +void main() { + var instance = new StoreApi(); + + group('tests for StoreApi', () { + // Delete purchase order by ID + // + // For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + // + //Future deleteOrder(String orderId) async + test('test deleteOrder', () async { + // TODO + }); + + // Returns pet inventories by status + // + // Returns a map of status codes to quantities + // + //Future> getInventory() async + test('test getInventory', () async { + // TODO + }); + + // Find purchase order by ID + // + // For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + // + //Future getOrderById(int orderId) async + test('test getOrderById', () async { + // TODO + }); + + // Place an order for a pet + // + //Future placeOrder(Order body) async + test('test placeOrder', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart/flutter_petstore/openapi/test/tag_test.dart b/samples/client/petstore/dart/flutter_petstore/openapi/test/tag_test.dart new file mode 100644 index 0000000000..58477c9e75 --- /dev/null +++ b/samples/client/petstore/dart/flutter_petstore/openapi/test/tag_test.dart @@ -0,0 +1,22 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Tag +void main() { + var instance = new Tag(); + + group('test Tag', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart/flutter_petstore/openapi/test/user_api_test.dart b/samples/client/petstore/dart/flutter_petstore/openapi/test/user_api_test.dart new file mode 100644 index 0000000000..f040b01bf4 --- /dev/null +++ b/samples/client/petstore/dart/flutter_petstore/openapi/test/user_api_test.dart @@ -0,0 +1,73 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for UserApi +void main() { + var instance = new UserApi(); + + group('tests for UserApi', () { + // Create user + // + // This can only be done by the logged in user. + // + //Future createUser(User body) async + test('test createUser', () async { + // TODO + }); + + // Creates list of users with given input array + // + //Future createUsersWithArrayInput(List body) async + test('test createUsersWithArrayInput', () async { + // TODO + }); + + // Creates list of users with given input array + // + //Future createUsersWithListInput(List body) async + test('test createUsersWithListInput', () async { + // TODO + }); + + // Delete user + // + // This can only be done by the logged in user. + // + //Future deleteUser(String username) async + test('test deleteUser', () async { + // TODO + }); + + // Get user by user name + // + //Future getUserByName(String username) async + test('test getUserByName', () async { + // TODO + }); + + // Logs user into the system + // + //Future loginUser(String username, String password) async + test('test loginUser', () async { + // TODO + }); + + // Logs out current logged in user session + // + //Future logoutUser() async + test('test logoutUser', () async { + // TODO + }); + + // Updated user + // + // This can only be done by the logged in user. + // + //Future updateUser(String username, User body) async + test('test updateUser', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart/flutter_petstore/openapi/test/user_test.dart b/samples/client/petstore/dart/flutter_petstore/openapi/test/user_test.dart new file mode 100644 index 0000000000..ae6096d0f5 --- /dev/null +++ b/samples/client/petstore/dart/flutter_petstore/openapi/test/user_test.dart @@ -0,0 +1,53 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for User +void main() { + var instance = new User(); + + group('test User', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String username (default value: null) + test('to test the property `username`', () async { + // TODO + }); + + // String firstName (default value: null) + test('to test the property `firstName`', () async { + // TODO + }); + + // String lastName (default value: null) + test('to test the property `lastName`', () async { + // TODO + }); + + // String email (default value: null) + test('to test the property `email`', () async { + // TODO + }); + + // String password (default value: null) + test('to test the property `password`', () async { + // TODO + }); + + // String phone (default value: null) + test('to test the property `phone`', () async { + // TODO + }); + + // User Status + // int userStatus (default value: null) + test('to test the property `userStatus`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart/openapi-browser-client/.openapi-generator/VERSION b/samples/client/petstore/dart/openapi-browser-client/.openapi-generator/VERSION index afa6365606..06b5019af3 100644 --- a/samples/client/petstore/dart/openapi-browser-client/.openapi-generator/VERSION +++ b/samples/client/petstore/dart/openapi-browser-client/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/dart/openapi-browser-client/.travis.yml b/samples/client/petstore/dart/openapi-browser-client/.travis.yml new file mode 100644 index 0000000000..82b19541fa --- /dev/null +++ b/samples/client/petstore/dart/openapi-browser-client/.travis.yml @@ -0,0 +1,11 @@ +# https://docs.travis-ci.com/user/languages/dart/ +# +language: dart +dart: +# Install a specific stable release +- "1.24.3" +install: +- pub get + +script: +- pub run test diff --git a/samples/client/petstore/dart/openapi-browser-client/pubspec.yaml b/samples/client/petstore/dart/openapi-browser-client/pubspec.yaml index 79e5223fcd..b63f835e89 100644 --- a/samples/client/petstore/dart/openapi-browser-client/pubspec.yaml +++ b/samples/client/petstore/dart/openapi-browser-client/pubspec.yaml @@ -3,3 +3,5 @@ version: 1.0.0 description: OpenAPI API client dependencies: http: '>=0.11.1 <0.13.0' +dev_dependencies: + test: ^1.3.0 diff --git a/samples/client/petstore/dart/openapi-browser-client/test/api_response_test.dart b/samples/client/petstore/dart/openapi-browser-client/test/api_response_test.dart new file mode 100644 index 0000000000..ba2202d24c --- /dev/null +++ b/samples/client/petstore/dart/openapi-browser-client/test/api_response_test.dart @@ -0,0 +1,27 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for ApiResponse +void main() { + var instance = new ApiResponse(); + + group('test ApiResponse', () { + // int code (default value: null) + test('to test the property `code`', () async { + // TODO + }); + + // String type (default value: null) + test('to test the property `type`', () async { + // TODO + }); + + // String message (default value: null) + test('to test the property `message`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart/openapi-browser-client/test/category_test.dart b/samples/client/petstore/dart/openapi-browser-client/test/category_test.dart new file mode 100644 index 0000000000..0dcaa8b797 --- /dev/null +++ b/samples/client/petstore/dart/openapi-browser-client/test/category_test.dart @@ -0,0 +1,22 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Category +void main() { + var instance = new Category(); + + group('test Category', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart/openapi-browser-client/test/order_test.dart b/samples/client/petstore/dart/openapi-browser-client/test/order_test.dart new file mode 100644 index 0000000000..aa9dcc69c4 --- /dev/null +++ b/samples/client/petstore/dart/openapi-browser-client/test/order_test.dart @@ -0,0 +1,43 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Order +void main() { + var instance = new Order(); + + group('test Order', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // int petId (default value: null) + test('to test the property `petId`', () async { + // TODO + }); + + // int quantity (default value: null) + test('to test the property `quantity`', () async { + // TODO + }); + + // DateTime shipDate (default value: null) + test('to test the property `shipDate`', () async { + // TODO + }); + + // Order Status + // String status (default value: null) + test('to test the property `status`', () async { + // TODO + }); + + // bool complete (default value: false) + test('to test the property `complete`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart/openapi-browser-client/test/pet_api_test.dart b/samples/client/petstore/dart/openapi-browser-client/test/pet_api_test.dart new file mode 100644 index 0000000000..fa95dccad3 --- /dev/null +++ b/samples/client/petstore/dart/openapi-browser-client/test/pet_api_test.dart @@ -0,0 +1,73 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for PetApi +void main() { + var instance = new PetApi(); + + group('tests for PetApi', () { + // Add a new pet to the store + // + //Future addPet(Pet body) async + test('test addPet', () async { + // TODO + }); + + // Deletes a pet + // + //Future deletePet(int petId, { String apiKey }) async + test('test deletePet', () async { + // TODO + }); + + // Finds Pets by status + // + // Multiple status values can be provided with comma separated strings + // + //Future> findPetsByStatus(List status) async + test('test findPetsByStatus', () async { + // TODO + }); + + // Finds Pets by tags + // + // Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + // + //Future> findPetsByTags(List tags) async + test('test findPetsByTags', () async { + // TODO + }); + + // Find pet by ID + // + // Returns a single pet + // + //Future getPetById(int petId) async + test('test getPetById', () async { + // TODO + }); + + // Update an existing pet + // + //Future updatePet(Pet body) async + test('test updatePet', () async { + // TODO + }); + + // Updates a pet in the store with form data + // + //Future updatePetWithForm(int petId, { String name, String status }) async + test('test updatePetWithForm', () async { + // TODO + }); + + // uploads an image + // + //Future uploadFile(int petId, { String additionalMetadata, MultipartFile file }) async + test('test uploadFile', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart/openapi-browser-client/test/pet_test.dart b/samples/client/petstore/dart/openapi-browser-client/test/pet_test.dart new file mode 100644 index 0000000000..cfd94b9e36 --- /dev/null +++ b/samples/client/petstore/dart/openapi-browser-client/test/pet_test.dart @@ -0,0 +1,43 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Pet +void main() { + var instance = new Pet(); + + group('test Pet', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // Category category (default value: null) + test('to test the property `category`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + // List photoUrls (default value: []) + test('to test the property `photoUrls`', () async { + // TODO + }); + + // List tags (default value: []) + test('to test the property `tags`', () async { + // TODO + }); + + // pet status in the store + // String status (default value: null) + test('to test the property `status`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart/openapi-browser-client/test/store_api_test.dart b/samples/client/petstore/dart/openapi-browser-client/test/store_api_test.dart new file mode 100644 index 0000000000..496d051e83 --- /dev/null +++ b/samples/client/petstore/dart/openapi-browser-client/test/store_api_test.dart @@ -0,0 +1,45 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for StoreApi +void main() { + var instance = new StoreApi(); + + group('tests for StoreApi', () { + // Delete purchase order by ID + // + // For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + // + //Future deleteOrder(String orderId) async + test('test deleteOrder', () async { + // TODO + }); + + // Returns pet inventories by status + // + // Returns a map of status codes to quantities + // + //Future> getInventory() async + test('test getInventory', () async { + // TODO + }); + + // Find purchase order by ID + // + // For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + // + //Future getOrderById(int orderId) async + test('test getOrderById', () async { + // TODO + }); + + // Place an order for a pet + // + //Future placeOrder(Order body) async + test('test placeOrder', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart/openapi-browser-client/test/tag_test.dart b/samples/client/petstore/dart/openapi-browser-client/test/tag_test.dart new file mode 100644 index 0000000000..58477c9e75 --- /dev/null +++ b/samples/client/petstore/dart/openapi-browser-client/test/tag_test.dart @@ -0,0 +1,22 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Tag +void main() { + var instance = new Tag(); + + group('test Tag', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart/openapi-browser-client/test/user_api_test.dart b/samples/client/petstore/dart/openapi-browser-client/test/user_api_test.dart new file mode 100644 index 0000000000..f040b01bf4 --- /dev/null +++ b/samples/client/petstore/dart/openapi-browser-client/test/user_api_test.dart @@ -0,0 +1,73 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for UserApi +void main() { + var instance = new UserApi(); + + group('tests for UserApi', () { + // Create user + // + // This can only be done by the logged in user. + // + //Future createUser(User body) async + test('test createUser', () async { + // TODO + }); + + // Creates list of users with given input array + // + //Future createUsersWithArrayInput(List body) async + test('test createUsersWithArrayInput', () async { + // TODO + }); + + // Creates list of users with given input array + // + //Future createUsersWithListInput(List body) async + test('test createUsersWithListInput', () async { + // TODO + }); + + // Delete user + // + // This can only be done by the logged in user. + // + //Future deleteUser(String username) async + test('test deleteUser', () async { + // TODO + }); + + // Get user by user name + // + //Future getUserByName(String username) async + test('test getUserByName', () async { + // TODO + }); + + // Logs user into the system + // + //Future loginUser(String username, String password) async + test('test loginUser', () async { + // TODO + }); + + // Logs out current logged in user session + // + //Future logoutUser() async + test('test logoutUser', () async { + // TODO + }); + + // Updated user + // + // This can only be done by the logged in user. + // + //Future updateUser(String username, User body) async + test('test updateUser', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart/openapi-browser-client/test/user_test.dart b/samples/client/petstore/dart/openapi-browser-client/test/user_test.dart new file mode 100644 index 0000000000..ae6096d0f5 --- /dev/null +++ b/samples/client/petstore/dart/openapi-browser-client/test/user_test.dart @@ -0,0 +1,53 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for User +void main() { + var instance = new User(); + + group('test User', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String username (default value: null) + test('to test the property `username`', () async { + // TODO + }); + + // String firstName (default value: null) + test('to test the property `firstName`', () async { + // TODO + }); + + // String lastName (default value: null) + test('to test the property `lastName`', () async { + // TODO + }); + + // String email (default value: null) + test('to test the property `email`', () async { + // TODO + }); + + // String password (default value: null) + test('to test the property `password`', () async { + // TODO + }); + + // String phone (default value: null) + test('to test the property `phone`', () async { + // TODO + }); + + // User Status + // int userStatus (default value: null) + test('to test the property `userStatus`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart/openapi/.openapi-generator/VERSION b/samples/client/petstore/dart/openapi/.openapi-generator/VERSION index afa6365606..06b5019af3 100644 --- a/samples/client/petstore/dart/openapi/.openapi-generator/VERSION +++ b/samples/client/petstore/dart/openapi/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/dart/openapi/.travis.yml b/samples/client/petstore/dart/openapi/.travis.yml new file mode 100644 index 0000000000..82b19541fa --- /dev/null +++ b/samples/client/petstore/dart/openapi/.travis.yml @@ -0,0 +1,11 @@ +# https://docs.travis-ci.com/user/languages/dart/ +# +language: dart +dart: +# Install a specific stable release +- "1.24.3" +install: +- pub get + +script: +- pub run test diff --git a/samples/client/petstore/dart/openapi/pubspec.yaml b/samples/client/petstore/dart/openapi/pubspec.yaml index 79e5223fcd..b63f835e89 100644 --- a/samples/client/petstore/dart/openapi/pubspec.yaml +++ b/samples/client/petstore/dart/openapi/pubspec.yaml @@ -3,3 +3,5 @@ version: 1.0.0 description: OpenAPI API client dependencies: http: '>=0.11.1 <0.13.0' +dev_dependencies: + test: ^1.3.0 diff --git a/samples/client/petstore/dart/openapi/test/api_response_test.dart b/samples/client/petstore/dart/openapi/test/api_response_test.dart new file mode 100644 index 0000000000..ba2202d24c --- /dev/null +++ b/samples/client/petstore/dart/openapi/test/api_response_test.dart @@ -0,0 +1,27 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for ApiResponse +void main() { + var instance = new ApiResponse(); + + group('test ApiResponse', () { + // int code (default value: null) + test('to test the property `code`', () async { + // TODO + }); + + // String type (default value: null) + test('to test the property `type`', () async { + // TODO + }); + + // String message (default value: null) + test('to test the property `message`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart/openapi/test/category_test.dart b/samples/client/petstore/dart/openapi/test/category_test.dart new file mode 100644 index 0000000000..0dcaa8b797 --- /dev/null +++ b/samples/client/petstore/dart/openapi/test/category_test.dart @@ -0,0 +1,22 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Category +void main() { + var instance = new Category(); + + group('test Category', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart/openapi/test/order_test.dart b/samples/client/petstore/dart/openapi/test/order_test.dart new file mode 100644 index 0000000000..aa9dcc69c4 --- /dev/null +++ b/samples/client/petstore/dart/openapi/test/order_test.dart @@ -0,0 +1,43 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Order +void main() { + var instance = new Order(); + + group('test Order', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // int petId (default value: null) + test('to test the property `petId`', () async { + // TODO + }); + + // int quantity (default value: null) + test('to test the property `quantity`', () async { + // TODO + }); + + // DateTime shipDate (default value: null) + test('to test the property `shipDate`', () async { + // TODO + }); + + // Order Status + // String status (default value: null) + test('to test the property `status`', () async { + // TODO + }); + + // bool complete (default value: false) + test('to test the property `complete`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart/openapi/test/pet_api_test.dart b/samples/client/petstore/dart/openapi/test/pet_api_test.dart new file mode 100644 index 0000000000..fa95dccad3 --- /dev/null +++ b/samples/client/petstore/dart/openapi/test/pet_api_test.dart @@ -0,0 +1,73 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for PetApi +void main() { + var instance = new PetApi(); + + group('tests for PetApi', () { + // Add a new pet to the store + // + //Future addPet(Pet body) async + test('test addPet', () async { + // TODO + }); + + // Deletes a pet + // + //Future deletePet(int petId, { String apiKey }) async + test('test deletePet', () async { + // TODO + }); + + // Finds Pets by status + // + // Multiple status values can be provided with comma separated strings + // + //Future> findPetsByStatus(List status) async + test('test findPetsByStatus', () async { + // TODO + }); + + // Finds Pets by tags + // + // Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + // + //Future> findPetsByTags(List tags) async + test('test findPetsByTags', () async { + // TODO + }); + + // Find pet by ID + // + // Returns a single pet + // + //Future getPetById(int petId) async + test('test getPetById', () async { + // TODO + }); + + // Update an existing pet + // + //Future updatePet(Pet body) async + test('test updatePet', () async { + // TODO + }); + + // Updates a pet in the store with form data + // + //Future updatePetWithForm(int petId, { String name, String status }) async + test('test updatePetWithForm', () async { + // TODO + }); + + // uploads an image + // + //Future uploadFile(int petId, { String additionalMetadata, MultipartFile file }) async + test('test uploadFile', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart/openapi/test/pet_test.dart b/samples/client/petstore/dart/openapi/test/pet_test.dart new file mode 100644 index 0000000000..cfd94b9e36 --- /dev/null +++ b/samples/client/petstore/dart/openapi/test/pet_test.dart @@ -0,0 +1,43 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Pet +void main() { + var instance = new Pet(); + + group('test Pet', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // Category category (default value: null) + test('to test the property `category`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + // List photoUrls (default value: []) + test('to test the property `photoUrls`', () async { + // TODO + }); + + // List tags (default value: []) + test('to test the property `tags`', () async { + // TODO + }); + + // pet status in the store + // String status (default value: null) + test('to test the property `status`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart/openapi/test/store_api_test.dart b/samples/client/petstore/dart/openapi/test/store_api_test.dart new file mode 100644 index 0000000000..496d051e83 --- /dev/null +++ b/samples/client/petstore/dart/openapi/test/store_api_test.dart @@ -0,0 +1,45 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for StoreApi +void main() { + var instance = new StoreApi(); + + group('tests for StoreApi', () { + // Delete purchase order by ID + // + // For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + // + //Future deleteOrder(String orderId) async + test('test deleteOrder', () async { + // TODO + }); + + // Returns pet inventories by status + // + // Returns a map of status codes to quantities + // + //Future> getInventory() async + test('test getInventory', () async { + // TODO + }); + + // Find purchase order by ID + // + // For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + // + //Future getOrderById(int orderId) async + test('test getOrderById', () async { + // TODO + }); + + // Place an order for a pet + // + //Future placeOrder(Order body) async + test('test placeOrder', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart/openapi/test/tag_test.dart b/samples/client/petstore/dart/openapi/test/tag_test.dart new file mode 100644 index 0000000000..58477c9e75 --- /dev/null +++ b/samples/client/petstore/dart/openapi/test/tag_test.dart @@ -0,0 +1,22 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Tag +void main() { + var instance = new Tag(); + + group('test Tag', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart/openapi/test/user_api_test.dart b/samples/client/petstore/dart/openapi/test/user_api_test.dart new file mode 100644 index 0000000000..f040b01bf4 --- /dev/null +++ b/samples/client/petstore/dart/openapi/test/user_api_test.dart @@ -0,0 +1,73 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for UserApi +void main() { + var instance = new UserApi(); + + group('tests for UserApi', () { + // Create user + // + // This can only be done by the logged in user. + // + //Future createUser(User body) async + test('test createUser', () async { + // TODO + }); + + // Creates list of users with given input array + // + //Future createUsersWithArrayInput(List body) async + test('test createUsersWithArrayInput', () async { + // TODO + }); + + // Creates list of users with given input array + // + //Future createUsersWithListInput(List body) async + test('test createUsersWithListInput', () async { + // TODO + }); + + // Delete user + // + // This can only be done by the logged in user. + // + //Future deleteUser(String username) async + test('test deleteUser', () async { + // TODO + }); + + // Get user by user name + // + //Future getUserByName(String username) async + test('test getUserByName', () async { + // TODO + }); + + // Logs user into the system + // + //Future loginUser(String username, String password) async + test('test loginUser', () async { + // TODO + }); + + // Logs out current logged in user session + // + //Future logoutUser() async + test('test logoutUser', () async { + // TODO + }); + + // Updated user + // + // This can only be done by the logged in user. + // + //Future updateUser(String username, User body) async + test('test updateUser', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart/openapi/test/user_test.dart b/samples/client/petstore/dart/openapi/test/user_test.dart new file mode 100644 index 0000000000..ae6096d0f5 --- /dev/null +++ b/samples/client/petstore/dart/openapi/test/user_test.dart @@ -0,0 +1,53 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for User +void main() { + var instance = new User(); + + group('test User', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String username (default value: null) + test('to test the property `username`', () async { + // TODO + }); + + // String firstName (default value: null) + test('to test the property `firstName`', () async { + // TODO + }); + + // String lastName (default value: null) + test('to test the property `lastName`', () async { + // TODO + }); + + // String email (default value: null) + test('to test the property `email`', () async { + // TODO + }); + + // String password (default value: null) + test('to test the property `password`', () async { + // TODO + }); + + // String phone (default value: null) + test('to test the property `phone`', () async { + // TODO + }); + + // User Status + // int userStatus (default value: null) + test('to test the property `userStatus`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart/purge_test.sh b/samples/client/petstore/dart/purge_test.sh new file mode 100755 index 0000000000..b11cf3564d --- /dev/null +++ b/samples/client/petstore/dart/purge_test.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +echo "purge test fils under 'test' folder" +rm -Rf flutter_petstore/openapi/test/ +rm -Rf openapi/test/ +rm -Rf openapi-browser-client/test diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/.openapi-generator/VERSION b/samples/client/petstore/dart2/flutter_petstore/openapi/.openapi-generator/VERSION index afa6365606..06b5019af3 100644 --- a/samples/client/petstore/dart2/flutter_petstore/openapi/.openapi-generator/VERSION +++ b/samples/client/petstore/dart2/flutter_petstore/openapi/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/.travis.yml b/samples/client/petstore/dart2/flutter_petstore/openapi/.travis.yml new file mode 100644 index 0000000000..d0758bc9f0 --- /dev/null +++ b/samples/client/petstore/dart2/flutter_petstore/openapi/.travis.yml @@ -0,0 +1,11 @@ +# https://docs.travis-ci.com/user/languages/dart/ +# +language: dart +dart: +# Install a specific stable release +- "2.2.0" +install: +- pub get + +script: +- pub run test diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/pubspec.yaml b/samples/client/petstore/dart2/flutter_petstore/openapi/pubspec.yaml index 9ccf0e524a..391fa5edec 100644 --- a/samples/client/petstore/dart2/flutter_petstore/openapi/pubspec.yaml +++ b/samples/client/petstore/dart2/flutter_petstore/openapi/pubspec.yaml @@ -4,4 +4,6 @@ description: OpenAPI API client environment: sdk: '>=2.0.0 <3.0.0' dependencies: - http: '>=0.11.1 <0.12.0' + http: '>=0.11.1 <0.13.0' +dev_dependencies: + test: ^1.3.0 diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/test/api_response_test.dart b/samples/client/petstore/dart2/flutter_petstore/openapi/test/api_response_test.dart new file mode 100644 index 0000000000..ebf142904e --- /dev/null +++ b/samples/client/petstore/dart2/flutter_petstore/openapi/test/api_response_test.dart @@ -0,0 +1,27 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for ApiResponse +void main() { + var instance = new Pet(); + + group('test ApiResponse', () { + // int code (default value: null) + test('to test the property `code`', () async { + // TODO + }); + + // String type (default value: null) + test('to test the property `type`', () async { + // TODO + }); + + // String message (default value: null) + test('to test the property `message`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/test/category_test.dart b/samples/client/petstore/dart2/flutter_petstore/openapi/test/category_test.dart new file mode 100644 index 0000000000..c5cea4b5bc --- /dev/null +++ b/samples/client/petstore/dart2/flutter_petstore/openapi/test/category_test.dart @@ -0,0 +1,22 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Category +void main() { + var instance = new Pet(); + + group('test Category', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/test/order_test.dart b/samples/client/petstore/dart2/flutter_petstore/openapi/test/order_test.dart new file mode 100644 index 0000000000..9982020d8c --- /dev/null +++ b/samples/client/petstore/dart2/flutter_petstore/openapi/test/order_test.dart @@ -0,0 +1,43 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Order +void main() { + var instance = new Pet(); + + group('test Order', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // int petId (default value: null) + test('to test the property `petId`', () async { + // TODO + }); + + // int quantity (default value: null) + test('to test the property `quantity`', () async { + // TODO + }); + + // DateTime shipDate (default value: null) + test('to test the property `shipDate`', () async { + // TODO + }); + + // Order Status + // String status (default value: null) + test('to test the property `status`', () async { + // TODO + }); + + // bool complete (default value: false) + test('to test the property `complete`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/test/pet_api_test.dart b/samples/client/petstore/dart2/flutter_petstore/openapi/test/pet_api_test.dart new file mode 100644 index 0000000000..fa95dccad3 --- /dev/null +++ b/samples/client/petstore/dart2/flutter_petstore/openapi/test/pet_api_test.dart @@ -0,0 +1,73 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for PetApi +void main() { + var instance = new PetApi(); + + group('tests for PetApi', () { + // Add a new pet to the store + // + //Future addPet(Pet body) async + test('test addPet', () async { + // TODO + }); + + // Deletes a pet + // + //Future deletePet(int petId, { String apiKey }) async + test('test deletePet', () async { + // TODO + }); + + // Finds Pets by status + // + // Multiple status values can be provided with comma separated strings + // + //Future> findPetsByStatus(List status) async + test('test findPetsByStatus', () async { + // TODO + }); + + // Finds Pets by tags + // + // Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + // + //Future> findPetsByTags(List tags) async + test('test findPetsByTags', () async { + // TODO + }); + + // Find pet by ID + // + // Returns a single pet + // + //Future getPetById(int petId) async + test('test getPetById', () async { + // TODO + }); + + // Update an existing pet + // + //Future updatePet(Pet body) async + test('test updatePet', () async { + // TODO + }); + + // Updates a pet in the store with form data + // + //Future updatePetWithForm(int petId, { String name, String status }) async + test('test updatePetWithForm', () async { + // TODO + }); + + // uploads an image + // + //Future uploadFile(int petId, { String additionalMetadata, MultipartFile file }) async + test('test uploadFile', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/test/pet_test.dart b/samples/client/petstore/dart2/flutter_petstore/openapi/test/pet_test.dart new file mode 100644 index 0000000000..cfd94b9e36 --- /dev/null +++ b/samples/client/petstore/dart2/flutter_petstore/openapi/test/pet_test.dart @@ -0,0 +1,43 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Pet +void main() { + var instance = new Pet(); + + group('test Pet', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // Category category (default value: null) + test('to test the property `category`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + // List photoUrls (default value: []) + test('to test the property `photoUrls`', () async { + // TODO + }); + + // List tags (default value: []) + test('to test the property `tags`', () async { + // TODO + }); + + // pet status in the store + // String status (default value: null) + test('to test the property `status`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/test/store_api_test.dart b/samples/client/petstore/dart2/flutter_petstore/openapi/test/store_api_test.dart new file mode 100644 index 0000000000..496d051e83 --- /dev/null +++ b/samples/client/petstore/dart2/flutter_petstore/openapi/test/store_api_test.dart @@ -0,0 +1,45 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for StoreApi +void main() { + var instance = new StoreApi(); + + group('tests for StoreApi', () { + // Delete purchase order by ID + // + // For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + // + //Future deleteOrder(String orderId) async + test('test deleteOrder', () async { + // TODO + }); + + // Returns pet inventories by status + // + // Returns a map of status codes to quantities + // + //Future> getInventory() async + test('test getInventory', () async { + // TODO + }); + + // Find purchase order by ID + // + // For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + // + //Future getOrderById(int orderId) async + test('test getOrderById', () async { + // TODO + }); + + // Place an order for a pet + // + //Future placeOrder(Order body) async + test('test placeOrder', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/test/tag_test.dart b/samples/client/petstore/dart2/flutter_petstore/openapi/test/tag_test.dart new file mode 100644 index 0000000000..6ee16c51bb --- /dev/null +++ b/samples/client/petstore/dart2/flutter_petstore/openapi/test/tag_test.dart @@ -0,0 +1,22 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Tag +void main() { + var instance = new Pet(); + + group('test Tag', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/test/user_api_test.dart b/samples/client/petstore/dart2/flutter_petstore/openapi/test/user_api_test.dart new file mode 100644 index 0000000000..f040b01bf4 --- /dev/null +++ b/samples/client/petstore/dart2/flutter_petstore/openapi/test/user_api_test.dart @@ -0,0 +1,73 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for UserApi +void main() { + var instance = new UserApi(); + + group('tests for UserApi', () { + // Create user + // + // This can only be done by the logged in user. + // + //Future createUser(User body) async + test('test createUser', () async { + // TODO + }); + + // Creates list of users with given input array + // + //Future createUsersWithArrayInput(List body) async + test('test createUsersWithArrayInput', () async { + // TODO + }); + + // Creates list of users with given input array + // + //Future createUsersWithListInput(List body) async + test('test createUsersWithListInput', () async { + // TODO + }); + + // Delete user + // + // This can only be done by the logged in user. + // + //Future deleteUser(String username) async + test('test deleteUser', () async { + // TODO + }); + + // Get user by user name + // + //Future getUserByName(String username) async + test('test getUserByName', () async { + // TODO + }); + + // Logs user into the system + // + //Future loginUser(String username, String password) async + test('test loginUser', () async { + // TODO + }); + + // Logs out current logged in user session + // + //Future logoutUser() async + test('test logoutUser', () async { + // TODO + }); + + // Updated user + // + // This can only be done by the logged in user. + // + //Future updateUser(String username, User body) async + test('test updateUser', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/test/user_test.dart b/samples/client/petstore/dart2/flutter_petstore/openapi/test/user_test.dart new file mode 100644 index 0000000000..5a6340c4f4 --- /dev/null +++ b/samples/client/petstore/dart2/flutter_petstore/openapi/test/user_test.dart @@ -0,0 +1,53 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for User +void main() { + var instance = new Pet(); + + group('test User', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String username (default value: null) + test('to test the property `username`', () async { + // TODO + }); + + // String firstName (default value: null) + test('to test the property `firstName`', () async { + // TODO + }); + + // String lastName (default value: null) + test('to test the property `lastName`', () async { + // TODO + }); + + // String email (default value: null) + test('to test the property `email`', () async { + // TODO + }); + + // String password (default value: null) + test('to test the property `password`', () async { + // TODO + }); + + // String phone (default value: null) + test('to test the property `phone`', () async { + // TODO + }); + + // User Status + // int userStatus (default value: null) + test('to test the property `userStatus`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart2/openapi-browser-client/.openapi-generator/VERSION b/samples/client/petstore/dart2/openapi-browser-client/.openapi-generator/VERSION index afa6365606..06b5019af3 100644 --- a/samples/client/petstore/dart2/openapi-browser-client/.openapi-generator/VERSION +++ b/samples/client/petstore/dart2/openapi-browser-client/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/dart2/openapi-browser-client/.travis.yml b/samples/client/petstore/dart2/openapi-browser-client/.travis.yml new file mode 100644 index 0000000000..d0758bc9f0 --- /dev/null +++ b/samples/client/petstore/dart2/openapi-browser-client/.travis.yml @@ -0,0 +1,11 @@ +# https://docs.travis-ci.com/user/languages/dart/ +# +language: dart +dart: +# Install a specific stable release +- "2.2.0" +install: +- pub get + +script: +- pub run test diff --git a/samples/client/petstore/dart2/openapi-browser-client/pubspec.yaml b/samples/client/petstore/dart2/openapi-browser-client/pubspec.yaml index 9ccf0e524a..391fa5edec 100644 --- a/samples/client/petstore/dart2/openapi-browser-client/pubspec.yaml +++ b/samples/client/petstore/dart2/openapi-browser-client/pubspec.yaml @@ -4,4 +4,6 @@ description: OpenAPI API client environment: sdk: '>=2.0.0 <3.0.0' dependencies: - http: '>=0.11.1 <0.12.0' + http: '>=0.11.1 <0.13.0' +dev_dependencies: + test: ^1.3.0 diff --git a/samples/client/petstore/dart2/openapi-browser-client/test/api_response_test.dart b/samples/client/petstore/dart2/openapi-browser-client/test/api_response_test.dart new file mode 100644 index 0000000000..ebf142904e --- /dev/null +++ b/samples/client/petstore/dart2/openapi-browser-client/test/api_response_test.dart @@ -0,0 +1,27 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for ApiResponse +void main() { + var instance = new Pet(); + + group('test ApiResponse', () { + // int code (default value: null) + test('to test the property `code`', () async { + // TODO + }); + + // String type (default value: null) + test('to test the property `type`', () async { + // TODO + }); + + // String message (default value: null) + test('to test the property `message`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart2/openapi-browser-client/test/category_test.dart b/samples/client/petstore/dart2/openapi-browser-client/test/category_test.dart new file mode 100644 index 0000000000..c5cea4b5bc --- /dev/null +++ b/samples/client/petstore/dart2/openapi-browser-client/test/category_test.dart @@ -0,0 +1,22 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Category +void main() { + var instance = new Pet(); + + group('test Category', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart2/openapi-browser-client/test/order_test.dart b/samples/client/petstore/dart2/openapi-browser-client/test/order_test.dart new file mode 100644 index 0000000000..9982020d8c --- /dev/null +++ b/samples/client/petstore/dart2/openapi-browser-client/test/order_test.dart @@ -0,0 +1,43 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Order +void main() { + var instance = new Pet(); + + group('test Order', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // int petId (default value: null) + test('to test the property `petId`', () async { + // TODO + }); + + // int quantity (default value: null) + test('to test the property `quantity`', () async { + // TODO + }); + + // DateTime shipDate (default value: null) + test('to test the property `shipDate`', () async { + // TODO + }); + + // Order Status + // String status (default value: null) + test('to test the property `status`', () async { + // TODO + }); + + // bool complete (default value: false) + test('to test the property `complete`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart2/openapi-browser-client/test/pet_api_test.dart b/samples/client/petstore/dart2/openapi-browser-client/test/pet_api_test.dart new file mode 100644 index 0000000000..fa95dccad3 --- /dev/null +++ b/samples/client/petstore/dart2/openapi-browser-client/test/pet_api_test.dart @@ -0,0 +1,73 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for PetApi +void main() { + var instance = new PetApi(); + + group('tests for PetApi', () { + // Add a new pet to the store + // + //Future addPet(Pet body) async + test('test addPet', () async { + // TODO + }); + + // Deletes a pet + // + //Future deletePet(int petId, { String apiKey }) async + test('test deletePet', () async { + // TODO + }); + + // Finds Pets by status + // + // Multiple status values can be provided with comma separated strings + // + //Future> findPetsByStatus(List status) async + test('test findPetsByStatus', () async { + // TODO + }); + + // Finds Pets by tags + // + // Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + // + //Future> findPetsByTags(List tags) async + test('test findPetsByTags', () async { + // TODO + }); + + // Find pet by ID + // + // Returns a single pet + // + //Future getPetById(int petId) async + test('test getPetById', () async { + // TODO + }); + + // Update an existing pet + // + //Future updatePet(Pet body) async + test('test updatePet', () async { + // TODO + }); + + // Updates a pet in the store with form data + // + //Future updatePetWithForm(int petId, { String name, String status }) async + test('test updatePetWithForm', () async { + // TODO + }); + + // uploads an image + // + //Future uploadFile(int petId, { String additionalMetadata, MultipartFile file }) async + test('test uploadFile', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart2/openapi-browser-client/test/pet_test.dart b/samples/client/petstore/dart2/openapi-browser-client/test/pet_test.dart new file mode 100644 index 0000000000..cfd94b9e36 --- /dev/null +++ b/samples/client/petstore/dart2/openapi-browser-client/test/pet_test.dart @@ -0,0 +1,43 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Pet +void main() { + var instance = new Pet(); + + group('test Pet', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // Category category (default value: null) + test('to test the property `category`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + // List photoUrls (default value: []) + test('to test the property `photoUrls`', () async { + // TODO + }); + + // List tags (default value: []) + test('to test the property `tags`', () async { + // TODO + }); + + // pet status in the store + // String status (default value: null) + test('to test the property `status`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart2/openapi-browser-client/test/store_api_test.dart b/samples/client/petstore/dart2/openapi-browser-client/test/store_api_test.dart new file mode 100644 index 0000000000..496d051e83 --- /dev/null +++ b/samples/client/petstore/dart2/openapi-browser-client/test/store_api_test.dart @@ -0,0 +1,45 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for StoreApi +void main() { + var instance = new StoreApi(); + + group('tests for StoreApi', () { + // Delete purchase order by ID + // + // For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + // + //Future deleteOrder(String orderId) async + test('test deleteOrder', () async { + // TODO + }); + + // Returns pet inventories by status + // + // Returns a map of status codes to quantities + // + //Future> getInventory() async + test('test getInventory', () async { + // TODO + }); + + // Find purchase order by ID + // + // For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + // + //Future getOrderById(int orderId) async + test('test getOrderById', () async { + // TODO + }); + + // Place an order for a pet + // + //Future placeOrder(Order body) async + test('test placeOrder', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart2/openapi-browser-client/test/tag_test.dart b/samples/client/petstore/dart2/openapi-browser-client/test/tag_test.dart new file mode 100644 index 0000000000..6ee16c51bb --- /dev/null +++ b/samples/client/petstore/dart2/openapi-browser-client/test/tag_test.dart @@ -0,0 +1,22 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Tag +void main() { + var instance = new Pet(); + + group('test Tag', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart2/openapi-browser-client/test/user_api_test.dart b/samples/client/petstore/dart2/openapi-browser-client/test/user_api_test.dart new file mode 100644 index 0000000000..f040b01bf4 --- /dev/null +++ b/samples/client/petstore/dart2/openapi-browser-client/test/user_api_test.dart @@ -0,0 +1,73 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for UserApi +void main() { + var instance = new UserApi(); + + group('tests for UserApi', () { + // Create user + // + // This can only be done by the logged in user. + // + //Future createUser(User body) async + test('test createUser', () async { + // TODO + }); + + // Creates list of users with given input array + // + //Future createUsersWithArrayInput(List body) async + test('test createUsersWithArrayInput', () async { + // TODO + }); + + // Creates list of users with given input array + // + //Future createUsersWithListInput(List body) async + test('test createUsersWithListInput', () async { + // TODO + }); + + // Delete user + // + // This can only be done by the logged in user. + // + //Future deleteUser(String username) async + test('test deleteUser', () async { + // TODO + }); + + // Get user by user name + // + //Future getUserByName(String username) async + test('test getUserByName', () async { + // TODO + }); + + // Logs user into the system + // + //Future loginUser(String username, String password) async + test('test loginUser', () async { + // TODO + }); + + // Logs out current logged in user session + // + //Future logoutUser() async + test('test logoutUser', () async { + // TODO + }); + + // Updated user + // + // This can only be done by the logged in user. + // + //Future updateUser(String username, User body) async + test('test updateUser', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart2/openapi-browser-client/test/user_test.dart b/samples/client/petstore/dart2/openapi-browser-client/test/user_test.dart new file mode 100644 index 0000000000..5a6340c4f4 --- /dev/null +++ b/samples/client/petstore/dart2/openapi-browser-client/test/user_test.dart @@ -0,0 +1,53 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for User +void main() { + var instance = new Pet(); + + group('test User', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String username (default value: null) + test('to test the property `username`', () async { + // TODO + }); + + // String firstName (default value: null) + test('to test the property `firstName`', () async { + // TODO + }); + + // String lastName (default value: null) + test('to test the property `lastName`', () async { + // TODO + }); + + // String email (default value: null) + test('to test the property `email`', () async { + // TODO + }); + + // String password (default value: null) + test('to test the property `password`', () async { + // TODO + }); + + // String phone (default value: null) + test('to test the property `phone`', () async { + // TODO + }); + + // User Status + // int userStatus (default value: null) + test('to test the property `userStatus`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart2/openapi/.openapi-generator/VERSION b/samples/client/petstore/dart2/openapi/.openapi-generator/VERSION index afa6365606..06b5019af3 100644 --- a/samples/client/petstore/dart2/openapi/.openapi-generator/VERSION +++ b/samples/client/petstore/dart2/openapi/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/dart2/openapi/.travis.yml b/samples/client/petstore/dart2/openapi/.travis.yml new file mode 100644 index 0000000000..d0758bc9f0 --- /dev/null +++ b/samples/client/petstore/dart2/openapi/.travis.yml @@ -0,0 +1,11 @@ +# https://docs.travis-ci.com/user/languages/dart/ +# +language: dart +dart: +# Install a specific stable release +- "2.2.0" +install: +- pub get + +script: +- pub run test diff --git a/samples/client/petstore/dart2/openapi/pubspec.yaml b/samples/client/petstore/dart2/openapi/pubspec.yaml index 9ccf0e524a..391fa5edec 100644 --- a/samples/client/petstore/dart2/openapi/pubspec.yaml +++ b/samples/client/petstore/dart2/openapi/pubspec.yaml @@ -4,4 +4,6 @@ description: OpenAPI API client environment: sdk: '>=2.0.0 <3.0.0' dependencies: - http: '>=0.11.1 <0.12.0' + http: '>=0.11.1 <0.13.0' +dev_dependencies: + test: ^1.3.0 diff --git a/samples/client/petstore/dart2/openapi/test/api_response_test.dart b/samples/client/petstore/dart2/openapi/test/api_response_test.dart new file mode 100644 index 0000000000..ebf142904e --- /dev/null +++ b/samples/client/petstore/dart2/openapi/test/api_response_test.dart @@ -0,0 +1,27 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for ApiResponse +void main() { + var instance = new Pet(); + + group('test ApiResponse', () { + // int code (default value: null) + test('to test the property `code`', () async { + // TODO + }); + + // String type (default value: null) + test('to test the property `type`', () async { + // TODO + }); + + // String message (default value: null) + test('to test the property `message`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart2/openapi/test/category_test.dart b/samples/client/petstore/dart2/openapi/test/category_test.dart new file mode 100644 index 0000000000..c5cea4b5bc --- /dev/null +++ b/samples/client/petstore/dart2/openapi/test/category_test.dart @@ -0,0 +1,22 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Category +void main() { + var instance = new Pet(); + + group('test Category', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart2/openapi/test/order_test.dart b/samples/client/petstore/dart2/openapi/test/order_test.dart new file mode 100644 index 0000000000..9982020d8c --- /dev/null +++ b/samples/client/petstore/dart2/openapi/test/order_test.dart @@ -0,0 +1,43 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Order +void main() { + var instance = new Pet(); + + group('test Order', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // int petId (default value: null) + test('to test the property `petId`', () async { + // TODO + }); + + // int quantity (default value: null) + test('to test the property `quantity`', () async { + // TODO + }); + + // DateTime shipDate (default value: null) + test('to test the property `shipDate`', () async { + // TODO + }); + + // Order Status + // String status (default value: null) + test('to test the property `status`', () async { + // TODO + }); + + // bool complete (default value: false) + test('to test the property `complete`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart2/openapi/test/pet_api_test.dart b/samples/client/petstore/dart2/openapi/test/pet_api_test.dart new file mode 100644 index 0000000000..fa95dccad3 --- /dev/null +++ b/samples/client/petstore/dart2/openapi/test/pet_api_test.dart @@ -0,0 +1,73 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for PetApi +void main() { + var instance = new PetApi(); + + group('tests for PetApi', () { + // Add a new pet to the store + // + //Future addPet(Pet body) async + test('test addPet', () async { + // TODO + }); + + // Deletes a pet + // + //Future deletePet(int petId, { String apiKey }) async + test('test deletePet', () async { + // TODO + }); + + // Finds Pets by status + // + // Multiple status values can be provided with comma separated strings + // + //Future> findPetsByStatus(List status) async + test('test findPetsByStatus', () async { + // TODO + }); + + // Finds Pets by tags + // + // Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + // + //Future> findPetsByTags(List tags) async + test('test findPetsByTags', () async { + // TODO + }); + + // Find pet by ID + // + // Returns a single pet + // + //Future getPetById(int petId) async + test('test getPetById', () async { + // TODO + }); + + // Update an existing pet + // + //Future updatePet(Pet body) async + test('test updatePet', () async { + // TODO + }); + + // Updates a pet in the store with form data + // + //Future updatePetWithForm(int petId, { String name, String status }) async + test('test updatePetWithForm', () async { + // TODO + }); + + // uploads an image + // + //Future uploadFile(int petId, { String additionalMetadata, MultipartFile file }) async + test('test uploadFile', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart2/openapi/test/pet_test.dart b/samples/client/petstore/dart2/openapi/test/pet_test.dart new file mode 100644 index 0000000000..cfd94b9e36 --- /dev/null +++ b/samples/client/petstore/dart2/openapi/test/pet_test.dart @@ -0,0 +1,43 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Pet +void main() { + var instance = new Pet(); + + group('test Pet', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // Category category (default value: null) + test('to test the property `category`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + // List photoUrls (default value: []) + test('to test the property `photoUrls`', () async { + // TODO + }); + + // List tags (default value: []) + test('to test the property `tags`', () async { + // TODO + }); + + // pet status in the store + // String status (default value: null) + test('to test the property `status`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart2/openapi/test/store_api_test.dart b/samples/client/petstore/dart2/openapi/test/store_api_test.dart new file mode 100644 index 0000000000..496d051e83 --- /dev/null +++ b/samples/client/petstore/dart2/openapi/test/store_api_test.dart @@ -0,0 +1,45 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for StoreApi +void main() { + var instance = new StoreApi(); + + group('tests for StoreApi', () { + // Delete purchase order by ID + // + // For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + // + //Future deleteOrder(String orderId) async + test('test deleteOrder', () async { + // TODO + }); + + // Returns pet inventories by status + // + // Returns a map of status codes to quantities + // + //Future> getInventory() async + test('test getInventory', () async { + // TODO + }); + + // Find purchase order by ID + // + // For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + // + //Future getOrderById(int orderId) async + test('test getOrderById', () async { + // TODO + }); + + // Place an order for a pet + // + //Future placeOrder(Order body) async + test('test placeOrder', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart2/openapi/test/tag_test.dart b/samples/client/petstore/dart2/openapi/test/tag_test.dart new file mode 100644 index 0000000000..6ee16c51bb --- /dev/null +++ b/samples/client/petstore/dart2/openapi/test/tag_test.dart @@ -0,0 +1,22 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for Tag +void main() { + var instance = new Pet(); + + group('test Tag', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String name (default value: null) + test('to test the property `name`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart2/openapi/test/user_api_test.dart b/samples/client/petstore/dart2/openapi/test/user_api_test.dart new file mode 100644 index 0000000000..f040b01bf4 --- /dev/null +++ b/samples/client/petstore/dart2/openapi/test/user_api_test.dart @@ -0,0 +1,73 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + + +/// tests for UserApi +void main() { + var instance = new UserApi(); + + group('tests for UserApi', () { + // Create user + // + // This can only be done by the logged in user. + // + //Future createUser(User body) async + test('test createUser', () async { + // TODO + }); + + // Creates list of users with given input array + // + //Future createUsersWithArrayInput(List body) async + test('test createUsersWithArrayInput', () async { + // TODO + }); + + // Creates list of users with given input array + // + //Future createUsersWithListInput(List body) async + test('test createUsersWithListInput', () async { + // TODO + }); + + // Delete user + // + // This can only be done by the logged in user. + // + //Future deleteUser(String username) async + test('test deleteUser', () async { + // TODO + }); + + // Get user by user name + // + //Future getUserByName(String username) async + test('test getUserByName', () async { + // TODO + }); + + // Logs user into the system + // + //Future loginUser(String username, String password) async + test('test loginUser', () async { + // TODO + }); + + // Logs out current logged in user session + // + //Future logoutUser() async + test('test logoutUser', () async { + // TODO + }); + + // Updated user + // + // This can only be done by the logged in user. + // + //Future updateUser(String username, User body) async + test('test updateUser', () async { + // TODO + }); + + }); +} diff --git a/samples/client/petstore/dart2/openapi/test/user_test.dart b/samples/client/petstore/dart2/openapi/test/user_test.dart new file mode 100644 index 0000000000..5a6340c4f4 --- /dev/null +++ b/samples/client/petstore/dart2/openapi/test/user_test.dart @@ -0,0 +1,53 @@ +import 'package:openapi/api.dart'; +import 'package:test/test.dart'; + +// tests for User +void main() { + var instance = new Pet(); + + group('test User', () { + // int id (default value: null) + test('to test the property `id`', () async { + // TODO + }); + + // String username (default value: null) + test('to test the property `username`', () async { + // TODO + }); + + // String firstName (default value: null) + test('to test the property `firstName`', () async { + // TODO + }); + + // String lastName (default value: null) + test('to test the property `lastName`', () async { + // TODO + }); + + // String email (default value: null) + test('to test the property `email`', () async { + // TODO + }); + + // String password (default value: null) + test('to test the property `password`', () async { + // TODO + }); + + // String phone (default value: null) + test('to test the property `phone`', () async { + // TODO + }); + + // User Status + // int userStatus (default value: null) + test('to test the property `userStatus`', () async { + // TODO + }); + + + }); + +} diff --git a/samples/client/petstore/dart2/purge_test.sh b/samples/client/petstore/dart2/purge_test.sh new file mode 100755 index 0000000000..b11cf3564d --- /dev/null +++ b/samples/client/petstore/dart2/purge_test.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +echo "purge test fils under 'test' folder" +rm -Rf flutter_petstore/openapi/test/ +rm -Rf openapi/test/ +rm -Rf openapi-browser-client/test diff --git a/samples/client/petstore/elixir/.openapi-generator/VERSION b/samples/client/petstore/elixir/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/elixir/.openapi-generator/VERSION +++ b/samples/client/petstore/elixir/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/elm/src/Request/Pet.elm b/samples/client/petstore/elm/src/Request/Pet.elm index 017cdb0a8c..1743382c61 100644 --- a/samples/client/petstore/elm/src/Request/Pet.elm +++ b/samples/client/petstore/elm/src/Request/Pet.elm @@ -10,7 +10,7 @@ -} -module Request.Pet exposing (addPet, deletePet, findPetsByStatus, findPetsByTags, getPetById, updatePet, updatePetWithForm, uploadFile) +module Request.Pet exposing (Status(..), addPet, deletePet, findPetsByStatus, findPetsByTags, getPetById, updatePet, updatePetWithForm, uploadFile) import Data.ApiResponse as ApiResponse exposing (ApiResponse) import Data.Pet as Pet exposing (Pet) @@ -20,6 +20,25 @@ import Json.Decode as Decode import Url.Builder as Url +type Status + = Available + | Pending + | Sold + + +statusToString : Status -> String +statusToString value = + case value of + Available -> + "available" + + Pending -> + "pending" + + Sold -> + "sold" + + basePath : String basePath = "http://petstore.swagger.io/v2" @@ -72,7 +91,7 @@ deletePet headers params = -} findPetsByStatus : { onSend : Result Http.Error (List Pet) -> msg - , status : List String + , status : List Status } -> Cmd msg findPetsByStatus params = @@ -82,7 +101,7 @@ findPetsByStatus params = , url = Url.crossOrigin basePath [ "pet", "findByStatus" ] - (List.filterMap identity [ Just (Url.string "status" <| String.join "," params.status) ]) + (List.filterMap identity [ Just (Url.string "status" <| (String.join "," << List.map statusToString) params.status) ]) , body = Http.emptyBody , expect = Http.expectJson params.onSend (Decode.list Pet.decoder) , timeout = Just 30000 diff --git a/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION b/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION +++ b/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/go/go-petstore/client.go b/samples/client/petstore/go/go-petstore/client.go index 4e23947fc1..e057b74529 100644 --- a/samples/client/petstore/go/go-petstore/client.go +++ b/samples/client/petstore/go/go-petstore/client.go @@ -387,7 +387,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e } else if jsonCheck.MatchString(contentType) { err = json.NewEncoder(bodyBuf).Encode(body) } else if xmlCheck.MatchString(contentType) { - xml.NewEncoder(bodyBuf).Encode(body) + err = xml.NewEncoder(bodyBuf).Encode(body) } if err != nil { diff --git a/samples/client/petstore/groovy/.openapi-generator/VERSION b/samples/client/petstore/groovy/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/groovy/.openapi-generator/VERSION +++ b/samples/client/petstore/groovy/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/groovy/build.gradle b/samples/client/petstore/groovy/build.gradle index 2f26e5b257..d05a1ba4cc 100644 --- a/samples/client/petstore/groovy/build.gradle +++ b/samples/client/petstore/groovy/build.gradle @@ -27,7 +27,7 @@ repositories { ext { swagger_annotations_version = "1.5.22" - jackson_version = "2.9.8" + jackson_version = "2.9.9" } dependencies { diff --git a/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION b/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION +++ b/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/feign/.openapi-generator/VERSION b/samples/client/petstore/java/feign/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/java/feign/.openapi-generator/VERSION +++ b/samples/client/petstore/java/feign/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/feign/build.gradle b/samples/client/petstore/java/feign/build.gradle index 7570081d3a..af30107a4f 100644 --- a/samples/client/petstore/java/feign/build.gradle +++ b/samples/client/petstore/java/feign/build.gradle @@ -95,11 +95,11 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.21" - jackson_version = "2.8.11" - jackson_databind_version = "2.8.11.3" + swagger_annotations_version = "1.5.22" + jackson_version = "2.9.9" + jackson_databind_version = "2.9.9" threepane_version = "2.6.4" - feign_version = "9.4.0" + feign_version = "9.7.0" feign_form_version = "2.1.0" junit_version = "4.12" oltu_version = "1.0.1" diff --git a/samples/client/petstore/java/feign/build.sbt b/samples/client/petstore/java/feign/build.sbt index 6ee8b06da1..f7b902d090 100644 --- a/samples/client/petstore/java/feign/build.sbt +++ b/samples/client/petstore/java/feign/build.sbt @@ -9,15 +9,15 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( - "io.swagger" % "swagger-annotations" % "1.5.21" % "compile", - "io.github.openfeign" % "feign-core" % "9.4.0" % "compile", - "io.github.openfeign" % "feign-jackson" % "9.4.0" % "compile", - "io.github.openfeign" % "feign-slf4j" % "9.4.0" % "compile", + "io.swagger" % "swagger-annotations" % "1.5.22" % "compile", + "io.github.openfeign" % "feign-core" % "9.7.0" % "compile", + "io.github.openfeign" % "feign-jackson" % "9.7.0" % "compile", + "io.github.openfeign" % "feign-slf4j" % "9.7.0" % "compile", "io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile", - "com.fasterxml.jackson.core" % "jackson-core" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.11.3" % "compile", - "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.8.7" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile", + "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "com.brsanthu" % "migbase64" % "2.2" % "compile", diff --git a/samples/client/petstore/java/feign/pom.xml b/samples/client/petstore/java/feign/pom.xml index f98d8ef3e3..d354a95b03 100644 --- a/samples/client/petstore/java/feign/pom.xml +++ b/samples/client/petstore/java/feign/pom.xml @@ -267,10 +267,10 @@ ${java.version} ${java.version} 1.5.21 - 9.4.0 + 9.7.0 2.1.0 - 2.8.11 - 2.8.11.3 + 2.9.9 + 2.9.9 2.6.4 4.12 1.0.0 diff --git a/samples/client/petstore/java/feign10x/.openapi-generator/VERSION b/samples/client/petstore/java/feign10x/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/java/feign10x/.openapi-generator/VERSION +++ b/samples/client/petstore/java/feign10x/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/feign10x/build.gradle b/samples/client/petstore/java/feign10x/build.gradle index 31a01da196..6eaeb4b872 100644 --- a/samples/client/petstore/java/feign10x/build.gradle +++ b/samples/client/petstore/java/feign10x/build.gradle @@ -95,11 +95,11 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.21" - jackson_version = "2.8.11" - jackson_databind_version = "2.8.11.3" + swagger_annotations_version = "1.5.22" + jackson_version = "2.9.9" + jackson_databind_version = "2.9.9" threepane_version = "2.6.4" - feign_version = "10.0.1" + feign_version = "10.2.3" feign_form_version = "2.1.0" junit_version = "4.12" oltu_version = "1.0.1" diff --git a/samples/client/petstore/java/feign10x/build.sbt b/samples/client/petstore/java/feign10x/build.sbt index b18b48128f..d7f942bda8 100644 --- a/samples/client/petstore/java/feign10x/build.sbt +++ b/samples/client/petstore/java/feign10x/build.sbt @@ -9,15 +9,15 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( - "io.swagger" % "swagger-annotations" % "1.5.21" % "compile", - "io.github.openfeign" % "feign-core" % "10.0.1" % "compile", - "io.github.openfeign" % "feign-jackson" % "10.0.1" % "compile", - "io.github.openfeign" % "feign-slf4j" % "10.0.1" % "compile", + "io.swagger" % "swagger-annotations" % "1.5.22" % "compile", + "io.github.openfeign" % "feign-core" % "10.2.3" % "compile", + "io.github.openfeign" % "feign-jackson" % "10.2.3" % "compile", + "io.github.openfeign" % "feign-slf4j" % "10.2.3" % "compile", "io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile", - "com.fasterxml.jackson.core" % "jackson-core" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.11.3" % "compile", - "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.8.7" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile", + "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "com.brsanthu" % "migbase64" % "2.2" % "compile", diff --git a/samples/client/petstore/java/feign10x/pom.xml b/samples/client/petstore/java/feign10x/pom.xml index 1bdd1c42e4..7f402f8e0e 100644 --- a/samples/client/petstore/java/feign10x/pom.xml +++ b/samples/client/petstore/java/feign10x/pom.xml @@ -267,10 +267,10 @@ ${java.version} ${java.version} 1.5.21 - 10.0.1 + 10.2.3 2.1.0 - 2.8.11 - 2.8.11.3 + 2.9.9 + 2.9.9 2.6.4 4.12 1.0.0 diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/auth/OAuth.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/auth/OAuth.java index 2aacac3bc8..71f838936b 100644 --- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/auth/OAuth.java +++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/auth/OAuth.java @@ -93,7 +93,7 @@ public class OAuth implements RequestInterceptor { try { accessTokenResponse = oauthClient.accessToken(tokenRequestBuilder.buildBodyMessage()); } catch (Exception e) { - throw new RetryableException(e.getMessage(), HttpMethod.POST, e, null); + throw new RetryableException(0, e.getMessage(), HttpMethod.POST, e, null); } if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) { setAccessToken(accessTokenResponse.getAccessToken(), accessTokenResponse.getExpiresIn()); diff --git a/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION b/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION +++ b/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/google-api-client/build.gradle b/samples/client/petstore/java/google-api-client/build.gradle index fd1210e52a..67e159bb94 100644 --- a/samples/client/petstore/java/google-api-client/build.gradle +++ b/samples/client/petstore/java/google-api-client/build.gradle @@ -95,9 +95,9 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.21" - jackson_version = "2.8.11" - jackson_databind_version = "2.8.11.3" + swagger_annotations_version = "1.5.22" + jackson_version = "2.9.9" + jackson_databind_version = "2.9.9" google_api_client_version = "1.23.0" jersey_common_version = "2.25.1" jodatime_version = "2.9.9" diff --git a/samples/client/petstore/java/google-api-client/build.sbt b/samples/client/petstore/java/google-api-client/build.sbt index 5f53d4b012..b4d7458b4b 100644 --- a/samples/client/petstore/java/google-api-client/build.sbt +++ b/samples/client/petstore/java/google-api-client/build.sbt @@ -9,12 +9,12 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( - "io.swagger" % "swagger-annotations" % "1.5.21", + "io.swagger" % "swagger-annotations" % "1.5.22", "com.google.api-client" % "google-api-client" % "1.23.0", "org.glassfish.jersey.core" % "jersey-common" % "2.25.1", - "com.fasterxml.jackson.core" % "jackson-core" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.11.3" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", "junit" % "junit" % "4.12" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" diff --git a/samples/client/petstore/java/google-api-client/pom.xml b/samples/client/petstore/java/google-api-client/pom.xml index 19efe9db44..a030fdb321 100644 --- a/samples/client/petstore/java/google-api-client/pom.xml +++ b/samples/client/petstore/java/google-api-client/pom.xml @@ -244,11 +244,11 @@ UTF-8 - 1.5.21 + 1.5.22 1.23.0 2.25.1 - 2.8.11 - 2.8.11.3 + 2.9.9 + 2.9.9 2.6.4 1.0.0 4.12 diff --git a/samples/client/petstore/java/jersey1/.openapi-generator/VERSION b/samples/client/petstore/java/jersey1/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/java/jersey1/.openapi-generator/VERSION +++ b/samples/client/petstore/java/jersey1/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/jersey1/build.gradle b/samples/client/petstore/java/jersey1/build.gradle index a1598a35d7..1fbe205a65 100644 --- a/samples/client/petstore/java/jersey1/build.gradle +++ b/samples/client/petstore/java/jersey1/build.gradle @@ -32,6 +32,7 @@ if(hasProperty('target') && target == 'android') { minSdkVersion 14 targetSdkVersion 25 } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7 @@ -110,7 +111,7 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.17" + swagger_annotations_version = "1.5.22" jackson_version = "2.6.4" jackson_databind_version = "2.6.4" jersey_version = "1.19.4" diff --git a/samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION +++ b/samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/jersey2-java6/build.sbt b/samples/client/petstore/java/jersey2-java6/build.sbt index 8668db88eb..aa99cf8042 100644 --- a/samples/client/petstore/java/jersey2-java6/build.sbt +++ b/samples/client/petstore/java/jersey2-java6/build.sbt @@ -9,13 +9,13 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( - "io.swagger" % "swagger-annotations" % "1.5.21", + "io.swagger" % "swagger-annotations" % "1.5.22", "org.glassfish.jersey.core" % "jersey-client" % "2.6", "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.6", "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.6", - "com.fasterxml.jackson.core" % "jackson-core" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.11.3" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", "com.brsanthu" % "migbase64" % "2.2", "org.apache.commons" % "commons-lang3" % "3.6", diff --git a/samples/client/petstore/java/jersey2-java6/pom.xml b/samples/client/petstore/java/jersey2-java6/pom.xml index afcb41b511..5c04d212a4 100644 --- a/samples/client/petstore/java/jersey2-java6/pom.xml +++ b/samples/client/petstore/java/jersey2-java6/pom.xml @@ -265,12 +265,12 @@ UTF-8 - 1.5.21 + 1.5.22 2.6 2.5 3.6 - 2.8.11 - 2.8.11.3 + 2.9.9 + 2.9.9 2.6.4 1.0.0 4.12 diff --git a/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION +++ b/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/jersey2-java8/build.gradle b/samples/client/petstore/java/jersey2-java8/build.gradle index a10797d4fe..68c0972904 100644 --- a/samples/client/petstore/java/jersey2-java8/build.gradle +++ b/samples/client/petstore/java/jersey2-java8/build.gradle @@ -94,9 +94,9 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.21" - jackson_version = "2.8.11" - jackson_databind_version = "2.8.11.3" + swagger_annotations_version = "1.5.22" + jackson_version = "2.9.9" + jackson_databind_version = "2.9.9" jersey_version = "2.27" junit_version = "4.12" } diff --git a/samples/client/petstore/java/jersey2-java8/build.sbt b/samples/client/petstore/java/jersey2-java8/build.sbt index 93a7c8c80d..84bd1b57eb 100644 --- a/samples/client/petstore/java/jersey2-java8/build.sbt +++ b/samples/client/petstore/java/jersey2-java8/build.sbt @@ -9,14 +9,14 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( - "io.swagger" % "swagger-annotations" % "1.5.21", + "io.swagger" % "swagger-annotations" % "1.5.22", "org.glassfish.jersey.core" % "jersey-client" % "2.25.1", "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.25.1", "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.25.1", - "com.fasterxml.jackson.core" % "jackson-core" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.11.3" % "compile", - "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.8.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile", + "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.9" % "compile", "junit" % "junit" % "4.12" % "test", "com.novocode" % "junit-interface" % "0.10" % "test" ) diff --git a/samples/client/petstore/java/jersey2-java8/pom.xml b/samples/client/petstore/java/jersey2-java8/pom.xml index 7df5c7fb33..5accccfced 100644 --- a/samples/client/petstore/java/jersey2-java8/pom.xml +++ b/samples/client/petstore/java/jersey2-java8/pom.xml @@ -249,10 +249,10 @@ UTF-8 - 1.5.21 + 1.5.22 2.27 - 2.8.11 - 2.8.11.3 + 2.9.9 + 2.9.9 1.0.0 4.12 diff --git a/samples/client/petstore/java/jersey2/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/java/jersey2/.openapi-generator/VERSION +++ b/samples/client/petstore/java/jersey2/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/jersey2/build.gradle b/samples/client/petstore/java/jersey2/build.gradle index 74357f2c07..fb535b4e08 100644 --- a/samples/client/petstore/java/jersey2/build.gradle +++ b/samples/client/petstore/java/jersey2/build.gradle @@ -94,9 +94,9 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.21" - jackson_version = "2.8.11" - jackson_databind_version = "2.8.11.3" + swagger_annotations_version = "1.5.22" + jackson_version = "2.9.9" + jackson_databind_version = "2.9.9" jersey_version = "2.27" junit_version = "4.12" threetenbp_version = "2.6.4" diff --git a/samples/client/petstore/java/jersey2/build.sbt b/samples/client/petstore/java/jersey2/build.sbt index fb8403a211..a5f01ab6f0 100644 --- a/samples/client/petstore/java/jersey2/build.sbt +++ b/samples/client/petstore/java/jersey2/build.sbt @@ -9,13 +9,13 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( - "io.swagger" % "swagger-annotations" % "1.5.21", + "io.swagger" % "swagger-annotations" % "1.5.22", "org.glassfish.jersey.core" % "jersey-client" % "2.25.1", "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.25.1", "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.25.1", - "com.fasterxml.jackson.core" % "jackson-core" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.11.3" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", "com.brsanthu" % "migbase64" % "2.2", "junit" % "junit" % "4.12" % "test", diff --git a/samples/client/petstore/java/jersey2/pom.xml b/samples/client/petstore/java/jersey2/pom.xml index c76acd4c43..bb1a916c1e 100644 --- a/samples/client/petstore/java/jersey2/pom.xml +++ b/samples/client/petstore/java/jersey2/pom.xml @@ -255,10 +255,10 @@ UTF-8 - 1.5.21 + 1.5.22 2.27 - 2.8.11 - 2.8.11.3 + 2.9.9 + 2.9.9 2.6.4 1.0.0 4.12 diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AnotherFakeApi.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AnotherFakeApi.md index 4a8546e0c1..0565c2589b 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AnotherFakeApi.md +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AnotherFakeApi.md @@ -18,18 +18,30 @@ To test special tags and operation ID starting with number ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.AnotherFakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.AnotherFakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -AnotherFakeApi apiInstance = new AnotherFakeApi(); -Client body = new Client(); // Client | client model -try { - Client result = apiInstance.call123testSpecialTags(body); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags"); - e.printStackTrace(); + AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient); + Client body = new Client(); // Client | client model + try { + Client result = apiInstance.call123testSpecialTags(body); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -52,3 +64,8 @@ No authorization required - **Content-Type**: application/json - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeApi.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeApi.md index 6c99239a23..6b06529329 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeApi.md +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeApi.md @@ -30,17 +30,29 @@ this route creates an XmlItem ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -XmlItem xmlItem = new XmlItem(); // XmlItem | XmlItem Body -try { - apiInstance.createXmlItem(xmlItem); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#createXmlItem"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + XmlItem xmlItem = new XmlItem(); // XmlItem | XmlItem Body + try { + apiInstance.createXmlItem(xmlItem); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#createXmlItem"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -63,6 +75,11 @@ No authorization required - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16 - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + # **fakeOuterBooleanSerialize** > Boolean fakeOuterBooleanSerialize(body) @@ -74,18 +91,30 @@ Test serialization of outer boolean types ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -Boolean body = true; // Boolean | Input boolean as post body -try { - Boolean result = apiInstance.fakeOuterBooleanSerialize(body); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#fakeOuterBooleanSerialize"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + Boolean body = true; // Boolean | Input boolean as post body + try { + Boolean result = apiInstance.fakeOuterBooleanSerialize(body); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#fakeOuterBooleanSerialize"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -108,6 +137,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output boolean | - | + # **fakeOuterCompositeSerialize** > OuterComposite fakeOuterCompositeSerialize(body) @@ -119,18 +153,30 @@ Test serialization of object with outer number type ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -OuterComposite body = new OuterComposite(); // OuterComposite | Input composite as post body -try { - OuterComposite result = apiInstance.fakeOuterCompositeSerialize(body); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#fakeOuterCompositeSerialize"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + OuterComposite body = new OuterComposite(); // OuterComposite | Input composite as post body + try { + OuterComposite result = apiInstance.fakeOuterCompositeSerialize(body); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#fakeOuterCompositeSerialize"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -153,6 +199,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output composite | - | + # **fakeOuterNumberSerialize** > BigDecimal fakeOuterNumberSerialize(body) @@ -164,18 +215,30 @@ Test serialization of outer number types ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -BigDecimal body = new BigDecimal(); // BigDecimal | Input number as post body -try { - BigDecimal result = apiInstance.fakeOuterNumberSerialize(body); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#fakeOuterNumberSerialize"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + BigDecimal body = new BigDecimal(); // BigDecimal | Input number as post body + try { + BigDecimal result = apiInstance.fakeOuterNumberSerialize(body); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#fakeOuterNumberSerialize"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -198,6 +261,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output number | - | + # **fakeOuterStringSerialize** > String fakeOuterStringSerialize(body) @@ -209,18 +277,30 @@ Test serialization of outer string types ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -String body = "body_example"; // String | Input string as post body -try { - String result = apiInstance.fakeOuterStringSerialize(body); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#fakeOuterStringSerialize"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + String body = "body_example"; // String | Input string as post body + try { + String result = apiInstance.fakeOuterStringSerialize(body); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#fakeOuterStringSerialize"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -243,6 +323,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output string | - | + # **testBodyWithFileSchema** > testBodyWithFileSchema(body) @@ -254,17 +339,29 @@ For this test, the body for this request much reference a schema named `Fil ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -FileSchemaTestClass body = new FileSchemaTestClass(); // FileSchemaTestClass | -try { - apiInstance.testBodyWithFileSchema(body); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#testBodyWithFileSchema"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + FileSchemaTestClass body = new FileSchemaTestClass(); // FileSchemaTestClass | + try { + apiInstance.testBodyWithFileSchema(body); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#testBodyWithFileSchema"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -287,6 +384,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Success | - | + # **testBodyWithQueryParams** > testBodyWithQueryParams(query, body) @@ -296,18 +398,30 @@ No authorization required ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -String query = "query_example"; // String | -User body = new User(); // User | -try { - apiInstance.testBodyWithQueryParams(query, body); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#testBodyWithQueryParams"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + String query = "query_example"; // String | + User body = new User(); // User | + try { + apiInstance.testBodyWithQueryParams(query, body); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#testBodyWithQueryParams"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -331,6 +445,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Success | - | + # **testClientModel** > Client testClientModel(body) @@ -342,18 +461,30 @@ To test \"client\" model ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -Client body = new Client(); // Client | client model -try { - Client result = apiInstance.testClientModel(body); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#testClientModel"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + Client body = new Client(); // Client | client model + try { + Client result = apiInstance.testClientModel(body); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#testClientModel"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -376,6 +507,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + # **testEndpointParameters** > testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) @@ -387,39 +523,48 @@ Fake endpoint for testing various parameters 假端點 偽のエンドポイン ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure HTTP basic authorization: http_basic_test + HttpBasicAuth http_basic_test = (HttpBasicAuth) defaultClient.getAuthentication("http_basic_test"); + http_basic_test.setUsername("YOUR USERNAME"); + http_basic_test.setPassword("YOUR PASSWORD"); -// Configure HTTP basic authorization: http_basic_test -HttpBasicAuth http_basic_test = (HttpBasicAuth) defaultClient.getAuthentication("http_basic_test"); -http_basic_test.setUsername("YOUR USERNAME"); -http_basic_test.setPassword("YOUR PASSWORD"); - -FakeApi apiInstance = new FakeApi(); -BigDecimal number = new BigDecimal(); // BigDecimal | None -Double _double = 3.4D; // Double | None -String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None -byte[] _byte = null; // byte[] | None -Integer integer = 56; // Integer | None -Integer int32 = 56; // Integer | None -Long int64 = 56L; // Long | None -Float _float = 3.4F; // Float | None -String string = "string_example"; // String | None -File binary = new File("/path/to/file"); // File | None -LocalDate date = new LocalDate(); // LocalDate | None -OffsetDateTime dateTime = new OffsetDateTime(); // OffsetDateTime | None -String password = "password_example"; // String | None -String paramCallback = "paramCallback_example"; // String | None -try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#testEndpointParameters"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + BigDecimal number = new BigDecimal(); // BigDecimal | None + Double _double = 3.4D; // Double | None + String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None + byte[] _byte = null; // byte[] | None + Integer integer = 56; // Integer | None + Integer int32 = 56; // Integer | None + Long int64 = 56L; // Long | None + Float _float = 3.4F; // Float | None + String string = "string_example"; // String | None + File binary = new File("/path/to/file"); // File | None + LocalDate date = new LocalDate(); // LocalDate | None + OffsetDateTime dateTime = new OffsetDateTime(); // OffsetDateTime | None + String password = "password_example"; // String | None + String paramCallback = "paramCallback_example"; // String | None + try { + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#testEndpointParameters"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -455,6 +600,12 @@ null (empty response body) - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid username supplied | - | +**404** | User not found | - | + # **testEnumParameters** > testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString) @@ -466,24 +617,36 @@ To test enum parameters ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -List enumHeaderStringArray = Arrays.asList("$"); // List | Header parameter enum test (string array) -String enumHeaderString = "-efg"; // String | Header parameter enum test (string) -List enumQueryStringArray = Arrays.asList("$"); // List | Query parameter enum test (string array) -String enumQueryString = "-efg"; // String | Query parameter enum test (string) -Integer enumQueryInteger = 56; // Integer | Query parameter enum test (double) -Double enumQueryDouble = 3.4D; // Double | Query parameter enum test (double) -List enumFormStringArray = "$"; // List | Form parameter enum test (string array) -String enumFormString = "-efg"; // String | Form parameter enum test (string) -try { - apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#testEnumParameters"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + List enumHeaderStringArray = Arrays.asList("$"); // List | Header parameter enum test (string array) + String enumHeaderString = "-efg"; // String | Header parameter enum test (string) + List enumQueryStringArray = Arrays.asList("$"); // List | Query parameter enum test (string array) + String enumQueryString = "-efg"; // String | Query parameter enum test (string) + Integer enumQueryInteger = 56; // Integer | Query parameter enum test (double) + Double enumQueryDouble = 3.4D; // Double | Query parameter enum test (double) + List enumFormStringArray = "$"; // List | Form parameter enum test (string array) + String enumFormString = "-efg"; // String | Form parameter enum test (string) + try { + apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#testEnumParameters"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -513,6 +676,12 @@ No authorization required - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid request | - | +**404** | Not found | - | + # **testGroupParameters** > testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group).stringGroup(stringGroup).booleanGroup(booleanGroup).int64Group(int64Group).execute(); @@ -524,26 +693,38 @@ Fake endpoint to test group parameters (optional) ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -Integer requiredStringGroup = 56; // Integer | Required String in group parameters -Boolean requiredBooleanGroup = true; // Boolean | Required Boolean in group parameters -Long requiredInt64Group = 56L; // Long | Required Integer in group parameters -Integer stringGroup = 56; // Integer | String in group parameters -Boolean booleanGroup = true; // Boolean | Boolean in group parameters -Long int64Group = 56L; // Long | Integer in group parameters -try { - apiInstance.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group) + FakeApi apiInstance = new FakeApi(defaultClient); + Integer requiredStringGroup = 56; // Integer | Required String in group parameters + Boolean requiredBooleanGroup = true; // Boolean | Required Boolean in group parameters + Long requiredInt64Group = 56L; // Long | Required Integer in group parameters + Integer stringGroup = 56; // Integer | String in group parameters + Boolean booleanGroup = true; // Boolean | Boolean in group parameters + Long int64Group = 56L; // Long | Integer in group parameters + try { + apiInstance.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group) .stringGroup(stringGroup) .booleanGroup(booleanGroup) .int64Group(int64Group) .execute(); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#testGroupParameters"); - e.printStackTrace(); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#testGroupParameters"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -571,6 +752,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Someting wrong | - | + # **testInlineAdditionalProperties** > testInlineAdditionalProperties(param) @@ -580,17 +766,29 @@ test inline additionalProperties ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -Map param = new HashMap(); // Map | request body -try { - apiInstance.testInlineAdditionalProperties(param); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#testInlineAdditionalProperties"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + Map param = new HashMap(); // Map | request body + try { + apiInstance.testInlineAdditionalProperties(param); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#testInlineAdditionalProperties"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -613,6 +811,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + # **testJsonFormData** > testJsonFormData(param, param2) @@ -622,18 +825,30 @@ test json serialization of form data ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -String param = "param_example"; // String | field1 -String param2 = "param2_example"; // String | field2 -try { - apiInstance.testJsonFormData(param, param2); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#testJsonFormData"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + String param = "param_example"; // String | field1 + String param2 = "param2_example"; // String | field2 + try { + apiInstance.testJsonFormData(param, param2); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#testJsonFormData"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -657,3 +872,8 @@ No authorization required - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeClassnameTags123Api.md index 873b749362..bd934e3607 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeClassnameTags123Api.md +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeClassnameTags123Api.md @@ -18,28 +18,37 @@ To test class name in snake case ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.FakeClassnameTags123Api; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeClassnameTags123Api; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure API key authorization: api_key_query + ApiKeyAuth api_key_query = (ApiKeyAuth) defaultClient.getAuthentication("api_key_query"); + api_key_query.setApiKey("YOUR API KEY"); + // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null) + //api_key_query.setApiKeyPrefix("Token"); -// Configure API key authorization: api_key_query -ApiKeyAuth api_key_query = (ApiKeyAuth) defaultClient.getAuthentication("api_key_query"); -api_key_query.setApiKey("YOUR API KEY"); -// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null) -//api_key_query.setApiKeyPrefix("Token"); - -FakeClassnameTags123Api apiInstance = new FakeClassnameTags123Api(); -Client body = new Client(); // Client | client model -try { - Client result = apiInstance.testClassname(body); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling FakeClassnameTags123Api#testClassname"); - e.printStackTrace(); + FakeClassnameTags123Api apiInstance = new FakeClassnameTags123Api(defaultClient); + Client body = new Client(); // Client | client model + try { + Client result = apiInstance.testClassname(body); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling FakeClassnameTags123Api#testClassname"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -62,3 +71,8 @@ Name | Type | Description | Notes - **Content-Type**: application/json - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/PetApi.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/PetApi.md index fa157be701..ca6658ce09 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/PetApi.md +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/PetApi.md @@ -24,25 +24,34 @@ Add a new pet to the store ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.PetApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.PetApi; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure OAuth2 access token for authorization: petstore_auth + OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); + petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); -// Configure OAuth2 access token for authorization: petstore_auth -OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); -petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); - -PetApi apiInstance = new PetApi(); -Pet body = new Pet(); // Pet | Pet object that needs to be added to the store -try { - apiInstance.addPet(body); -} catch (ApiException e) { - System.err.println("Exception when calling PetApi#addPet"); - e.printStackTrace(); + PetApi apiInstance = new PetApi(defaultClient); + Pet body = new Pet(); // Pet | Pet object that needs to be added to the store + try { + apiInstance.addPet(body); + } catch (ApiException e) { + System.err.println("Exception when calling PetApi#addPet"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -65,6 +74,12 @@ null (empty response body) - **Content-Type**: application/json, application/xml - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**405** | Invalid input | - | + # **deletePet** > deletePet(petId, apiKey) @@ -74,26 +89,35 @@ Deletes a pet ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.PetApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.PetApi; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure OAuth2 access token for authorization: petstore_auth + OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); + petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); -// Configure OAuth2 access token for authorization: petstore_auth -OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); -petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); - -PetApi apiInstance = new PetApi(); -Long petId = 56L; // Long | Pet id to delete -String apiKey = "apiKey_example"; // String | -try { - apiInstance.deletePet(petId, apiKey); -} catch (ApiException e) { - System.err.println("Exception when calling PetApi#deletePet"); - e.printStackTrace(); + PetApi apiInstance = new PetApi(defaultClient); + Long petId = 56L; // Long | Pet id to delete + String apiKey = "apiKey_example"; // String | + try { + apiInstance.deletePet(petId, apiKey); + } catch (ApiException e) { + System.err.println("Exception when calling PetApi#deletePet"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -117,6 +141,12 @@ null (empty response body) - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid pet value | - | + # **findPetsByStatus** > List<Pet> findPetsByStatus(status) @@ -128,26 +158,35 @@ Multiple status values can be provided with comma separated strings ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.PetApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.PetApi; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure OAuth2 access token for authorization: petstore_auth + OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); + petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); -// Configure OAuth2 access token for authorization: petstore_auth -OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); -petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); - -PetApi apiInstance = new PetApi(); -List status = Arrays.asList("available"); // List | Status values that need to be considered for filter -try { - List result = apiInstance.findPetsByStatus(status); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling PetApi#findPetsByStatus"); - e.printStackTrace(); + PetApi apiInstance = new PetApi(defaultClient); + List status = Arrays.asList("available"); // List | Status values that need to be considered for filter + try { + List result = apiInstance.findPetsByStatus(status); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling PetApi#findPetsByStatus"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -170,6 +209,12 @@ Name | Type | Description | Notes - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid status value | - | + # **findPetsByTags** > List<Pet> findPetsByTags(tags) @@ -181,26 +226,35 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.PetApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.PetApi; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure OAuth2 access token for authorization: petstore_auth + OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); + petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); -// Configure OAuth2 access token for authorization: petstore_auth -OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); -petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); - -PetApi apiInstance = new PetApi(); -List tags = Arrays.asList(); // List | Tags to filter by -try { - List result = apiInstance.findPetsByTags(tags); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling PetApi#findPetsByTags"); - e.printStackTrace(); + PetApi apiInstance = new PetApi(defaultClient); + List tags = Arrays.asList(); // List | Tags to filter by + try { + List result = apiInstance.findPetsByTags(tags); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling PetApi#findPetsByTags"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -223,6 +277,12 @@ Name | Type | Description | Notes - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid tag value | - | + # **getPetById** > Pet getPetById(petId) @@ -234,28 +294,37 @@ Returns a single pet ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.PetApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.PetApi; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure API key authorization: api_key + ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key"); + api_key.setApiKey("YOUR API KEY"); + // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null) + //api_key.setApiKeyPrefix("Token"); -// Configure API key authorization: api_key -ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key"); -api_key.setApiKey("YOUR API KEY"); -// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null) -//api_key.setApiKeyPrefix("Token"); - -PetApi apiInstance = new PetApi(); -Long petId = 56L; // Long | ID of pet to return -try { - Pet result = apiInstance.getPetById(petId); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling PetApi#getPetById"); - e.printStackTrace(); + PetApi apiInstance = new PetApi(defaultClient); + Long petId = 56L; // Long | ID of pet to return + try { + Pet result = apiInstance.getPetById(petId); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling PetApi#getPetById"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -278,6 +347,13 @@ Name | Type | Description | Notes - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid ID supplied | - | +**404** | Pet not found | - | + # **updatePet** > updatePet(body) @@ -287,25 +363,34 @@ Update an existing pet ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.PetApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.PetApi; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure OAuth2 access token for authorization: petstore_auth + OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); + petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); -// Configure OAuth2 access token for authorization: petstore_auth -OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); -petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); - -PetApi apiInstance = new PetApi(); -Pet body = new Pet(); // Pet | Pet object that needs to be added to the store -try { - apiInstance.updatePet(body); -} catch (ApiException e) { - System.err.println("Exception when calling PetApi#updatePet"); - e.printStackTrace(); + PetApi apiInstance = new PetApi(defaultClient); + Pet body = new Pet(); // Pet | Pet object that needs to be added to the store + try { + apiInstance.updatePet(body); + } catch (ApiException e) { + System.err.println("Exception when calling PetApi#updatePet"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -328,6 +413,14 @@ null (empty response body) - **Content-Type**: application/json, application/xml - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid ID supplied | - | +**404** | Pet not found | - | +**405** | Validation exception | - | + # **updatePetWithForm** > updatePetWithForm(petId, name, status) @@ -337,27 +430,36 @@ Updates a pet in the store with form data ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.PetApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.PetApi; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure OAuth2 access token for authorization: petstore_auth + OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); + petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); -// Configure OAuth2 access token for authorization: petstore_auth -OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); -petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); - -PetApi apiInstance = new PetApi(); -Long petId = 56L; // Long | ID of pet that needs to be updated -String name = "name_example"; // String | Updated name of the pet -String status = "status_example"; // String | Updated status of the pet -try { - apiInstance.updatePetWithForm(petId, name, status); -} catch (ApiException e) { - System.err.println("Exception when calling PetApi#updatePetWithForm"); - e.printStackTrace(); + PetApi apiInstance = new PetApi(defaultClient); + Long petId = 56L; // Long | ID of pet that needs to be updated + String name = "name_example"; // String | Updated name of the pet + String status = "status_example"; // String | Updated status of the pet + try { + apiInstance.updatePetWithForm(petId, name, status); + } catch (ApiException e) { + System.err.println("Exception when calling PetApi#updatePetWithForm"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -382,6 +484,11 @@ null (empty response body) - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**405** | Invalid input | - | + # **uploadFile** > ModelApiResponse uploadFile(petId, additionalMetadata, file) @@ -391,28 +498,37 @@ uploads an image ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.PetApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.PetApi; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure OAuth2 access token for authorization: petstore_auth + OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); + petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); -// Configure OAuth2 access token for authorization: petstore_auth -OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); -petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); - -PetApi apiInstance = new PetApi(); -Long petId = 56L; // Long | ID of pet to update -String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server -File file = new File("/path/to/file"); // File | file to upload -try { - ModelApiResponse result = apiInstance.uploadFile(petId, additionalMetadata, file); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling PetApi#uploadFile"); - e.printStackTrace(); + PetApi apiInstance = new PetApi(defaultClient); + Long petId = 56L; // Long | ID of pet to update + String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server + File file = new File("/path/to/file"); // File | file to upload + try { + ModelApiResponse result = apiInstance.uploadFile(petId, additionalMetadata, file); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling PetApi#uploadFile"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -437,6 +553,11 @@ Name | Type | Description | Notes - **Content-Type**: multipart/form-data - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + # **uploadFileWithRequiredFile** > ModelApiResponse uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata) @@ -446,28 +567,37 @@ uploads an image (required) ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.PetApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.PetApi; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure OAuth2 access token for authorization: petstore_auth + OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); + petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); -// Configure OAuth2 access token for authorization: petstore_auth -OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); -petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); - -PetApi apiInstance = new PetApi(); -Long petId = 56L; // Long | ID of pet to update -File requiredFile = new File("/path/to/file"); // File | file to upload -String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server -try { - ModelApiResponse result = apiInstance.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling PetApi#uploadFileWithRequiredFile"); - e.printStackTrace(); + PetApi apiInstance = new PetApi(defaultClient); + Long petId = 56L; // Long | ID of pet to update + File requiredFile = new File("/path/to/file"); // File | file to upload + String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server + try { + ModelApiResponse result = apiInstance.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling PetApi#uploadFileWithRequiredFile"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -492,3 +622,8 @@ Name | Type | Description | Notes - **Content-Type**: multipart/form-data - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/StoreApi.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/StoreApi.md index 30d782f82d..a86b478e55 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/StoreApi.md +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/StoreApi.md @@ -21,17 +21,29 @@ For valid response try integer IDs with value < 1000. Anything above 1000 or ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.StoreApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.StoreApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -StoreApi apiInstance = new StoreApi(); -String orderId = "orderId_example"; // String | ID of the order that needs to be deleted -try { - apiInstance.deleteOrder(orderId); -} catch (ApiException e) { - System.err.println("Exception when calling StoreApi#deleteOrder"); - e.printStackTrace(); + StoreApi apiInstance = new StoreApi(defaultClient); + String orderId = "orderId_example"; // String | ID of the order that needs to be deleted + try { + apiInstance.deleteOrder(orderId); + } catch (ApiException e) { + System.err.println("Exception when calling StoreApi#deleteOrder"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -54,6 +66,12 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid ID supplied | - | +**404** | Order not found | - | + # **getInventory** > Map<String, Integer> getInventory() @@ -65,27 +83,36 @@ Returns a map of status codes to quantities ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.StoreApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.StoreApi; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure API key authorization: api_key + ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key"); + api_key.setApiKey("YOUR API KEY"); + // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null) + //api_key.setApiKeyPrefix("Token"); -// Configure API key authorization: api_key -ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key"); -api_key.setApiKey("YOUR API KEY"); -// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null) -//api_key.setApiKeyPrefix("Token"); - -StoreApi apiInstance = new StoreApi(); -try { - Map result = apiInstance.getInventory(); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling StoreApi#getInventory"); - e.printStackTrace(); + StoreApi apiInstance = new StoreApi(defaultClient); + try { + Map result = apiInstance.getInventory(); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling StoreApi#getInventory"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -105,6 +132,11 @@ This endpoint does not need any parameter. - **Content-Type**: Not defined - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + # **getOrderById** > Order getOrderById(orderId) @@ -116,18 +148,30 @@ For valid response try integer IDs with value <= 5 or > 10. Other val ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.StoreApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.StoreApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -StoreApi apiInstance = new StoreApi(); -Long orderId = 56L; // Long | ID of pet that needs to be fetched -try { - Order result = apiInstance.getOrderById(orderId); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling StoreApi#getOrderById"); - e.printStackTrace(); + StoreApi apiInstance = new StoreApi(defaultClient); + Long orderId = 56L; // Long | ID of pet that needs to be fetched + try { + Order result = apiInstance.getOrderById(orderId); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling StoreApi#getOrderById"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -150,6 +194,13 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid ID supplied | - | +**404** | Order not found | - | + # **placeOrder** > Order placeOrder(body) @@ -159,18 +210,30 @@ Place an order for a pet ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.StoreApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.StoreApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -StoreApi apiInstance = new StoreApi(); -Order body = new Order(); // Order | order placed for purchasing the pet -try { - Order result = apiInstance.placeOrder(body); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling StoreApi#placeOrder"); - e.printStackTrace(); + StoreApi apiInstance = new StoreApi(defaultClient); + Order body = new Order(); // Order | order placed for purchasing the pet + try { + Order result = apiInstance.placeOrder(body); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling StoreApi#placeOrder"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -193,3 +256,9 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid Order | - | + diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/UserApi.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/UserApi.md index 5969abd518..ca29da916a 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/UserApi.md +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/UserApi.md @@ -25,17 +25,29 @@ This can only be done by the logged in user. ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.UserApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.UserApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -UserApi apiInstance = new UserApi(); -User body = new User(); // User | Created user object -try { - apiInstance.createUser(body); -} catch (ApiException e) { - System.err.println("Exception when calling UserApi#createUser"); - e.printStackTrace(); + UserApi apiInstance = new UserApi(defaultClient); + User body = new User(); // User | Created user object + try { + apiInstance.createUser(body); + } catch (ApiException e) { + System.err.println("Exception when calling UserApi#createUser"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -58,6 +70,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + # **createUsersWithArrayInput** > createUsersWithArrayInput(body) @@ -67,17 +84,29 @@ Creates list of users with given input array ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.UserApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.UserApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -UserApi apiInstance = new UserApi(); -List body = Arrays.asList(null); // List | List of user object -try { - apiInstance.createUsersWithArrayInput(body); -} catch (ApiException e) { - System.err.println("Exception when calling UserApi#createUsersWithArrayInput"); - e.printStackTrace(); + UserApi apiInstance = new UserApi(defaultClient); + List body = Arrays.asList(null); // List | List of user object + try { + apiInstance.createUsersWithArrayInput(body); + } catch (ApiException e) { + System.err.println("Exception when calling UserApi#createUsersWithArrayInput"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -100,6 +129,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + # **createUsersWithListInput** > createUsersWithListInput(body) @@ -109,17 +143,29 @@ Creates list of users with given input array ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.UserApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.UserApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -UserApi apiInstance = new UserApi(); -List body = Arrays.asList(null); // List | List of user object -try { - apiInstance.createUsersWithListInput(body); -} catch (ApiException e) { - System.err.println("Exception when calling UserApi#createUsersWithListInput"); - e.printStackTrace(); + UserApi apiInstance = new UserApi(defaultClient); + List body = Arrays.asList(null); // List | List of user object + try { + apiInstance.createUsersWithListInput(body); + } catch (ApiException e) { + System.err.println("Exception when calling UserApi#createUsersWithListInput"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -142,6 +188,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + # **deleteUser** > deleteUser(username) @@ -153,17 +204,29 @@ This can only be done by the logged in user. ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.UserApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.UserApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -UserApi apiInstance = new UserApi(); -String username = "username_example"; // String | The name that needs to be deleted -try { - apiInstance.deleteUser(username); -} catch (ApiException e) { - System.err.println("Exception when calling UserApi#deleteUser"); - e.printStackTrace(); + UserApi apiInstance = new UserApi(defaultClient); + String username = "username_example"; // String | The name that needs to be deleted + try { + apiInstance.deleteUser(username); + } catch (ApiException e) { + System.err.println("Exception when calling UserApi#deleteUser"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -186,6 +249,12 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid username supplied | - | +**404** | User not found | - | + # **getUserByName** > User getUserByName(username) @@ -195,18 +264,30 @@ Get user by user name ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.UserApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.UserApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -UserApi apiInstance = new UserApi(); -String username = "username_example"; // String | The name that needs to be fetched. Use user1 for testing. -try { - User result = apiInstance.getUserByName(username); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling UserApi#getUserByName"); - e.printStackTrace(); + UserApi apiInstance = new UserApi(defaultClient); + String username = "username_example"; // String | The name that needs to be fetched. Use user1 for testing. + try { + User result = apiInstance.getUserByName(username); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling UserApi#getUserByName"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -229,6 +310,13 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid username supplied | - | +**404** | User not found | - | + # **loginUser** > String loginUser(username, password) @@ -238,19 +326,31 @@ Logs user into the system ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.UserApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.UserApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -UserApi apiInstance = new UserApi(); -String username = "username_example"; // String | The user name for login -String password = "password_example"; // String | The password for login in clear text -try { - String result = apiInstance.loginUser(username, password); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling UserApi#loginUser"); - e.printStackTrace(); + UserApi apiInstance = new UserApi(defaultClient); + String username = "username_example"; // String | The user name for login + String password = "password_example"; // String | The password for login in clear text + try { + String result = apiInstance.loginUser(username, password); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling UserApi#loginUser"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -274,6 +374,12 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | * X-Rate-Limit - calls per hour allowed by the user
* X-Expires-After - date in UTC when token expires
| +**400** | Invalid username/password supplied | - | + # **logoutUser** > logoutUser() @@ -283,16 +389,28 @@ Logs out current logged in user session ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.UserApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.UserApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -UserApi apiInstance = new UserApi(); -try { - apiInstance.logoutUser(); -} catch (ApiException e) { - System.err.println("Exception when calling UserApi#logoutUser"); - e.printStackTrace(); + UserApi apiInstance = new UserApi(defaultClient); + try { + apiInstance.logoutUser(); + } catch (ApiException e) { + System.err.println("Exception when calling UserApi#logoutUser"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -312,6 +430,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + # **updateUser** > updateUser(username, body) @@ -323,18 +446,30 @@ This can only be done by the logged in user. ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.UserApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.UserApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -UserApi apiInstance = new UserApi(); -String username = "username_example"; // String | name that need to be deleted -User body = new User(); // User | Updated user object -try { - apiInstance.updateUser(username, body); -} catch (ApiException e) { - System.err.println("Exception when calling UserApi#updateUser"); - e.printStackTrace(); + UserApi apiInstance = new UserApi(defaultClient); + String username = "username_example"; // String | name that need to be deleted + User body = new User(); // User | Updated user object + try { + apiInstance.updateUser(username, body); + } catch (ApiException e) { + System.err.println("Exception when calling UserApi#updateUser"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -358,3 +493,9 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid user supplied | - | +**404** | User not found | - | + diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml index 34f8ef7bf4..0353247b02 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml @@ -142,6 +142,15 @@ jar + + + + http.response.details + a + Http Response Details: + + + diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index df8a2099b9..c9978a6f86 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -60,6 +60,11 @@ public class AnotherFakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call call123testSpecialTagsCall(Client body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -109,6 +114,11 @@ public class AnotherFakeApi { * @param body client model (required) * @return Client * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public Client call123testSpecialTags(Client body) throws ApiException { ApiResponse localVarResp = call123testSpecialTagsWithHttpInfo(body); @@ -121,6 +131,11 @@ public class AnotherFakeApi { * @param body client model (required) * @return ApiResponse<Client> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public ApiResponse call123testSpecialTagsWithHttpInfo(Client body) throws ApiException { okhttp3.Call localVarCall = call123testSpecialTagsValidateBeforeCall(body, null); @@ -135,6 +150,11 @@ public class AnotherFakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call call123testSpecialTagsAsync(Client body, final ApiCallback _callback) throws ApiException { diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java index b5eb5fc1ac..44c7a97ffc 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java @@ -68,6 +68,11 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call createXmlItemCall(XmlItem xmlItem, final ApiCallback _callback) throws ApiException { Object localVarPostBody = xmlItem; @@ -116,6 +121,11 @@ public class FakeApi { * this route creates an XmlItem * @param xmlItem XmlItem Body (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public void createXmlItem(XmlItem xmlItem) throws ApiException { createXmlItemWithHttpInfo(xmlItem); @@ -127,6 +137,11 @@ public class FakeApi { * @param xmlItem XmlItem Body (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public ApiResponse createXmlItemWithHttpInfo(XmlItem xmlItem) throws ApiException { okhttp3.Call localVarCall = createXmlItemValidateBeforeCall(xmlItem, null); @@ -140,6 +155,11 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call createXmlItemAsync(XmlItem xmlItem, final ApiCallback _callback) throws ApiException { @@ -153,6 +173,11 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Output boolean -
*/ public okhttp3.Call fakeOuterBooleanSerializeCall(Boolean body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -197,6 +222,11 @@ public class FakeApi { * @param body Input boolean as post body (optional) * @return Boolean * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Output boolean -
*/ public Boolean fakeOuterBooleanSerialize(Boolean body) throws ApiException { ApiResponse localVarResp = fakeOuterBooleanSerializeWithHttpInfo(body); @@ -209,6 +239,11 @@ public class FakeApi { * @param body Input boolean as post body (optional) * @return ApiResponse<Boolean> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Output boolean -
*/ public ApiResponse fakeOuterBooleanSerializeWithHttpInfo(Boolean body) throws ApiException { okhttp3.Call localVarCall = fakeOuterBooleanSerializeValidateBeforeCall(body, null); @@ -223,6 +258,11 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Output boolean -
*/ public okhttp3.Call fakeOuterBooleanSerializeAsync(Boolean body, final ApiCallback _callback) throws ApiException { @@ -237,6 +277,11 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Output composite -
*/ public okhttp3.Call fakeOuterCompositeSerializeCall(OuterComposite body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -281,6 +326,11 @@ public class FakeApi { * @param body Input composite as post body (optional) * @return OuterComposite * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Output composite -
*/ public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws ApiException { ApiResponse localVarResp = fakeOuterCompositeSerializeWithHttpInfo(body); @@ -293,6 +343,11 @@ public class FakeApi { * @param body Input composite as post body (optional) * @return ApiResponse<OuterComposite> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Output composite -
*/ public ApiResponse fakeOuterCompositeSerializeWithHttpInfo(OuterComposite body) throws ApiException { okhttp3.Call localVarCall = fakeOuterCompositeSerializeValidateBeforeCall(body, null); @@ -307,6 +362,11 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Output composite -
*/ public okhttp3.Call fakeOuterCompositeSerializeAsync(OuterComposite body, final ApiCallback _callback) throws ApiException { @@ -321,6 +381,11 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Output number -
*/ public okhttp3.Call fakeOuterNumberSerializeCall(BigDecimal body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -365,6 +430,11 @@ public class FakeApi { * @param body Input number as post body (optional) * @return BigDecimal * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Output number -
*/ public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws ApiException { ApiResponse localVarResp = fakeOuterNumberSerializeWithHttpInfo(body); @@ -377,6 +447,11 @@ public class FakeApi { * @param body Input number as post body (optional) * @return ApiResponse<BigDecimal> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Output number -
*/ public ApiResponse fakeOuterNumberSerializeWithHttpInfo(BigDecimal body) throws ApiException { okhttp3.Call localVarCall = fakeOuterNumberSerializeValidateBeforeCall(body, null); @@ -391,6 +466,11 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Output number -
*/ public okhttp3.Call fakeOuterNumberSerializeAsync(BigDecimal body, final ApiCallback _callback) throws ApiException { @@ -405,6 +485,11 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Output string -
*/ public okhttp3.Call fakeOuterStringSerializeCall(String body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -449,6 +534,11 @@ public class FakeApi { * @param body Input string as post body (optional) * @return String * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Output string -
*/ public String fakeOuterStringSerialize(String body) throws ApiException { ApiResponse localVarResp = fakeOuterStringSerializeWithHttpInfo(body); @@ -461,6 +551,11 @@ public class FakeApi { * @param body Input string as post body (optional) * @return ApiResponse<String> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Output string -
*/ public ApiResponse fakeOuterStringSerializeWithHttpInfo(String body) throws ApiException { okhttp3.Call localVarCall = fakeOuterStringSerializeValidateBeforeCall(body, null); @@ -475,6 +570,11 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Output string -
*/ public okhttp3.Call fakeOuterStringSerializeAsync(String body, final ApiCallback _callback) throws ApiException { @@ -489,6 +589,11 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Success -
*/ public okhttp3.Call testBodyWithFileSchemaCall(FileSchemaTestClass body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -537,6 +642,11 @@ public class FakeApi { * For this test, the body for this request much reference a schema named `File`. * @param body (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Success -
*/ public void testBodyWithFileSchema(FileSchemaTestClass body) throws ApiException { testBodyWithFileSchemaWithHttpInfo(body); @@ -548,6 +658,11 @@ public class FakeApi { * @param body (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Success -
*/ public ApiResponse testBodyWithFileSchemaWithHttpInfo(FileSchemaTestClass body) throws ApiException { okhttp3.Call localVarCall = testBodyWithFileSchemaValidateBeforeCall(body, null); @@ -561,6 +676,11 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Success -
*/ public okhttp3.Call testBodyWithFileSchemaAsync(FileSchemaTestClass body, final ApiCallback _callback) throws ApiException { @@ -575,6 +695,11 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Success -
*/ public okhttp3.Call testBodyWithQueryParamsCall(String query, User body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -633,6 +758,11 @@ public class FakeApi { * @param query (required) * @param body (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Success -
*/ public void testBodyWithQueryParams(String query, User body) throws ApiException { testBodyWithQueryParamsWithHttpInfo(query, body); @@ -645,6 +775,11 @@ public class FakeApi { * @param body (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Success -
*/ public ApiResponse testBodyWithQueryParamsWithHttpInfo(String query, User body) throws ApiException { okhttp3.Call localVarCall = testBodyWithQueryParamsValidateBeforeCall(query, body, null); @@ -659,6 +794,11 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Success -
*/ public okhttp3.Call testBodyWithQueryParamsAsync(String query, User body, final ApiCallback _callback) throws ApiException { @@ -672,6 +812,11 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call testClientModelCall(Client body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -721,6 +866,11 @@ public class FakeApi { * @param body client model (required) * @return Client * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public Client testClientModel(Client body) throws ApiException { ApiResponse localVarResp = testClientModelWithHttpInfo(body); @@ -733,6 +883,11 @@ public class FakeApi { * @param body client model (required) * @return ApiResponse<Client> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public ApiResponse testClientModelWithHttpInfo(Client body) throws ApiException { okhttp3.Call localVarCall = testClientModelValidateBeforeCall(body, null); @@ -747,6 +902,11 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call testClientModelAsync(Client body, final ApiCallback _callback) throws ApiException { @@ -774,6 +934,12 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid username supplied -
404 User not found -
*/ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -906,6 +1072,12 @@ public class FakeApi { * @param password None (optional) * @param paramCallback None (optional) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid username supplied -
404 User not found -
*/ public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); @@ -930,6 +1102,12 @@ public class FakeApi { * @param paramCallback None (optional) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid username supplied -
404 User not found -
*/ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, null); @@ -956,6 +1134,12 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid username supplied -
404 User not found -
*/ public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException { @@ -976,6 +1160,12 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid request -
404 Not found -
*/ public okhttp3.Call testEnumParametersCall(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -1058,6 +1248,12 @@ public class FakeApi { * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid request -
404 Not found -
*/ public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString) throws ApiException { testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); @@ -1076,6 +1272,12 @@ public class FakeApi { * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid request -
404 Not found -
*/ public ApiResponse testEnumParametersWithHttpInfo(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString) throws ApiException { okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, null); @@ -1096,6 +1298,12 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid request -
404 Not found -
*/ public okhttp3.Call testEnumParametersAsync(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, final ApiCallback _callback) throws ApiException { @@ -1241,6 +1449,11 @@ public class FakeApi { * @param _callback ApiCallback API callback * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
400 Someting wrong -
*/ public okhttp3.Call buildCall(final ApiCallback _callback) throws ApiException { return testGroupParametersCall(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, _callback); @@ -1249,6 +1462,11 @@ public class FakeApi { /** * Execute testGroupParameters request * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
400 Someting wrong -
*/ public void execute() throws ApiException { testGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); @@ -1258,6 +1476,11 @@ public class FakeApi { * Execute testGroupParameters request with HTTP info returned * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
400 Someting wrong -
*/ public ApiResponse executeWithHttpInfo() throws ApiException { return testGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); @@ -1268,6 +1491,11 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
400 Someting wrong -
*/ public okhttp3.Call executeAsync(final ApiCallback _callback) throws ApiException { return testGroupParametersAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, _callback); @@ -1281,6 +1509,11 @@ public class FakeApi { * @param requiredBooleanGroup Required Boolean in group parameters (required) * @param requiredInt64Group Required Integer in group parameters (required) * @return APItestGroupParametersRequest + * @http.response.details + + + +
Status Code Description Response Headers
400 Someting wrong -
*/ public APItestGroupParametersRequest testGroupParameters(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group) { return new APItestGroupParametersRequest(requiredStringGroup, requiredBooleanGroup, requiredInt64Group); @@ -1291,6 +1524,11 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call testInlineAdditionalPropertiesCall(Map param, final ApiCallback _callback) throws ApiException { Object localVarPostBody = param; @@ -1339,6 +1577,11 @@ public class FakeApi { * * @param param request body (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public void testInlineAdditionalProperties(Map param) throws ApiException { testInlineAdditionalPropertiesWithHttpInfo(param); @@ -1350,6 +1593,11 @@ public class FakeApi { * @param param request body (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public ApiResponse testInlineAdditionalPropertiesWithHttpInfo(Map param) throws ApiException { okhttp3.Call localVarCall = testInlineAdditionalPropertiesValidateBeforeCall(param, null); @@ -1363,6 +1611,11 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call testInlineAdditionalPropertiesAsync(Map param, final ApiCallback _callback) throws ApiException { @@ -1377,6 +1630,11 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call testJsonFormDataCall(String param, String param2, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -1439,6 +1697,11 @@ public class FakeApi { * @param param field1 (required) * @param param2 field2 (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public void testJsonFormData(String param, String param2) throws ApiException { testJsonFormDataWithHttpInfo(param, param2); @@ -1451,6 +1714,11 @@ public class FakeApi { * @param param2 field2 (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public ApiResponse testJsonFormDataWithHttpInfo(String param, String param2) throws ApiException { okhttp3.Call localVarCall = testJsonFormDataValidateBeforeCall(param, param2, null); @@ -1465,6 +1733,11 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call testJsonFormDataAsync(String param, String param2, final ApiCallback _callback) throws ApiException { diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 58f139f083..621c27fd29 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -60,6 +60,11 @@ public class FakeClassnameTags123Api { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call testClassnameCall(Client body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -109,6 +114,11 @@ public class FakeClassnameTags123Api { * @param body client model (required) * @return Client * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public Client testClassname(Client body) throws ApiException { ApiResponse localVarResp = testClassnameWithHttpInfo(body); @@ -121,6 +131,11 @@ public class FakeClassnameTags123Api { * @param body client model (required) * @return ApiResponse<Client> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public ApiResponse testClassnameWithHttpInfo(Client body) throws ApiException { okhttp3.Call localVarCall = testClassnameValidateBeforeCall(body, null); @@ -135,6 +150,11 @@ public class FakeClassnameTags123Api { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call testClassnameAsync(Client body, final ApiCallback _callback) throws ApiException { diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java index 4de2d24953..ce889eb24e 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/PetApi.java @@ -62,6 +62,12 @@ public class PetApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
405 Invalid input -
*/ public okhttp3.Call addPetCall(Pet body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -110,6 +116,12 @@ public class PetApi { * * @param body Pet object that needs to be added to the store (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
405 Invalid input -
*/ public void addPet(Pet body) throws ApiException { addPetWithHttpInfo(body); @@ -121,6 +133,12 @@ public class PetApi { * @param body Pet object that needs to be added to the store (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
405 Invalid input -
*/ public ApiResponse addPetWithHttpInfo(Pet body) throws ApiException { okhttp3.Call localVarCall = addPetValidateBeforeCall(body, null); @@ -134,6 +152,12 @@ public class PetApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
405 Invalid input -
*/ public okhttp3.Call addPetAsync(Pet body, final ApiCallback _callback) throws ApiException { @@ -148,6 +172,12 @@ public class PetApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid pet value -
*/ public okhttp3.Call deletePetCall(Long petId, String apiKey, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -202,6 +232,12 @@ public class PetApi { * @param petId Pet id to delete (required) * @param apiKey (optional) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid pet value -
*/ public void deletePet(Long petId, String apiKey) throws ApiException { deletePetWithHttpInfo(petId, apiKey); @@ -214,6 +250,12 @@ public class PetApi { * @param apiKey (optional) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid pet value -
*/ public ApiResponse deletePetWithHttpInfo(Long petId, String apiKey) throws ApiException { okhttp3.Call localVarCall = deletePetValidateBeforeCall(petId, apiKey, null); @@ -228,6 +270,12 @@ public class PetApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid pet value -
*/ public okhttp3.Call deletePetAsync(Long petId, String apiKey, final ApiCallback _callback) throws ApiException { @@ -241,6 +289,12 @@ public class PetApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid status value -
*/ public okhttp3.Call findPetsByStatusCall(List status, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -294,6 +348,12 @@ public class PetApi { * @param status Status values that need to be considered for filter (required) * @return List<Pet> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid status value -
*/ public List findPetsByStatus(List status) throws ApiException { ApiResponse> localVarResp = findPetsByStatusWithHttpInfo(status); @@ -306,6 +366,12 @@ public class PetApi { * @param status Status values that need to be considered for filter (required) * @return ApiResponse<List<Pet>> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid status value -
*/ public ApiResponse> findPetsByStatusWithHttpInfo(List status) throws ApiException { okhttp3.Call localVarCall = findPetsByStatusValidateBeforeCall(status, null); @@ -320,6 +386,12 @@ public class PetApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid status value -
*/ public okhttp3.Call findPetsByStatusAsync(List status, final ApiCallback> _callback) throws ApiException { @@ -334,6 +406,12 @@ public class PetApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid tag value -
* @deprecated */ @Deprecated @@ -390,6 +468,12 @@ public class PetApi { * @param tags Tags to filter by (required) * @return List<Pet> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid tag value -
* @deprecated */ @Deprecated @@ -404,6 +488,12 @@ public class PetApi { * @param tags Tags to filter by (required) * @return ApiResponse<List<Pet>> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid tag value -
* @deprecated */ @Deprecated @@ -420,6 +510,12 @@ public class PetApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid tag value -
* @deprecated */ @Deprecated @@ -436,6 +532,13 @@ public class PetApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Pet not found -
*/ public okhttp3.Call getPetByIdCall(Long petId, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -486,6 +589,13 @@ public class PetApi { * @param petId ID of pet to return (required) * @return Pet * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Pet not found -
*/ public Pet getPetById(Long petId) throws ApiException { ApiResponse localVarResp = getPetByIdWithHttpInfo(petId); @@ -498,6 +608,13 @@ public class PetApi { * @param petId ID of pet to return (required) * @return ApiResponse<Pet> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Pet not found -
*/ public ApiResponse getPetByIdWithHttpInfo(Long petId) throws ApiException { okhttp3.Call localVarCall = getPetByIdValidateBeforeCall(petId, null); @@ -512,6 +629,13 @@ public class PetApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Pet not found -
*/ public okhttp3.Call getPetByIdAsync(Long petId, final ApiCallback _callback) throws ApiException { @@ -526,6 +650,14 @@ public class PetApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Pet not found -
405 Validation exception -
*/ public okhttp3.Call updatePetCall(Pet body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -574,6 +706,14 @@ public class PetApi { * * @param body Pet object that needs to be added to the store (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Pet not found -
405 Validation exception -
*/ public void updatePet(Pet body) throws ApiException { updatePetWithHttpInfo(body); @@ -585,6 +725,14 @@ public class PetApi { * @param body Pet object that needs to be added to the store (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Pet not found -
405 Validation exception -
*/ public ApiResponse updatePetWithHttpInfo(Pet body) throws ApiException { okhttp3.Call localVarCall = updatePetValidateBeforeCall(body, null); @@ -598,6 +746,14 @@ public class PetApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Pet not found -
405 Validation exception -
*/ public okhttp3.Call updatePetAsync(Pet body, final ApiCallback _callback) throws ApiException { @@ -613,6 +769,11 @@ public class PetApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
405 Invalid input -
*/ public okhttp3.Call updatePetWithFormCall(Long petId, String name, String status, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -672,6 +833,11 @@ public class PetApi { * @param name Updated name of the pet (optional) * @param status Updated status of the pet (optional) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
405 Invalid input -
*/ public void updatePetWithForm(Long petId, String name, String status) throws ApiException { updatePetWithFormWithHttpInfo(petId, name, status); @@ -685,6 +851,11 @@ public class PetApi { * @param status Updated status of the pet (optional) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
405 Invalid input -
*/ public ApiResponse updatePetWithFormWithHttpInfo(Long petId, String name, String status) throws ApiException { okhttp3.Call localVarCall = updatePetWithFormValidateBeforeCall(petId, name, status, null); @@ -700,6 +871,11 @@ public class PetApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
405 Invalid input -
*/ public okhttp3.Call updatePetWithFormAsync(Long petId, String name, String status, final ApiCallback _callback) throws ApiException { @@ -715,6 +891,11 @@ public class PetApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call uploadFileCall(Long petId, String additionalMetadata, File file, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -775,6 +956,11 @@ public class PetApi { * @param file file to upload (optional) * @return ModelApiResponse * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File file) throws ApiException { ApiResponse localVarResp = uploadFileWithHttpInfo(petId, additionalMetadata, file); @@ -789,6 +975,11 @@ public class PetApi { * @param file file to upload (optional) * @return ApiResponse<ModelApiResponse> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public ApiResponse uploadFileWithHttpInfo(Long petId, String additionalMetadata, File file) throws ApiException { okhttp3.Call localVarCall = uploadFileValidateBeforeCall(petId, additionalMetadata, file, null); @@ -805,6 +996,11 @@ public class PetApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call uploadFileAsync(Long petId, String additionalMetadata, File file, final ApiCallback _callback) throws ApiException { @@ -821,6 +1017,11 @@ public class PetApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call uploadFileWithRequiredFileCall(Long petId, File requiredFile, String additionalMetadata, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -886,6 +1087,11 @@ public class PetApi { * @param additionalMetadata Additional data to pass to server (optional) * @return ModelApiResponse * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public ModelApiResponse uploadFileWithRequiredFile(Long petId, File requiredFile, String additionalMetadata) throws ApiException { ApiResponse localVarResp = uploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata); @@ -900,6 +1106,11 @@ public class PetApi { * @param additionalMetadata Additional data to pass to server (optional) * @return ApiResponse<ModelApiResponse> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public ApiResponse uploadFileWithRequiredFileWithHttpInfo(Long petId, File requiredFile, String additionalMetadata) throws ApiException { okhttp3.Call localVarCall = uploadFileWithRequiredFileValidateBeforeCall(petId, requiredFile, additionalMetadata, null); @@ -916,6 +1127,11 @@ public class PetApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call uploadFileWithRequiredFileAsync(Long petId, File requiredFile, String additionalMetadata, final ApiCallback _callback) throws ApiException { diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/StoreApi.java index 2e40d53096..d61f727194 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/StoreApi.java @@ -60,6 +60,12 @@ public class StoreApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid ID supplied -
404 Order not found -
*/ public okhttp3.Call deleteOrderCall(String orderId, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -109,6 +115,12 @@ public class StoreApi { * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * @param orderId ID of the order that needs to be deleted (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid ID supplied -
404 Order not found -
*/ public void deleteOrder(String orderId) throws ApiException { deleteOrderWithHttpInfo(orderId); @@ -120,6 +132,12 @@ public class StoreApi { * @param orderId ID of the order that needs to be deleted (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid ID supplied -
404 Order not found -
*/ public ApiResponse deleteOrderWithHttpInfo(String orderId) throws ApiException { okhttp3.Call localVarCall = deleteOrderValidateBeforeCall(orderId, null); @@ -133,6 +151,12 @@ public class StoreApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid ID supplied -
404 Order not found -
*/ public okhttp3.Call deleteOrderAsync(String orderId, final ApiCallback _callback) throws ApiException { @@ -145,6 +169,11 @@ public class StoreApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call getInventoryCall(final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -188,6 +217,11 @@ public class StoreApi { * Returns a map of status codes to quantities * @return Map<String, Integer> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public Map getInventory() throws ApiException { ApiResponse> localVarResp = getInventoryWithHttpInfo(); @@ -199,6 +233,11 @@ public class StoreApi { * Returns a map of status codes to quantities * @return ApiResponse<Map<String, Integer>> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public ApiResponse> getInventoryWithHttpInfo() throws ApiException { okhttp3.Call localVarCall = getInventoryValidateBeforeCall(null); @@ -212,6 +251,11 @@ public class StoreApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call getInventoryAsync(final ApiCallback> _callback) throws ApiException { @@ -226,6 +270,13 @@ public class StoreApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Order not found -
*/ public okhttp3.Call getOrderByIdCall(Long orderId, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -276,6 +327,13 @@ public class StoreApi { * @param orderId ID of pet that needs to be fetched (required) * @return Order * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Order not found -
*/ public Order getOrderById(Long orderId) throws ApiException { ApiResponse localVarResp = getOrderByIdWithHttpInfo(orderId); @@ -288,6 +346,13 @@ public class StoreApi { * @param orderId ID of pet that needs to be fetched (required) * @return ApiResponse<Order> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Order not found -
*/ public ApiResponse getOrderByIdWithHttpInfo(Long orderId) throws ApiException { okhttp3.Call localVarCall = getOrderByIdValidateBeforeCall(orderId, null); @@ -302,6 +367,13 @@ public class StoreApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Order not found -
*/ public okhttp3.Call getOrderByIdAsync(Long orderId, final ApiCallback _callback) throws ApiException { @@ -316,6 +388,12 @@ public class StoreApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid Order -
*/ public okhttp3.Call placeOrderCall(Order body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -365,6 +443,12 @@ public class StoreApi { * @param body order placed for purchasing the pet (required) * @return Order * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid Order -
*/ public Order placeOrder(Order body) throws ApiException { ApiResponse localVarResp = placeOrderWithHttpInfo(body); @@ -377,6 +461,12 @@ public class StoreApi { * @param body order placed for purchasing the pet (required) * @return ApiResponse<Order> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid Order -
*/ public ApiResponse placeOrderWithHttpInfo(Order body) throws ApiException { okhttp3.Call localVarCall = placeOrderValidateBeforeCall(body, null); @@ -391,6 +481,12 @@ public class StoreApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid Order -
*/ public okhttp3.Call placeOrderAsync(Order body, final ApiCallback _callback) throws ApiException { diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/UserApi.java index 408cd9e87f..f3e783d0bc 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/UserApi.java @@ -60,6 +60,11 @@ public class UserApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public okhttp3.Call createUserCall(User body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -108,6 +113,11 @@ public class UserApi { * This can only be done by the logged in user. * @param body Created user object (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public void createUser(User body) throws ApiException { createUserWithHttpInfo(body); @@ -119,6 +129,11 @@ public class UserApi { * @param body Created user object (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public ApiResponse createUserWithHttpInfo(User body) throws ApiException { okhttp3.Call localVarCall = createUserValidateBeforeCall(body, null); @@ -132,6 +147,11 @@ public class UserApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public okhttp3.Call createUserAsync(User body, final ApiCallback _callback) throws ApiException { @@ -145,6 +165,11 @@ public class UserApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public okhttp3.Call createUsersWithArrayInputCall(List body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -193,6 +218,11 @@ public class UserApi { * * @param body List of user object (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public void createUsersWithArrayInput(List body) throws ApiException { createUsersWithArrayInputWithHttpInfo(body); @@ -204,6 +234,11 @@ public class UserApi { * @param body List of user object (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public ApiResponse createUsersWithArrayInputWithHttpInfo(List body) throws ApiException { okhttp3.Call localVarCall = createUsersWithArrayInputValidateBeforeCall(body, null); @@ -217,6 +252,11 @@ public class UserApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public okhttp3.Call createUsersWithArrayInputAsync(List body, final ApiCallback _callback) throws ApiException { @@ -230,6 +270,11 @@ public class UserApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public okhttp3.Call createUsersWithListInputCall(List body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -278,6 +323,11 @@ public class UserApi { * * @param body List of user object (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public void createUsersWithListInput(List body) throws ApiException { createUsersWithListInputWithHttpInfo(body); @@ -289,6 +339,11 @@ public class UserApi { * @param body List of user object (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public ApiResponse createUsersWithListInputWithHttpInfo(List body) throws ApiException { okhttp3.Call localVarCall = createUsersWithListInputValidateBeforeCall(body, null); @@ -302,6 +357,11 @@ public class UserApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public okhttp3.Call createUsersWithListInputAsync(List body, final ApiCallback _callback) throws ApiException { @@ -315,6 +375,12 @@ public class UserApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid username supplied -
404 User not found -
*/ public okhttp3.Call deleteUserCall(String username, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -364,6 +430,12 @@ public class UserApi { * This can only be done by the logged in user. * @param username The name that needs to be deleted (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid username supplied -
404 User not found -
*/ public void deleteUser(String username) throws ApiException { deleteUserWithHttpInfo(username); @@ -375,6 +447,12 @@ public class UserApi { * @param username The name that needs to be deleted (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid username supplied -
404 User not found -
*/ public ApiResponse deleteUserWithHttpInfo(String username) throws ApiException { okhttp3.Call localVarCall = deleteUserValidateBeforeCall(username, null); @@ -388,6 +466,12 @@ public class UserApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid username supplied -
404 User not found -
*/ public okhttp3.Call deleteUserAsync(String username, final ApiCallback _callback) throws ApiException { @@ -401,6 +485,13 @@ public class UserApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid username supplied -
404 User not found -
*/ public okhttp3.Call getUserByNameCall(String username, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -451,6 +542,13 @@ public class UserApi { * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return User * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid username supplied -
404 User not found -
*/ public User getUserByName(String username) throws ApiException { ApiResponse localVarResp = getUserByNameWithHttpInfo(username); @@ -463,6 +561,13 @@ public class UserApi { * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return ApiResponse<User> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid username supplied -
404 User not found -
*/ public ApiResponse getUserByNameWithHttpInfo(String username) throws ApiException { okhttp3.Call localVarCall = getUserByNameValidateBeforeCall(username, null); @@ -477,6 +582,13 @@ public class UserApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid username supplied -
404 User not found -
*/ public okhttp3.Call getUserByNameAsync(String username, final ApiCallback _callback) throws ApiException { @@ -492,6 +604,12 @@ public class UserApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation * X-Rate-Limit - calls per hour allowed by the user
* X-Expires-After - date in UTC when token expires
400 Invalid username/password supplied -
*/ public okhttp3.Call loginUserCall(String username, String password, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -555,6 +673,12 @@ public class UserApi { * @param password The password for login in clear text (required) * @return String * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation * X-Rate-Limit - calls per hour allowed by the user
* X-Expires-After - date in UTC when token expires
400 Invalid username/password supplied -
*/ public String loginUser(String username, String password) throws ApiException { ApiResponse localVarResp = loginUserWithHttpInfo(username, password); @@ -568,6 +692,12 @@ public class UserApi { * @param password The password for login in clear text (required) * @return ApiResponse<String> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation * X-Rate-Limit - calls per hour allowed by the user
* X-Expires-After - date in UTC when token expires
400 Invalid username/password supplied -
*/ public ApiResponse loginUserWithHttpInfo(String username, String password) throws ApiException { okhttp3.Call localVarCall = loginUserValidateBeforeCall(username, password, null); @@ -583,6 +713,12 @@ public class UserApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation * X-Rate-Limit - calls per hour allowed by the user
* X-Expires-After - date in UTC when token expires
400 Invalid username/password supplied -
*/ public okhttp3.Call loginUserAsync(String username, String password, final ApiCallback _callback) throws ApiException { @@ -596,6 +732,11 @@ public class UserApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public okhttp3.Call logoutUserCall(final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -638,6 +779,11 @@ public class UserApi { * Logs out current logged in user session * * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public void logoutUser() throws ApiException { logoutUserWithHttpInfo(); @@ -648,6 +794,11 @@ public class UserApi { * * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public ApiResponse logoutUserWithHttpInfo() throws ApiException { okhttp3.Call localVarCall = logoutUserValidateBeforeCall(null); @@ -660,6 +811,11 @@ public class UserApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public okhttp3.Call logoutUserAsync(final ApiCallback _callback) throws ApiException { @@ -674,6 +830,12 @@ public class UserApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid user supplied -
404 User not found -
*/ public okhttp3.Call updateUserCall(String username, User body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -729,6 +891,12 @@ public class UserApi { * @param username name that need to be deleted (required) * @param body Updated user object (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid user supplied -
404 User not found -
*/ public void updateUser(String username, User body) throws ApiException { updateUserWithHttpInfo(username, body); @@ -741,6 +909,12 @@ public class UserApi { * @param body Updated user object (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid user supplied -
404 User not found -
*/ public ApiResponse updateUserWithHttpInfo(String username, User body) throws ApiException { okhttp3.Call localVarCall = updateUserValidateBeforeCall(username, body, null); @@ -755,6 +929,12 @@ public class UserApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid user supplied -
404 User not found -
*/ public okhttp3.Call updateUserAsync(String username, User body, final ApiCallback _callback) throws ApiException { diff --git a/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION +++ b/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/okhttp-gson/docs/AnotherFakeApi.md b/samples/client/petstore/java/okhttp-gson/docs/AnotherFakeApi.md index 4a8546e0c1..0565c2589b 100644 --- a/samples/client/petstore/java/okhttp-gson/docs/AnotherFakeApi.md +++ b/samples/client/petstore/java/okhttp-gson/docs/AnotherFakeApi.md @@ -18,18 +18,30 @@ To test special tags and operation ID starting with number ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.AnotherFakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.AnotherFakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -AnotherFakeApi apiInstance = new AnotherFakeApi(); -Client body = new Client(); // Client | client model -try { - Client result = apiInstance.call123testSpecialTags(body); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags"); - e.printStackTrace(); + AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient); + Client body = new Client(); // Client | client model + try { + Client result = apiInstance.call123testSpecialTags(body); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -52,3 +64,8 @@ No authorization required - **Content-Type**: application/json - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + diff --git a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md index 6c99239a23..6b06529329 100644 --- a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md +++ b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md @@ -30,17 +30,29 @@ this route creates an XmlItem ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -XmlItem xmlItem = new XmlItem(); // XmlItem | XmlItem Body -try { - apiInstance.createXmlItem(xmlItem); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#createXmlItem"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + XmlItem xmlItem = new XmlItem(); // XmlItem | XmlItem Body + try { + apiInstance.createXmlItem(xmlItem); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#createXmlItem"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -63,6 +75,11 @@ No authorization required - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16 - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + # **fakeOuterBooleanSerialize** > Boolean fakeOuterBooleanSerialize(body) @@ -74,18 +91,30 @@ Test serialization of outer boolean types ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -Boolean body = true; // Boolean | Input boolean as post body -try { - Boolean result = apiInstance.fakeOuterBooleanSerialize(body); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#fakeOuterBooleanSerialize"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + Boolean body = true; // Boolean | Input boolean as post body + try { + Boolean result = apiInstance.fakeOuterBooleanSerialize(body); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#fakeOuterBooleanSerialize"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -108,6 +137,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output boolean | - | + # **fakeOuterCompositeSerialize** > OuterComposite fakeOuterCompositeSerialize(body) @@ -119,18 +153,30 @@ Test serialization of object with outer number type ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -OuterComposite body = new OuterComposite(); // OuterComposite | Input composite as post body -try { - OuterComposite result = apiInstance.fakeOuterCompositeSerialize(body); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#fakeOuterCompositeSerialize"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + OuterComposite body = new OuterComposite(); // OuterComposite | Input composite as post body + try { + OuterComposite result = apiInstance.fakeOuterCompositeSerialize(body); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#fakeOuterCompositeSerialize"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -153,6 +199,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output composite | - | + # **fakeOuterNumberSerialize** > BigDecimal fakeOuterNumberSerialize(body) @@ -164,18 +215,30 @@ Test serialization of outer number types ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -BigDecimal body = new BigDecimal(); // BigDecimal | Input number as post body -try { - BigDecimal result = apiInstance.fakeOuterNumberSerialize(body); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#fakeOuterNumberSerialize"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + BigDecimal body = new BigDecimal(); // BigDecimal | Input number as post body + try { + BigDecimal result = apiInstance.fakeOuterNumberSerialize(body); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#fakeOuterNumberSerialize"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -198,6 +261,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output number | - | + # **fakeOuterStringSerialize** > String fakeOuterStringSerialize(body) @@ -209,18 +277,30 @@ Test serialization of outer string types ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -String body = "body_example"; // String | Input string as post body -try { - String result = apiInstance.fakeOuterStringSerialize(body); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#fakeOuterStringSerialize"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + String body = "body_example"; // String | Input string as post body + try { + String result = apiInstance.fakeOuterStringSerialize(body); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#fakeOuterStringSerialize"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -243,6 +323,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output string | - | + # **testBodyWithFileSchema** > testBodyWithFileSchema(body) @@ -254,17 +339,29 @@ For this test, the body for this request much reference a schema named `Fil ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -FileSchemaTestClass body = new FileSchemaTestClass(); // FileSchemaTestClass | -try { - apiInstance.testBodyWithFileSchema(body); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#testBodyWithFileSchema"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + FileSchemaTestClass body = new FileSchemaTestClass(); // FileSchemaTestClass | + try { + apiInstance.testBodyWithFileSchema(body); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#testBodyWithFileSchema"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -287,6 +384,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Success | - | + # **testBodyWithQueryParams** > testBodyWithQueryParams(query, body) @@ -296,18 +398,30 @@ No authorization required ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -String query = "query_example"; // String | -User body = new User(); // User | -try { - apiInstance.testBodyWithQueryParams(query, body); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#testBodyWithQueryParams"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + String query = "query_example"; // String | + User body = new User(); // User | + try { + apiInstance.testBodyWithQueryParams(query, body); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#testBodyWithQueryParams"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -331,6 +445,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Success | - | + # **testClientModel** > Client testClientModel(body) @@ -342,18 +461,30 @@ To test \"client\" model ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -Client body = new Client(); // Client | client model -try { - Client result = apiInstance.testClientModel(body); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#testClientModel"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + Client body = new Client(); // Client | client model + try { + Client result = apiInstance.testClientModel(body); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#testClientModel"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -376,6 +507,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + # **testEndpointParameters** > testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) @@ -387,39 +523,48 @@ Fake endpoint for testing various parameters 假端點 偽のエンドポイン ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure HTTP basic authorization: http_basic_test + HttpBasicAuth http_basic_test = (HttpBasicAuth) defaultClient.getAuthentication("http_basic_test"); + http_basic_test.setUsername("YOUR USERNAME"); + http_basic_test.setPassword("YOUR PASSWORD"); -// Configure HTTP basic authorization: http_basic_test -HttpBasicAuth http_basic_test = (HttpBasicAuth) defaultClient.getAuthentication("http_basic_test"); -http_basic_test.setUsername("YOUR USERNAME"); -http_basic_test.setPassword("YOUR PASSWORD"); - -FakeApi apiInstance = new FakeApi(); -BigDecimal number = new BigDecimal(); // BigDecimal | None -Double _double = 3.4D; // Double | None -String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None -byte[] _byte = null; // byte[] | None -Integer integer = 56; // Integer | None -Integer int32 = 56; // Integer | None -Long int64 = 56L; // Long | None -Float _float = 3.4F; // Float | None -String string = "string_example"; // String | None -File binary = new File("/path/to/file"); // File | None -LocalDate date = new LocalDate(); // LocalDate | None -OffsetDateTime dateTime = new OffsetDateTime(); // OffsetDateTime | None -String password = "password_example"; // String | None -String paramCallback = "paramCallback_example"; // String | None -try { - apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#testEndpointParameters"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + BigDecimal number = new BigDecimal(); // BigDecimal | None + Double _double = 3.4D; // Double | None + String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None + byte[] _byte = null; // byte[] | None + Integer integer = 56; // Integer | None + Integer int32 = 56; // Integer | None + Long int64 = 56L; // Long | None + Float _float = 3.4F; // Float | None + String string = "string_example"; // String | None + File binary = new File("/path/to/file"); // File | None + LocalDate date = new LocalDate(); // LocalDate | None + OffsetDateTime dateTime = new OffsetDateTime(); // OffsetDateTime | None + String password = "password_example"; // String | None + String paramCallback = "paramCallback_example"; // String | None + try { + apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#testEndpointParameters"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -455,6 +600,12 @@ null (empty response body) - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid username supplied | - | +**404** | User not found | - | + # **testEnumParameters** > testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString) @@ -466,24 +617,36 @@ To test enum parameters ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -List enumHeaderStringArray = Arrays.asList("$"); // List | Header parameter enum test (string array) -String enumHeaderString = "-efg"; // String | Header parameter enum test (string) -List enumQueryStringArray = Arrays.asList("$"); // List | Query parameter enum test (string array) -String enumQueryString = "-efg"; // String | Query parameter enum test (string) -Integer enumQueryInteger = 56; // Integer | Query parameter enum test (double) -Double enumQueryDouble = 3.4D; // Double | Query parameter enum test (double) -List enumFormStringArray = "$"; // List | Form parameter enum test (string array) -String enumFormString = "-efg"; // String | Form parameter enum test (string) -try { - apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#testEnumParameters"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + List enumHeaderStringArray = Arrays.asList("$"); // List | Header parameter enum test (string array) + String enumHeaderString = "-efg"; // String | Header parameter enum test (string) + List enumQueryStringArray = Arrays.asList("$"); // List | Query parameter enum test (string array) + String enumQueryString = "-efg"; // String | Query parameter enum test (string) + Integer enumQueryInteger = 56; // Integer | Query parameter enum test (double) + Double enumQueryDouble = 3.4D; // Double | Query parameter enum test (double) + List enumFormStringArray = "$"; // List | Form parameter enum test (string array) + String enumFormString = "-efg"; // String | Form parameter enum test (string) + try { + apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#testEnumParameters"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -513,6 +676,12 @@ No authorization required - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid request | - | +**404** | Not found | - | + # **testGroupParameters** > testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group).stringGroup(stringGroup).booleanGroup(booleanGroup).int64Group(int64Group).execute(); @@ -524,26 +693,38 @@ Fake endpoint to test group parameters (optional) ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -Integer requiredStringGroup = 56; // Integer | Required String in group parameters -Boolean requiredBooleanGroup = true; // Boolean | Required Boolean in group parameters -Long requiredInt64Group = 56L; // Long | Required Integer in group parameters -Integer stringGroup = 56; // Integer | String in group parameters -Boolean booleanGroup = true; // Boolean | Boolean in group parameters -Long int64Group = 56L; // Long | Integer in group parameters -try { - apiInstance.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group) + FakeApi apiInstance = new FakeApi(defaultClient); + Integer requiredStringGroup = 56; // Integer | Required String in group parameters + Boolean requiredBooleanGroup = true; // Boolean | Required Boolean in group parameters + Long requiredInt64Group = 56L; // Long | Required Integer in group parameters + Integer stringGroup = 56; // Integer | String in group parameters + Boolean booleanGroup = true; // Boolean | Boolean in group parameters + Long int64Group = 56L; // Long | Integer in group parameters + try { + apiInstance.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group) .stringGroup(stringGroup) .booleanGroup(booleanGroup) .int64Group(int64Group) .execute(); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#testGroupParameters"); - e.printStackTrace(); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#testGroupParameters"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -571,6 +752,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Someting wrong | - | + # **testInlineAdditionalProperties** > testInlineAdditionalProperties(param) @@ -580,17 +766,29 @@ test inline additionalProperties ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -Map param = new HashMap(); // Map | request body -try { - apiInstance.testInlineAdditionalProperties(param); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#testInlineAdditionalProperties"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + Map param = new HashMap(); // Map | request body + try { + apiInstance.testInlineAdditionalProperties(param); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#testInlineAdditionalProperties"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -613,6 +811,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + # **testJsonFormData** > testJsonFormData(param, param2) @@ -622,18 +825,30 @@ test json serialization of form data ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.FakeApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -FakeApi apiInstance = new FakeApi(); -String param = "param_example"; // String | field1 -String param2 = "param2_example"; // String | field2 -try { - apiInstance.testJsonFormData(param, param2); -} catch (ApiException e) { - System.err.println("Exception when calling FakeApi#testJsonFormData"); - e.printStackTrace(); + FakeApi apiInstance = new FakeApi(defaultClient); + String param = "param_example"; // String | field1 + String param2 = "param2_example"; // String | field2 + try { + apiInstance.testJsonFormData(param, param2); + } catch (ApiException e) { + System.err.println("Exception when calling FakeApi#testJsonFormData"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -657,3 +872,8 @@ No authorization required - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + diff --git a/samples/client/petstore/java/okhttp-gson/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/okhttp-gson/docs/FakeClassnameTags123Api.md index 873b749362..bd934e3607 100644 --- a/samples/client/petstore/java/okhttp-gson/docs/FakeClassnameTags123Api.md +++ b/samples/client/petstore/java/okhttp-gson/docs/FakeClassnameTags123Api.md @@ -18,28 +18,37 @@ To test class name in snake case ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.FakeClassnameTags123Api; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FakeClassnameTags123Api; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure API key authorization: api_key_query + ApiKeyAuth api_key_query = (ApiKeyAuth) defaultClient.getAuthentication("api_key_query"); + api_key_query.setApiKey("YOUR API KEY"); + // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null) + //api_key_query.setApiKeyPrefix("Token"); -// Configure API key authorization: api_key_query -ApiKeyAuth api_key_query = (ApiKeyAuth) defaultClient.getAuthentication("api_key_query"); -api_key_query.setApiKey("YOUR API KEY"); -// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null) -//api_key_query.setApiKeyPrefix("Token"); - -FakeClassnameTags123Api apiInstance = new FakeClassnameTags123Api(); -Client body = new Client(); // Client | client model -try { - Client result = apiInstance.testClassname(body); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling FakeClassnameTags123Api#testClassname"); - e.printStackTrace(); + FakeClassnameTags123Api apiInstance = new FakeClassnameTags123Api(defaultClient); + Client body = new Client(); // Client | client model + try { + Client result = apiInstance.testClassname(body); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling FakeClassnameTags123Api#testClassname"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -62,3 +71,8 @@ Name | Type | Description | Notes - **Content-Type**: application/json - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + diff --git a/samples/client/petstore/java/okhttp-gson/docs/PetApi.md b/samples/client/petstore/java/okhttp-gson/docs/PetApi.md index fa157be701..ca6658ce09 100644 --- a/samples/client/petstore/java/okhttp-gson/docs/PetApi.md +++ b/samples/client/petstore/java/okhttp-gson/docs/PetApi.md @@ -24,25 +24,34 @@ Add a new pet to the store ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.PetApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.PetApi; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure OAuth2 access token for authorization: petstore_auth + OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); + petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); -// Configure OAuth2 access token for authorization: petstore_auth -OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); -petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); - -PetApi apiInstance = new PetApi(); -Pet body = new Pet(); // Pet | Pet object that needs to be added to the store -try { - apiInstance.addPet(body); -} catch (ApiException e) { - System.err.println("Exception when calling PetApi#addPet"); - e.printStackTrace(); + PetApi apiInstance = new PetApi(defaultClient); + Pet body = new Pet(); // Pet | Pet object that needs to be added to the store + try { + apiInstance.addPet(body); + } catch (ApiException e) { + System.err.println("Exception when calling PetApi#addPet"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -65,6 +74,12 @@ null (empty response body) - **Content-Type**: application/json, application/xml - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**405** | Invalid input | - | + # **deletePet** > deletePet(petId, apiKey) @@ -74,26 +89,35 @@ Deletes a pet ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.PetApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.PetApi; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure OAuth2 access token for authorization: petstore_auth + OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); + petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); -// Configure OAuth2 access token for authorization: petstore_auth -OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); -petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); - -PetApi apiInstance = new PetApi(); -Long petId = 56L; // Long | Pet id to delete -String apiKey = "apiKey_example"; // String | -try { - apiInstance.deletePet(petId, apiKey); -} catch (ApiException e) { - System.err.println("Exception when calling PetApi#deletePet"); - e.printStackTrace(); + PetApi apiInstance = new PetApi(defaultClient); + Long petId = 56L; // Long | Pet id to delete + String apiKey = "apiKey_example"; // String | + try { + apiInstance.deletePet(petId, apiKey); + } catch (ApiException e) { + System.err.println("Exception when calling PetApi#deletePet"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -117,6 +141,12 @@ null (empty response body) - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid pet value | - | + # **findPetsByStatus** > List<Pet> findPetsByStatus(status) @@ -128,26 +158,35 @@ Multiple status values can be provided with comma separated strings ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.PetApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.PetApi; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure OAuth2 access token for authorization: petstore_auth + OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); + petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); -// Configure OAuth2 access token for authorization: petstore_auth -OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); -petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); - -PetApi apiInstance = new PetApi(); -List status = Arrays.asList("available"); // List | Status values that need to be considered for filter -try { - List result = apiInstance.findPetsByStatus(status); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling PetApi#findPetsByStatus"); - e.printStackTrace(); + PetApi apiInstance = new PetApi(defaultClient); + List status = Arrays.asList("available"); // List | Status values that need to be considered for filter + try { + List result = apiInstance.findPetsByStatus(status); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling PetApi#findPetsByStatus"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -170,6 +209,12 @@ Name | Type | Description | Notes - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid status value | - | + # **findPetsByTags** > List<Pet> findPetsByTags(tags) @@ -181,26 +226,35 @@ Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.PetApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.PetApi; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure OAuth2 access token for authorization: petstore_auth + OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); + petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); -// Configure OAuth2 access token for authorization: petstore_auth -OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); -petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); - -PetApi apiInstance = new PetApi(); -List tags = Arrays.asList(); // List | Tags to filter by -try { - List result = apiInstance.findPetsByTags(tags); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling PetApi#findPetsByTags"); - e.printStackTrace(); + PetApi apiInstance = new PetApi(defaultClient); + List tags = Arrays.asList(); // List | Tags to filter by + try { + List result = apiInstance.findPetsByTags(tags); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling PetApi#findPetsByTags"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -223,6 +277,12 @@ Name | Type | Description | Notes - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid tag value | - | + # **getPetById** > Pet getPetById(petId) @@ -234,28 +294,37 @@ Returns a single pet ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.PetApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.PetApi; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure API key authorization: api_key + ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key"); + api_key.setApiKey("YOUR API KEY"); + // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null) + //api_key.setApiKeyPrefix("Token"); -// Configure API key authorization: api_key -ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key"); -api_key.setApiKey("YOUR API KEY"); -// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null) -//api_key.setApiKeyPrefix("Token"); - -PetApi apiInstance = new PetApi(); -Long petId = 56L; // Long | ID of pet to return -try { - Pet result = apiInstance.getPetById(petId); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling PetApi#getPetById"); - e.printStackTrace(); + PetApi apiInstance = new PetApi(defaultClient); + Long petId = 56L; // Long | ID of pet to return + try { + Pet result = apiInstance.getPetById(petId); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling PetApi#getPetById"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -278,6 +347,13 @@ Name | Type | Description | Notes - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid ID supplied | - | +**404** | Pet not found | - | + # **updatePet** > updatePet(body) @@ -287,25 +363,34 @@ Update an existing pet ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.PetApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.PetApi; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure OAuth2 access token for authorization: petstore_auth + OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); + petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); -// Configure OAuth2 access token for authorization: petstore_auth -OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); -petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); - -PetApi apiInstance = new PetApi(); -Pet body = new Pet(); // Pet | Pet object that needs to be added to the store -try { - apiInstance.updatePet(body); -} catch (ApiException e) { - System.err.println("Exception when calling PetApi#updatePet"); - e.printStackTrace(); + PetApi apiInstance = new PetApi(defaultClient); + Pet body = new Pet(); // Pet | Pet object that needs to be added to the store + try { + apiInstance.updatePet(body); + } catch (ApiException e) { + System.err.println("Exception when calling PetApi#updatePet"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -328,6 +413,14 @@ null (empty response body) - **Content-Type**: application/json, application/xml - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid ID supplied | - | +**404** | Pet not found | - | +**405** | Validation exception | - | + # **updatePetWithForm** > updatePetWithForm(petId, name, status) @@ -337,27 +430,36 @@ Updates a pet in the store with form data ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.PetApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.PetApi; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure OAuth2 access token for authorization: petstore_auth + OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); + petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); -// Configure OAuth2 access token for authorization: petstore_auth -OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); -petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); - -PetApi apiInstance = new PetApi(); -Long petId = 56L; // Long | ID of pet that needs to be updated -String name = "name_example"; // String | Updated name of the pet -String status = "status_example"; // String | Updated status of the pet -try { - apiInstance.updatePetWithForm(petId, name, status); -} catch (ApiException e) { - System.err.println("Exception when calling PetApi#updatePetWithForm"); - e.printStackTrace(); + PetApi apiInstance = new PetApi(defaultClient); + Long petId = 56L; // Long | ID of pet that needs to be updated + String name = "name_example"; // String | Updated name of the pet + String status = "status_example"; // String | Updated status of the pet + try { + apiInstance.updatePetWithForm(petId, name, status); + } catch (ApiException e) { + System.err.println("Exception when calling PetApi#updatePetWithForm"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -382,6 +484,11 @@ null (empty response body) - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**405** | Invalid input | - | + # **uploadFile** > ModelApiResponse uploadFile(petId, additionalMetadata, file) @@ -391,28 +498,37 @@ uploads an image ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.PetApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.PetApi; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure OAuth2 access token for authorization: petstore_auth + OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); + petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); -// Configure OAuth2 access token for authorization: petstore_auth -OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); -petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); - -PetApi apiInstance = new PetApi(); -Long petId = 56L; // Long | ID of pet to update -String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server -File file = new File("/path/to/file"); // File | file to upload -try { - ModelApiResponse result = apiInstance.uploadFile(petId, additionalMetadata, file); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling PetApi#uploadFile"); - e.printStackTrace(); + PetApi apiInstance = new PetApi(defaultClient); + Long petId = 56L; // Long | ID of pet to update + String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server + File file = new File("/path/to/file"); // File | file to upload + try { + ModelApiResponse result = apiInstance.uploadFile(petId, additionalMetadata, file); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling PetApi#uploadFile"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -437,6 +553,11 @@ Name | Type | Description | Notes - **Content-Type**: multipart/form-data - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + # **uploadFileWithRequiredFile** > ModelApiResponse uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata) @@ -446,28 +567,37 @@ uploads an image (required) ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.PetApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.PetApi; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure OAuth2 access token for authorization: petstore_auth + OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); + petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); -// Configure OAuth2 access token for authorization: petstore_auth -OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); -petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); - -PetApi apiInstance = new PetApi(); -Long petId = 56L; // Long | ID of pet to update -File requiredFile = new File("/path/to/file"); // File | file to upload -String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server -try { - ModelApiResponse result = apiInstance.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling PetApi#uploadFileWithRequiredFile"); - e.printStackTrace(); + PetApi apiInstance = new PetApi(defaultClient); + Long petId = 56L; // Long | ID of pet to update + File requiredFile = new File("/path/to/file"); // File | file to upload + String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server + try { + ModelApiResponse result = apiInstance.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling PetApi#uploadFileWithRequiredFile"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -492,3 +622,8 @@ Name | Type | Description | Notes - **Content-Type**: multipart/form-data - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + diff --git a/samples/client/petstore/java/okhttp-gson/docs/StoreApi.md b/samples/client/petstore/java/okhttp-gson/docs/StoreApi.md index 30d782f82d..a86b478e55 100644 --- a/samples/client/petstore/java/okhttp-gson/docs/StoreApi.md +++ b/samples/client/petstore/java/okhttp-gson/docs/StoreApi.md @@ -21,17 +21,29 @@ For valid response try integer IDs with value < 1000. Anything above 1000 or ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.StoreApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.StoreApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -StoreApi apiInstance = new StoreApi(); -String orderId = "orderId_example"; // String | ID of the order that needs to be deleted -try { - apiInstance.deleteOrder(orderId); -} catch (ApiException e) { - System.err.println("Exception when calling StoreApi#deleteOrder"); - e.printStackTrace(); + StoreApi apiInstance = new StoreApi(defaultClient); + String orderId = "orderId_example"; // String | ID of the order that needs to be deleted + try { + apiInstance.deleteOrder(orderId); + } catch (ApiException e) { + System.err.println("Exception when calling StoreApi#deleteOrder"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -54,6 +66,12 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid ID supplied | - | +**404** | Order not found | - | + # **getInventory** > Map<String, Integer> getInventory() @@ -65,27 +83,36 @@ Returns a map of status codes to quantities ### Example ```java // Import classes: -//import org.openapitools.client.ApiClient; -//import org.openapitools.client.ApiException; -//import org.openapitools.client.Configuration; -//import org.openapitools.client.auth.*; -//import org.openapitools.client.api.StoreApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.auth.*; +import org.openapitools.client.models.*; +import org.openapitools.client.api.StoreApi; -ApiClient defaultClient = Configuration.getDefaultApiClient(); +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); + + // Configure API key authorization: api_key + ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key"); + api_key.setApiKey("YOUR API KEY"); + // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null) + //api_key.setApiKeyPrefix("Token"); -// Configure API key authorization: api_key -ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key"); -api_key.setApiKey("YOUR API KEY"); -// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null) -//api_key.setApiKeyPrefix("Token"); - -StoreApi apiInstance = new StoreApi(); -try { - Map result = apiInstance.getInventory(); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling StoreApi#getInventory"); - e.printStackTrace(); + StoreApi apiInstance = new StoreApi(defaultClient); + try { + Map result = apiInstance.getInventory(); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling StoreApi#getInventory"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -105,6 +132,11 @@ This endpoint does not need any parameter. - **Content-Type**: Not defined - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + # **getOrderById** > Order getOrderById(orderId) @@ -116,18 +148,30 @@ For valid response try integer IDs with value <= 5 or > 10. Other val ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.StoreApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.StoreApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -StoreApi apiInstance = new StoreApi(); -Long orderId = 56L; // Long | ID of pet that needs to be fetched -try { - Order result = apiInstance.getOrderById(orderId); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling StoreApi#getOrderById"); - e.printStackTrace(); + StoreApi apiInstance = new StoreApi(defaultClient); + Long orderId = 56L; // Long | ID of pet that needs to be fetched + try { + Order result = apiInstance.getOrderById(orderId); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling StoreApi#getOrderById"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -150,6 +194,13 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid ID supplied | - | +**404** | Order not found | - | + # **placeOrder** > Order placeOrder(body) @@ -159,18 +210,30 @@ Place an order for a pet ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.StoreApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.StoreApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -StoreApi apiInstance = new StoreApi(); -Order body = new Order(); // Order | order placed for purchasing the pet -try { - Order result = apiInstance.placeOrder(body); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling StoreApi#placeOrder"); - e.printStackTrace(); + StoreApi apiInstance = new StoreApi(defaultClient); + Order body = new Order(); // Order | order placed for purchasing the pet + try { + Order result = apiInstance.placeOrder(body); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling StoreApi#placeOrder"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -193,3 +256,9 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid Order | - | + diff --git a/samples/client/petstore/java/okhttp-gson/docs/UserApi.md b/samples/client/petstore/java/okhttp-gson/docs/UserApi.md index 5969abd518..ca29da916a 100644 --- a/samples/client/petstore/java/okhttp-gson/docs/UserApi.md +++ b/samples/client/petstore/java/okhttp-gson/docs/UserApi.md @@ -25,17 +25,29 @@ This can only be done by the logged in user. ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.UserApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.UserApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -UserApi apiInstance = new UserApi(); -User body = new User(); // User | Created user object -try { - apiInstance.createUser(body); -} catch (ApiException e) { - System.err.println("Exception when calling UserApi#createUser"); - e.printStackTrace(); + UserApi apiInstance = new UserApi(defaultClient); + User body = new User(); // User | Created user object + try { + apiInstance.createUser(body); + } catch (ApiException e) { + System.err.println("Exception when calling UserApi#createUser"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -58,6 +70,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + # **createUsersWithArrayInput** > createUsersWithArrayInput(body) @@ -67,17 +84,29 @@ Creates list of users with given input array ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.UserApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.UserApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -UserApi apiInstance = new UserApi(); -List body = Arrays.asList(null); // List | List of user object -try { - apiInstance.createUsersWithArrayInput(body); -} catch (ApiException e) { - System.err.println("Exception when calling UserApi#createUsersWithArrayInput"); - e.printStackTrace(); + UserApi apiInstance = new UserApi(defaultClient); + List body = Arrays.asList(null); // List | List of user object + try { + apiInstance.createUsersWithArrayInput(body); + } catch (ApiException e) { + System.err.println("Exception when calling UserApi#createUsersWithArrayInput"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -100,6 +129,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + # **createUsersWithListInput** > createUsersWithListInput(body) @@ -109,17 +143,29 @@ Creates list of users with given input array ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.UserApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.UserApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -UserApi apiInstance = new UserApi(); -List body = Arrays.asList(null); // List | List of user object -try { - apiInstance.createUsersWithListInput(body); -} catch (ApiException e) { - System.err.println("Exception when calling UserApi#createUsersWithListInput"); - e.printStackTrace(); + UserApi apiInstance = new UserApi(defaultClient); + List body = Arrays.asList(null); // List | List of user object + try { + apiInstance.createUsersWithListInput(body); + } catch (ApiException e) { + System.err.println("Exception when calling UserApi#createUsersWithListInput"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -142,6 +188,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + # **deleteUser** > deleteUser(username) @@ -153,17 +204,29 @@ This can only be done by the logged in user. ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.UserApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.UserApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -UserApi apiInstance = new UserApi(); -String username = "username_example"; // String | The name that needs to be deleted -try { - apiInstance.deleteUser(username); -} catch (ApiException e) { - System.err.println("Exception when calling UserApi#deleteUser"); - e.printStackTrace(); + UserApi apiInstance = new UserApi(defaultClient); + String username = "username_example"; // String | The name that needs to be deleted + try { + apiInstance.deleteUser(username); + } catch (ApiException e) { + System.err.println("Exception when calling UserApi#deleteUser"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -186,6 +249,12 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid username supplied | - | +**404** | User not found | - | + # **getUserByName** > User getUserByName(username) @@ -195,18 +264,30 @@ Get user by user name ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.UserApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.UserApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -UserApi apiInstance = new UserApi(); -String username = "username_example"; // String | The name that needs to be fetched. Use user1 for testing. -try { - User result = apiInstance.getUserByName(username); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling UserApi#getUserByName"); - e.printStackTrace(); + UserApi apiInstance = new UserApi(defaultClient); + String username = "username_example"; // String | The name that needs to be fetched. Use user1 for testing. + try { + User result = apiInstance.getUserByName(username); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling UserApi#getUserByName"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -229,6 +310,13 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid username supplied | - | +**404** | User not found | - | + # **loginUser** > String loginUser(username, password) @@ -238,19 +326,31 @@ Logs user into the system ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.UserApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.UserApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -UserApi apiInstance = new UserApi(); -String username = "username_example"; // String | The user name for login -String password = "password_example"; // String | The password for login in clear text -try { - String result = apiInstance.loginUser(username, password); - System.out.println(result); -} catch (ApiException e) { - System.err.println("Exception when calling UserApi#loginUser"); - e.printStackTrace(); + UserApi apiInstance = new UserApi(defaultClient); + String username = "username_example"; // String | The user name for login + String password = "password_example"; // String | The password for login in clear text + try { + String result = apiInstance.loginUser(username, password); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling UserApi#loginUser"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -274,6 +374,12 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | * X-Rate-Limit - calls per hour allowed by the user
* X-Expires-After - date in UTC when token expires
| +**400** | Invalid username/password supplied | - | + # **logoutUser** > logoutUser() @@ -283,16 +389,28 @@ Logs out current logged in user session ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.UserApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.UserApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -UserApi apiInstance = new UserApi(); -try { - apiInstance.logoutUser(); -} catch (ApiException e) { - System.err.println("Exception when calling UserApi#logoutUser"); - e.printStackTrace(); + UserApi apiInstance = new UserApi(defaultClient); + try { + apiInstance.logoutUser(); + } catch (ApiException e) { + System.err.println("Exception when calling UserApi#logoutUser"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -312,6 +430,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + # **updateUser** > updateUser(username, body) @@ -323,18 +446,30 @@ This can only be done by the logged in user. ### Example ```java // Import classes: -//import org.openapitools.client.ApiException; -//import org.openapitools.client.api.UserApi; +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.UserApi; +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://petstore.swagger.io:80/v2"); -UserApi apiInstance = new UserApi(); -String username = "username_example"; // String | name that need to be deleted -User body = new User(); // User | Updated user object -try { - apiInstance.updateUser(username, body); -} catch (ApiException e) { - System.err.println("Exception when calling UserApi#updateUser"); - e.printStackTrace(); + UserApi apiInstance = new UserApi(defaultClient); + String username = "username_example"; // String | name that need to be deleted + User body = new User(); // User | Updated user object + try { + apiInstance.updateUser(username, body); + } catch (ApiException e) { + System.err.println("Exception when calling UserApi#updateUser"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } } ``` @@ -358,3 +493,9 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid user supplied | - | +**404** | User not found | - | + diff --git a/samples/client/petstore/java/okhttp-gson/pom.xml b/samples/client/petstore/java/okhttp-gson/pom.xml index f07572a920..8d13db0ce5 100644 --- a/samples/client/petstore/java/okhttp-gson/pom.xml +++ b/samples/client/petstore/java/okhttp-gson/pom.xml @@ -142,6 +142,15 @@ jar + + + + http.response.details + a + Http Response Details: + + + diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java index df8a2099b9..c9978a6f86 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java @@ -60,6 +60,11 @@ public class AnotherFakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call call123testSpecialTagsCall(Client body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -109,6 +114,11 @@ public class AnotherFakeApi { * @param body client model (required) * @return Client * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public Client call123testSpecialTags(Client body) throws ApiException { ApiResponse localVarResp = call123testSpecialTagsWithHttpInfo(body); @@ -121,6 +131,11 @@ public class AnotherFakeApi { * @param body client model (required) * @return ApiResponse<Client> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public ApiResponse call123testSpecialTagsWithHttpInfo(Client body) throws ApiException { okhttp3.Call localVarCall = call123testSpecialTagsValidateBeforeCall(body, null); @@ -135,6 +150,11 @@ public class AnotherFakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call call123testSpecialTagsAsync(Client body, final ApiCallback _callback) throws ApiException { diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java index b5eb5fc1ac..44c7a97ffc 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java @@ -68,6 +68,11 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call createXmlItemCall(XmlItem xmlItem, final ApiCallback _callback) throws ApiException { Object localVarPostBody = xmlItem; @@ -116,6 +121,11 @@ public class FakeApi { * this route creates an XmlItem * @param xmlItem XmlItem Body (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public void createXmlItem(XmlItem xmlItem) throws ApiException { createXmlItemWithHttpInfo(xmlItem); @@ -127,6 +137,11 @@ public class FakeApi { * @param xmlItem XmlItem Body (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public ApiResponse createXmlItemWithHttpInfo(XmlItem xmlItem) throws ApiException { okhttp3.Call localVarCall = createXmlItemValidateBeforeCall(xmlItem, null); @@ -140,6 +155,11 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call createXmlItemAsync(XmlItem xmlItem, final ApiCallback _callback) throws ApiException { @@ -153,6 +173,11 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Output boolean -
*/ public okhttp3.Call fakeOuterBooleanSerializeCall(Boolean body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -197,6 +222,11 @@ public class FakeApi { * @param body Input boolean as post body (optional) * @return Boolean * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Output boolean -
*/ public Boolean fakeOuterBooleanSerialize(Boolean body) throws ApiException { ApiResponse localVarResp = fakeOuterBooleanSerializeWithHttpInfo(body); @@ -209,6 +239,11 @@ public class FakeApi { * @param body Input boolean as post body (optional) * @return ApiResponse<Boolean> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Output boolean -
*/ public ApiResponse fakeOuterBooleanSerializeWithHttpInfo(Boolean body) throws ApiException { okhttp3.Call localVarCall = fakeOuterBooleanSerializeValidateBeforeCall(body, null); @@ -223,6 +258,11 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Output boolean -
*/ public okhttp3.Call fakeOuterBooleanSerializeAsync(Boolean body, final ApiCallback _callback) throws ApiException { @@ -237,6 +277,11 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Output composite -
*/ public okhttp3.Call fakeOuterCompositeSerializeCall(OuterComposite body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -281,6 +326,11 @@ public class FakeApi { * @param body Input composite as post body (optional) * @return OuterComposite * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Output composite -
*/ public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws ApiException { ApiResponse localVarResp = fakeOuterCompositeSerializeWithHttpInfo(body); @@ -293,6 +343,11 @@ public class FakeApi { * @param body Input composite as post body (optional) * @return ApiResponse<OuterComposite> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Output composite -
*/ public ApiResponse fakeOuterCompositeSerializeWithHttpInfo(OuterComposite body) throws ApiException { okhttp3.Call localVarCall = fakeOuterCompositeSerializeValidateBeforeCall(body, null); @@ -307,6 +362,11 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Output composite -
*/ public okhttp3.Call fakeOuterCompositeSerializeAsync(OuterComposite body, final ApiCallback _callback) throws ApiException { @@ -321,6 +381,11 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Output number -
*/ public okhttp3.Call fakeOuterNumberSerializeCall(BigDecimal body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -365,6 +430,11 @@ public class FakeApi { * @param body Input number as post body (optional) * @return BigDecimal * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Output number -
*/ public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws ApiException { ApiResponse localVarResp = fakeOuterNumberSerializeWithHttpInfo(body); @@ -377,6 +447,11 @@ public class FakeApi { * @param body Input number as post body (optional) * @return ApiResponse<BigDecimal> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Output number -
*/ public ApiResponse fakeOuterNumberSerializeWithHttpInfo(BigDecimal body) throws ApiException { okhttp3.Call localVarCall = fakeOuterNumberSerializeValidateBeforeCall(body, null); @@ -391,6 +466,11 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Output number -
*/ public okhttp3.Call fakeOuterNumberSerializeAsync(BigDecimal body, final ApiCallback _callback) throws ApiException { @@ -405,6 +485,11 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Output string -
*/ public okhttp3.Call fakeOuterStringSerializeCall(String body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -449,6 +534,11 @@ public class FakeApi { * @param body Input string as post body (optional) * @return String * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Output string -
*/ public String fakeOuterStringSerialize(String body) throws ApiException { ApiResponse localVarResp = fakeOuterStringSerializeWithHttpInfo(body); @@ -461,6 +551,11 @@ public class FakeApi { * @param body Input string as post body (optional) * @return ApiResponse<String> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Output string -
*/ public ApiResponse fakeOuterStringSerializeWithHttpInfo(String body) throws ApiException { okhttp3.Call localVarCall = fakeOuterStringSerializeValidateBeforeCall(body, null); @@ -475,6 +570,11 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Output string -
*/ public okhttp3.Call fakeOuterStringSerializeAsync(String body, final ApiCallback _callback) throws ApiException { @@ -489,6 +589,11 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Success -
*/ public okhttp3.Call testBodyWithFileSchemaCall(FileSchemaTestClass body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -537,6 +642,11 @@ public class FakeApi { * For this test, the body for this request much reference a schema named `File`. * @param body (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Success -
*/ public void testBodyWithFileSchema(FileSchemaTestClass body) throws ApiException { testBodyWithFileSchemaWithHttpInfo(body); @@ -548,6 +658,11 @@ public class FakeApi { * @param body (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Success -
*/ public ApiResponse testBodyWithFileSchemaWithHttpInfo(FileSchemaTestClass body) throws ApiException { okhttp3.Call localVarCall = testBodyWithFileSchemaValidateBeforeCall(body, null); @@ -561,6 +676,11 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Success -
*/ public okhttp3.Call testBodyWithFileSchemaAsync(FileSchemaTestClass body, final ApiCallback _callback) throws ApiException { @@ -575,6 +695,11 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Success -
*/ public okhttp3.Call testBodyWithQueryParamsCall(String query, User body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -633,6 +758,11 @@ public class FakeApi { * @param query (required) * @param body (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Success -
*/ public void testBodyWithQueryParams(String query, User body) throws ApiException { testBodyWithQueryParamsWithHttpInfo(query, body); @@ -645,6 +775,11 @@ public class FakeApi { * @param body (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 Success -
*/ public ApiResponse testBodyWithQueryParamsWithHttpInfo(String query, User body) throws ApiException { okhttp3.Call localVarCall = testBodyWithQueryParamsValidateBeforeCall(query, body, null); @@ -659,6 +794,11 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 Success -
*/ public okhttp3.Call testBodyWithQueryParamsAsync(String query, User body, final ApiCallback _callback) throws ApiException { @@ -672,6 +812,11 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call testClientModelCall(Client body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -721,6 +866,11 @@ public class FakeApi { * @param body client model (required) * @return Client * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public Client testClientModel(Client body) throws ApiException { ApiResponse localVarResp = testClientModelWithHttpInfo(body); @@ -733,6 +883,11 @@ public class FakeApi { * @param body client model (required) * @return ApiResponse<Client> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public ApiResponse testClientModelWithHttpInfo(Client body) throws ApiException { okhttp3.Call localVarCall = testClientModelValidateBeforeCall(body, null); @@ -747,6 +902,11 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call testClientModelAsync(Client body, final ApiCallback _callback) throws ApiException { @@ -774,6 +934,12 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid username supplied -
404 User not found -
*/ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -906,6 +1072,12 @@ public class FakeApi { * @param password None (optional) * @param paramCallback None (optional) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid username supplied -
404 User not found -
*/ public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); @@ -930,6 +1102,12 @@ public class FakeApi { * @param paramCallback None (optional) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid username supplied -
404 User not found -
*/ public ApiResponse testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException { okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, null); @@ -956,6 +1134,12 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid username supplied -
404 User not found -
*/ public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException { @@ -976,6 +1160,12 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid request -
404 Not found -
*/ public okhttp3.Call testEnumParametersCall(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -1058,6 +1248,12 @@ public class FakeApi { * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid request -
404 Not found -
*/ public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString) throws ApiException { testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); @@ -1076,6 +1272,12 @@ public class FakeApi { * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid request -
404 Not found -
*/ public ApiResponse testEnumParametersWithHttpInfo(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString) throws ApiException { okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, null); @@ -1096,6 +1298,12 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid request -
404 Not found -
*/ public okhttp3.Call testEnumParametersAsync(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, final ApiCallback _callback) throws ApiException { @@ -1241,6 +1449,11 @@ public class FakeApi { * @param _callback ApiCallback API callback * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
400 Someting wrong -
*/ public okhttp3.Call buildCall(final ApiCallback _callback) throws ApiException { return testGroupParametersCall(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, _callback); @@ -1249,6 +1462,11 @@ public class FakeApi { /** * Execute testGroupParameters request * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
400 Someting wrong -
*/ public void execute() throws ApiException { testGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); @@ -1258,6 +1476,11 @@ public class FakeApi { * Execute testGroupParameters request with HTTP info returned * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
400 Someting wrong -
*/ public ApiResponse executeWithHttpInfo() throws ApiException { return testGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group); @@ -1268,6 +1491,11 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
400 Someting wrong -
*/ public okhttp3.Call executeAsync(final ApiCallback _callback) throws ApiException { return testGroupParametersAsync(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, _callback); @@ -1281,6 +1509,11 @@ public class FakeApi { * @param requiredBooleanGroup Required Boolean in group parameters (required) * @param requiredInt64Group Required Integer in group parameters (required) * @return APItestGroupParametersRequest + * @http.response.details + + + +
Status Code Description Response Headers
400 Someting wrong -
*/ public APItestGroupParametersRequest testGroupParameters(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group) { return new APItestGroupParametersRequest(requiredStringGroup, requiredBooleanGroup, requiredInt64Group); @@ -1291,6 +1524,11 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call testInlineAdditionalPropertiesCall(Map param, final ApiCallback _callback) throws ApiException { Object localVarPostBody = param; @@ -1339,6 +1577,11 @@ public class FakeApi { * * @param param request body (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public void testInlineAdditionalProperties(Map param) throws ApiException { testInlineAdditionalPropertiesWithHttpInfo(param); @@ -1350,6 +1593,11 @@ public class FakeApi { * @param param request body (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public ApiResponse testInlineAdditionalPropertiesWithHttpInfo(Map param) throws ApiException { okhttp3.Call localVarCall = testInlineAdditionalPropertiesValidateBeforeCall(param, null); @@ -1363,6 +1611,11 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call testInlineAdditionalPropertiesAsync(Map param, final ApiCallback _callback) throws ApiException { @@ -1377,6 +1630,11 @@ public class FakeApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call testJsonFormDataCall(String param, String param2, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -1439,6 +1697,11 @@ public class FakeApi { * @param param field1 (required) * @param param2 field2 (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public void testJsonFormData(String param, String param2) throws ApiException { testJsonFormDataWithHttpInfo(param, param2); @@ -1451,6 +1714,11 @@ public class FakeApi { * @param param2 field2 (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public ApiResponse testJsonFormDataWithHttpInfo(String param, String param2) throws ApiException { okhttp3.Call localVarCall = testJsonFormDataValidateBeforeCall(param, param2, null); @@ -1465,6 +1733,11 @@ public class FakeApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call testJsonFormDataAsync(String param, String param2, final ApiCallback _callback) throws ApiException { diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java index 58f139f083..621c27fd29 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java @@ -60,6 +60,11 @@ public class FakeClassnameTags123Api { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call testClassnameCall(Client body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -109,6 +114,11 @@ public class FakeClassnameTags123Api { * @param body client model (required) * @return Client * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public Client testClassname(Client body) throws ApiException { ApiResponse localVarResp = testClassnameWithHttpInfo(body); @@ -121,6 +131,11 @@ public class FakeClassnameTags123Api { * @param body client model (required) * @return ApiResponse<Client> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public ApiResponse testClassnameWithHttpInfo(Client body) throws ApiException { okhttp3.Call localVarCall = testClassnameValidateBeforeCall(body, null); @@ -135,6 +150,11 @@ public class FakeClassnameTags123Api { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call testClassnameAsync(Client body, final ApiCallback _callback) throws ApiException { diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java index 4de2d24953..ce889eb24e 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/PetApi.java @@ -62,6 +62,12 @@ public class PetApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
405 Invalid input -
*/ public okhttp3.Call addPetCall(Pet body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -110,6 +116,12 @@ public class PetApi { * * @param body Pet object that needs to be added to the store (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
405 Invalid input -
*/ public void addPet(Pet body) throws ApiException { addPetWithHttpInfo(body); @@ -121,6 +133,12 @@ public class PetApi { * @param body Pet object that needs to be added to the store (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
405 Invalid input -
*/ public ApiResponse addPetWithHttpInfo(Pet body) throws ApiException { okhttp3.Call localVarCall = addPetValidateBeforeCall(body, null); @@ -134,6 +152,12 @@ public class PetApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
405 Invalid input -
*/ public okhttp3.Call addPetAsync(Pet body, final ApiCallback _callback) throws ApiException { @@ -148,6 +172,12 @@ public class PetApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid pet value -
*/ public okhttp3.Call deletePetCall(Long petId, String apiKey, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -202,6 +232,12 @@ public class PetApi { * @param petId Pet id to delete (required) * @param apiKey (optional) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid pet value -
*/ public void deletePet(Long petId, String apiKey) throws ApiException { deletePetWithHttpInfo(petId, apiKey); @@ -214,6 +250,12 @@ public class PetApi { * @param apiKey (optional) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid pet value -
*/ public ApiResponse deletePetWithHttpInfo(Long petId, String apiKey) throws ApiException { okhttp3.Call localVarCall = deletePetValidateBeforeCall(petId, apiKey, null); @@ -228,6 +270,12 @@ public class PetApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid pet value -
*/ public okhttp3.Call deletePetAsync(Long petId, String apiKey, final ApiCallback _callback) throws ApiException { @@ -241,6 +289,12 @@ public class PetApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid status value -
*/ public okhttp3.Call findPetsByStatusCall(List status, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -294,6 +348,12 @@ public class PetApi { * @param status Status values that need to be considered for filter (required) * @return List<Pet> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid status value -
*/ public List findPetsByStatus(List status) throws ApiException { ApiResponse> localVarResp = findPetsByStatusWithHttpInfo(status); @@ -306,6 +366,12 @@ public class PetApi { * @param status Status values that need to be considered for filter (required) * @return ApiResponse<List<Pet>> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid status value -
*/ public ApiResponse> findPetsByStatusWithHttpInfo(List status) throws ApiException { okhttp3.Call localVarCall = findPetsByStatusValidateBeforeCall(status, null); @@ -320,6 +386,12 @@ public class PetApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid status value -
*/ public okhttp3.Call findPetsByStatusAsync(List status, final ApiCallback> _callback) throws ApiException { @@ -334,6 +406,12 @@ public class PetApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid tag value -
* @deprecated */ @Deprecated @@ -390,6 +468,12 @@ public class PetApi { * @param tags Tags to filter by (required) * @return List<Pet> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid tag value -
* @deprecated */ @Deprecated @@ -404,6 +488,12 @@ public class PetApi { * @param tags Tags to filter by (required) * @return ApiResponse<List<Pet>> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid tag value -
* @deprecated */ @Deprecated @@ -420,6 +510,12 @@ public class PetApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid tag value -
* @deprecated */ @Deprecated @@ -436,6 +532,13 @@ public class PetApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Pet not found -
*/ public okhttp3.Call getPetByIdCall(Long petId, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -486,6 +589,13 @@ public class PetApi { * @param petId ID of pet to return (required) * @return Pet * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Pet not found -
*/ public Pet getPetById(Long petId) throws ApiException { ApiResponse localVarResp = getPetByIdWithHttpInfo(petId); @@ -498,6 +608,13 @@ public class PetApi { * @param petId ID of pet to return (required) * @return ApiResponse<Pet> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Pet not found -
*/ public ApiResponse getPetByIdWithHttpInfo(Long petId) throws ApiException { okhttp3.Call localVarCall = getPetByIdValidateBeforeCall(petId, null); @@ -512,6 +629,13 @@ public class PetApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Pet not found -
*/ public okhttp3.Call getPetByIdAsync(Long petId, final ApiCallback _callback) throws ApiException { @@ -526,6 +650,14 @@ public class PetApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Pet not found -
405 Validation exception -
*/ public okhttp3.Call updatePetCall(Pet body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -574,6 +706,14 @@ public class PetApi { * * @param body Pet object that needs to be added to the store (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Pet not found -
405 Validation exception -
*/ public void updatePet(Pet body) throws ApiException { updatePetWithHttpInfo(body); @@ -585,6 +725,14 @@ public class PetApi { * @param body Pet object that needs to be added to the store (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Pet not found -
405 Validation exception -
*/ public ApiResponse updatePetWithHttpInfo(Pet body) throws ApiException { okhttp3.Call localVarCall = updatePetValidateBeforeCall(body, null); @@ -598,6 +746,14 @@ public class PetApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Pet not found -
405 Validation exception -
*/ public okhttp3.Call updatePetAsync(Pet body, final ApiCallback _callback) throws ApiException { @@ -613,6 +769,11 @@ public class PetApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
405 Invalid input -
*/ public okhttp3.Call updatePetWithFormCall(Long petId, String name, String status, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -672,6 +833,11 @@ public class PetApi { * @param name Updated name of the pet (optional) * @param status Updated status of the pet (optional) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
405 Invalid input -
*/ public void updatePetWithForm(Long petId, String name, String status) throws ApiException { updatePetWithFormWithHttpInfo(petId, name, status); @@ -685,6 +851,11 @@ public class PetApi { * @param status Updated status of the pet (optional) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
405 Invalid input -
*/ public ApiResponse updatePetWithFormWithHttpInfo(Long petId, String name, String status) throws ApiException { okhttp3.Call localVarCall = updatePetWithFormValidateBeforeCall(petId, name, status, null); @@ -700,6 +871,11 @@ public class PetApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
405 Invalid input -
*/ public okhttp3.Call updatePetWithFormAsync(Long petId, String name, String status, final ApiCallback _callback) throws ApiException { @@ -715,6 +891,11 @@ public class PetApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call uploadFileCall(Long petId, String additionalMetadata, File file, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -775,6 +956,11 @@ public class PetApi { * @param file file to upload (optional) * @return ModelApiResponse * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File file) throws ApiException { ApiResponse localVarResp = uploadFileWithHttpInfo(petId, additionalMetadata, file); @@ -789,6 +975,11 @@ public class PetApi { * @param file file to upload (optional) * @return ApiResponse<ModelApiResponse> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public ApiResponse uploadFileWithHttpInfo(Long petId, String additionalMetadata, File file) throws ApiException { okhttp3.Call localVarCall = uploadFileValidateBeforeCall(petId, additionalMetadata, file, null); @@ -805,6 +996,11 @@ public class PetApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call uploadFileAsync(Long petId, String additionalMetadata, File file, final ApiCallback _callback) throws ApiException { @@ -821,6 +1017,11 @@ public class PetApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call uploadFileWithRequiredFileCall(Long petId, File requiredFile, String additionalMetadata, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -886,6 +1087,11 @@ public class PetApi { * @param additionalMetadata Additional data to pass to server (optional) * @return ModelApiResponse * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public ModelApiResponse uploadFileWithRequiredFile(Long petId, File requiredFile, String additionalMetadata) throws ApiException { ApiResponse localVarResp = uploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata); @@ -900,6 +1106,11 @@ public class PetApi { * @param additionalMetadata Additional data to pass to server (optional) * @return ApiResponse<ModelApiResponse> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public ApiResponse uploadFileWithRequiredFileWithHttpInfo(Long petId, File requiredFile, String additionalMetadata) throws ApiException { okhttp3.Call localVarCall = uploadFileWithRequiredFileValidateBeforeCall(petId, requiredFile, additionalMetadata, null); @@ -916,6 +1127,11 @@ public class PetApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call uploadFileWithRequiredFileAsync(Long petId, File requiredFile, String additionalMetadata, final ApiCallback _callback) throws ApiException { diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/StoreApi.java index 2e40d53096..d61f727194 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/StoreApi.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/StoreApi.java @@ -60,6 +60,12 @@ public class StoreApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid ID supplied -
404 Order not found -
*/ public okhttp3.Call deleteOrderCall(String orderId, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -109,6 +115,12 @@ public class StoreApi { * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors * @param orderId ID of the order that needs to be deleted (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid ID supplied -
404 Order not found -
*/ public void deleteOrder(String orderId) throws ApiException { deleteOrderWithHttpInfo(orderId); @@ -120,6 +132,12 @@ public class StoreApi { * @param orderId ID of the order that needs to be deleted (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid ID supplied -
404 Order not found -
*/ public ApiResponse deleteOrderWithHttpInfo(String orderId) throws ApiException { okhttp3.Call localVarCall = deleteOrderValidateBeforeCall(orderId, null); @@ -133,6 +151,12 @@ public class StoreApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid ID supplied -
404 Order not found -
*/ public okhttp3.Call deleteOrderAsync(String orderId, final ApiCallback _callback) throws ApiException { @@ -145,6 +169,11 @@ public class StoreApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call getInventoryCall(final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -188,6 +217,11 @@ public class StoreApi { * Returns a map of status codes to quantities * @return Map<String, Integer> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public Map getInventory() throws ApiException { ApiResponse> localVarResp = getInventoryWithHttpInfo(); @@ -199,6 +233,11 @@ public class StoreApi { * Returns a map of status codes to quantities * @return ApiResponse<Map<String, Integer>> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public ApiResponse> getInventoryWithHttpInfo() throws ApiException { okhttp3.Call localVarCall = getInventoryValidateBeforeCall(null); @@ -212,6 +251,11 @@ public class StoreApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
200 successful operation -
*/ public okhttp3.Call getInventoryAsync(final ApiCallback> _callback) throws ApiException { @@ -226,6 +270,13 @@ public class StoreApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Order not found -
*/ public okhttp3.Call getOrderByIdCall(Long orderId, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -276,6 +327,13 @@ public class StoreApi { * @param orderId ID of pet that needs to be fetched (required) * @return Order * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Order not found -
*/ public Order getOrderById(Long orderId) throws ApiException { ApiResponse localVarResp = getOrderByIdWithHttpInfo(orderId); @@ -288,6 +346,13 @@ public class StoreApi { * @param orderId ID of pet that needs to be fetched (required) * @return ApiResponse<Order> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Order not found -
*/ public ApiResponse getOrderByIdWithHttpInfo(Long orderId) throws ApiException { okhttp3.Call localVarCall = getOrderByIdValidateBeforeCall(orderId, null); @@ -302,6 +367,13 @@ public class StoreApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid ID supplied -
404 Order not found -
*/ public okhttp3.Call getOrderByIdAsync(Long orderId, final ApiCallback _callback) throws ApiException { @@ -316,6 +388,12 @@ public class StoreApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid Order -
*/ public okhttp3.Call placeOrderCall(Order body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -365,6 +443,12 @@ public class StoreApi { * @param body order placed for purchasing the pet (required) * @return Order * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid Order -
*/ public Order placeOrder(Order body) throws ApiException { ApiResponse localVarResp = placeOrderWithHttpInfo(body); @@ -377,6 +461,12 @@ public class StoreApi { * @param body order placed for purchasing the pet (required) * @return ApiResponse<Order> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid Order -
*/ public ApiResponse placeOrderWithHttpInfo(Order body) throws ApiException { okhttp3.Call localVarCall = placeOrderValidateBeforeCall(body, null); @@ -391,6 +481,12 @@ public class StoreApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid Order -
*/ public okhttp3.Call placeOrderAsync(Order body, final ApiCallback _callback) throws ApiException { diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/UserApi.java index 408cd9e87f..f3e783d0bc 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/UserApi.java @@ -60,6 +60,11 @@ public class UserApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public okhttp3.Call createUserCall(User body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -108,6 +113,11 @@ public class UserApi { * This can only be done by the logged in user. * @param body Created user object (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public void createUser(User body) throws ApiException { createUserWithHttpInfo(body); @@ -119,6 +129,11 @@ public class UserApi { * @param body Created user object (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public ApiResponse createUserWithHttpInfo(User body) throws ApiException { okhttp3.Call localVarCall = createUserValidateBeforeCall(body, null); @@ -132,6 +147,11 @@ public class UserApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public okhttp3.Call createUserAsync(User body, final ApiCallback _callback) throws ApiException { @@ -145,6 +165,11 @@ public class UserApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public okhttp3.Call createUsersWithArrayInputCall(List body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -193,6 +218,11 @@ public class UserApi { * * @param body List of user object (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public void createUsersWithArrayInput(List body) throws ApiException { createUsersWithArrayInputWithHttpInfo(body); @@ -204,6 +234,11 @@ public class UserApi { * @param body List of user object (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public ApiResponse createUsersWithArrayInputWithHttpInfo(List body) throws ApiException { okhttp3.Call localVarCall = createUsersWithArrayInputValidateBeforeCall(body, null); @@ -217,6 +252,11 @@ public class UserApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public okhttp3.Call createUsersWithArrayInputAsync(List body, final ApiCallback _callback) throws ApiException { @@ -230,6 +270,11 @@ public class UserApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public okhttp3.Call createUsersWithListInputCall(List body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -278,6 +323,11 @@ public class UserApi { * * @param body List of user object (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public void createUsersWithListInput(List body) throws ApiException { createUsersWithListInputWithHttpInfo(body); @@ -289,6 +339,11 @@ public class UserApi { * @param body List of user object (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public ApiResponse createUsersWithListInputWithHttpInfo(List body) throws ApiException { okhttp3.Call localVarCall = createUsersWithListInputValidateBeforeCall(body, null); @@ -302,6 +357,11 @@ public class UserApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public okhttp3.Call createUsersWithListInputAsync(List body, final ApiCallback _callback) throws ApiException { @@ -315,6 +375,12 @@ public class UserApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid username supplied -
404 User not found -
*/ public okhttp3.Call deleteUserCall(String username, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -364,6 +430,12 @@ public class UserApi { * This can only be done by the logged in user. * @param username The name that needs to be deleted (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid username supplied -
404 User not found -
*/ public void deleteUser(String username) throws ApiException { deleteUserWithHttpInfo(username); @@ -375,6 +447,12 @@ public class UserApi { * @param username The name that needs to be deleted (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid username supplied -
404 User not found -
*/ public ApiResponse deleteUserWithHttpInfo(String username) throws ApiException { okhttp3.Call localVarCall = deleteUserValidateBeforeCall(username, null); @@ -388,6 +466,12 @@ public class UserApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid username supplied -
404 User not found -
*/ public okhttp3.Call deleteUserAsync(String username, final ApiCallback _callback) throws ApiException { @@ -401,6 +485,13 @@ public class UserApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid username supplied -
404 User not found -
*/ public okhttp3.Call getUserByNameCall(String username, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -451,6 +542,13 @@ public class UserApi { * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return User * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid username supplied -
404 User not found -
*/ public User getUserByName(String username) throws ApiException { ApiResponse localVarResp = getUserByNameWithHttpInfo(username); @@ -463,6 +561,13 @@ public class UserApi { * @param username The name that needs to be fetched. Use user1 for testing. (required) * @return ApiResponse<User> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid username supplied -
404 User not found -
*/ public ApiResponse getUserByNameWithHttpInfo(String username) throws ApiException { okhttp3.Call localVarCall = getUserByNameValidateBeforeCall(username, null); @@ -477,6 +582,13 @@ public class UserApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + + +
Status Code Description Response Headers
200 successful operation -
400 Invalid username supplied -
404 User not found -
*/ public okhttp3.Call getUserByNameAsync(String username, final ApiCallback _callback) throws ApiException { @@ -492,6 +604,12 @@ public class UserApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation * X-Rate-Limit - calls per hour allowed by the user
* X-Expires-After - date in UTC when token expires
400 Invalid username/password supplied -
*/ public okhttp3.Call loginUserCall(String username, String password, final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -555,6 +673,12 @@ public class UserApi { * @param password The password for login in clear text (required) * @return String * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation * X-Rate-Limit - calls per hour allowed by the user
* X-Expires-After - date in UTC when token expires
400 Invalid username/password supplied -
*/ public String loginUser(String username, String password) throws ApiException { ApiResponse localVarResp = loginUserWithHttpInfo(username, password); @@ -568,6 +692,12 @@ public class UserApi { * @param password The password for login in clear text (required) * @return ApiResponse<String> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation * X-Rate-Limit - calls per hour allowed by the user
* X-Expires-After - date in UTC when token expires
400 Invalid username/password supplied -
*/ public ApiResponse loginUserWithHttpInfo(String username, String password) throws ApiException { okhttp3.Call localVarCall = loginUserValidateBeforeCall(username, password, null); @@ -583,6 +713,12 @@ public class UserApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
200 successful operation * X-Rate-Limit - calls per hour allowed by the user
* X-Expires-After - date in UTC when token expires
400 Invalid username/password supplied -
*/ public okhttp3.Call loginUserAsync(String username, String password, final ApiCallback _callback) throws ApiException { @@ -596,6 +732,11 @@ public class UserApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public okhttp3.Call logoutUserCall(final ApiCallback _callback) throws ApiException { Object localVarPostBody = new Object(); @@ -638,6 +779,11 @@ public class UserApi { * Logs out current logged in user session * * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public void logoutUser() throws ApiException { logoutUserWithHttpInfo(); @@ -648,6 +794,11 @@ public class UserApi { * * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public ApiResponse logoutUserWithHttpInfo() throws ApiException { okhttp3.Call localVarCall = logoutUserValidateBeforeCall(null); @@ -660,6 +811,11 @@ public class UserApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + +
Status Code Description Response Headers
0 successful operation -
*/ public okhttp3.Call logoutUserAsync(final ApiCallback _callback) throws ApiException { @@ -674,6 +830,12 @@ public class UserApi { * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid user supplied -
404 User not found -
*/ public okhttp3.Call updateUserCall(String username, User body, final ApiCallback _callback) throws ApiException { Object localVarPostBody = body; @@ -729,6 +891,12 @@ public class UserApi { * @param username name that need to be deleted (required) * @param body Updated user object (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid user supplied -
404 User not found -
*/ public void updateUser(String username, User body) throws ApiException { updateUserWithHttpInfo(username, body); @@ -741,6 +909,12 @@ public class UserApi { * @param body Updated user object (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid user supplied -
404 User not found -
*/ public ApiResponse updateUserWithHttpInfo(String username, User body) throws ApiException { okhttp3.Call localVarCall = updateUserValidateBeforeCall(username, body, null); @@ -755,6 +929,12 @@ public class UserApi { * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + +
Status Code Description Response Headers
400 Invalid user supplied -
404 User not found -
*/ public okhttp3.Call updateUserAsync(String username, User body, final ApiCallback _callback) throws ApiException { diff --git a/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION b/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION +++ b/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/resteasy/.openapi-generator/VERSION b/samples/client/petstore/java/resteasy/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/java/resteasy/.openapi-generator/VERSION +++ b/samples/client/petstore/java/resteasy/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/resteasy/build.gradle b/samples/client/petstore/java/resteasy/build.gradle index 5175961684..05c630abf5 100644 --- a/samples/client/petstore/java/resteasy/build.gradle +++ b/samples/client/petstore/java/resteasy/build.gradle @@ -94,9 +94,9 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.21" - jackson_version = "2.8.11" - jackson_databind_version = "2.8.11.3" + swagger_annotations_version = "1.5.22" + jackson_version = "2.9.9" + jackson_databind_version = "2.9.9" threetenbp_version = "2.6.4" resteasy_version = "3.1.3.Final" jodatime_version = "2.9.9" diff --git a/samples/client/petstore/java/resteasy/build.sbt b/samples/client/petstore/java/resteasy/build.sbt index 0f24d06dd8..9b2cf7539f 100644 --- a/samples/client/petstore/java/resteasy/build.sbt +++ b/samples/client/petstore/java/resteasy/build.sbt @@ -9,15 +9,15 @@ lazy val root = (project in file(".")). publishArtifact in (Compile, packageDoc) := false, resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( - "io.swagger" % "swagger-annotations" % "1.5.21" % "compile", + "io.swagger" % "swagger-annotations" % "1.5.22" % "compile", "org.jboss.resteasy" % "resteasy-client" % "3.1.3.Final" % "compile", "org.jboss.resteasy" % "resteasy-multipart-provider" % "3.1.3.Final" % "compile", "org.jboss.resteasy" % "resteasy-jackson2-provider" % "3.1.3.Final" % "compile", - "com.fasterxml.jackson.core" % "jackson-core" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.11.3" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile", "com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile", - "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.7.5" % "compile", + "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9" % "compile", "joda-time" % "joda-time" % "2.9.9" % "compile", "com.brsanthu" % "migbase64" % "2.2" % "compile", "junit" % "junit" % "4.12" % "test", diff --git a/samples/client/petstore/java/resteasy/pom.xml b/samples/client/petstore/java/resteasy/pom.xml index 4e1c2434b4..ed8cee8d12 100644 --- a/samples/client/petstore/java/resteasy/pom.xml +++ b/samples/client/petstore/java/resteasy/pom.xml @@ -230,10 +230,10 @@ UTF-8 - 1.5.21 + 1.5.22 3.1.3.Final - 2.8.11 - 2.8.11.3 + 2.9.9 + 2.9.9 2.6.4 2.9.9 1.0.0 diff --git a/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION +++ b/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/resttemplate-withXml/build.gradle b/samples/client/petstore/java/resttemplate-withXml/build.gradle index d1b88779ab..98c7c36ba5 100644 --- a/samples/client/petstore/java/resttemplate-withXml/build.gradle +++ b/samples/client/petstore/java/resttemplate-withXml/build.gradle @@ -95,9 +95,9 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.21" - jackson_version = "2.8.11" - jackson_databind_version = "2.8.11.3" + swagger_annotations_version = "1.5.22" + jackson_version = "2.9.9" + jackson_databind_version = "2.9.9" spring_web_version = "4.3.9.RELEASE" jodatime_version = "2.9.9" junit_version = "4.12" diff --git a/samples/client/petstore/java/resttemplate-withXml/pom.xml b/samples/client/petstore/java/resttemplate-withXml/pom.xml index 0e748a6d9c..fe4ba6cf40 100644 --- a/samples/client/petstore/java/resttemplate-withXml/pom.xml +++ b/samples/client/petstore/java/resttemplate-withXml/pom.xml @@ -253,10 +253,10 @@ UTF-8 - 1.5.21 + 1.5.22 4.3.9.RELEASE - 2.8.11 - 2.8.11.3 + 2.9.9 + 2.9.9 2.6.4 1.0.0 4.12 diff --git a/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION +++ b/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/resttemplate/build.gradle b/samples/client/petstore/java/resttemplate/build.gradle index 7b5edb17ba..583a0a3059 100644 --- a/samples/client/petstore/java/resttemplate/build.gradle +++ b/samples/client/petstore/java/resttemplate/build.gradle @@ -95,9 +95,9 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.21" - jackson_version = "2.8.11" - jackson_databind_version = "2.8.11.3" + swagger_annotations_version = "1.5.22" + jackson_version = "2.9.9" + jackson_databind_version = "2.9.9" spring_web_version = "4.3.9.RELEASE" jodatime_version = "2.9.9" junit_version = "4.12" diff --git a/samples/client/petstore/java/resttemplate/pom.xml b/samples/client/petstore/java/resttemplate/pom.xml index 0b6a17d0b6..ff4d882ede 100644 --- a/samples/client/petstore/java/resttemplate/pom.xml +++ b/samples/client/petstore/java/resttemplate/pom.xml @@ -245,10 +245,10 @@ UTF-8 - 1.5.21 + 1.5.22 4.3.9.RELEASE - 2.8.11 - 2.8.11.3 + 2.9.9 + 2.9.9 2.6.4 1.0.0 4.12 diff --git a/samples/client/petstore/java/retrofit/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/java/retrofit/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/retrofit2-play24/build.gradle b/samples/client/petstore/java/retrofit2-play24/build.gradle index 335cb0c963..27249fb718 100644 --- a/samples/client/petstore/java/retrofit2-play24/build.gradle +++ b/samples/client/petstore/java/retrofit2-play24/build.gradle @@ -99,7 +99,7 @@ ext { retrofit_version = "2.3.0" jackson_version = "2.6.6" play_version = "2.4.11" - swagger_annotations_version = "1.5.21" + swagger_annotations_version = "1.5.22" junit_version = "4.12" json_fire_version = "1.8.0" } diff --git a/samples/client/petstore/java/retrofit2-play24/pom.xml b/samples/client/petstore/java/retrofit2-play24/pom.xml index 8ed00f4b63..1a8e875825 100644 --- a/samples/client/petstore/java/retrofit2-play24/pom.xml +++ b/samples/client/petstore/java/retrofit2-play24/pom.xml @@ -267,8 +267,8 @@ ${java.version} ${java.version} 1.8.3 - 1.5.21 - 2.8.11.3 + 1.5.22 + 2.9.9 2.6.6 2.4.11 2.5.0 diff --git a/samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/retrofit2-play25/build.gradle b/samples/client/petstore/java/retrofit2-play25/build.gradle index e9b5327749..217f0b4523 100644 --- a/samples/client/petstore/java/retrofit2-play25/build.gradle +++ b/samples/client/petstore/java/retrofit2-play25/build.gradle @@ -97,9 +97,9 @@ if(hasProperty('target') && target == 'android') { ext { oltu_version = "1.0.1" retrofit_version = "2.3.0" - jackson_version = "2.7.8" + jackson_version = "2.9.9" play_version = "2.5.14" - swagger_annotations_version = "1.5.21" + swagger_annotations_version = "1.5.22" junit_version = "4.12" threetenbp_version = "1.3.5" json_fire_version = "1.8.0" diff --git a/samples/client/petstore/java/retrofit2-play25/build.sbt b/samples/client/petstore/java/retrofit2-play25/build.sbt index 1f17d6bfc9..e0ba78560f 100644 --- a/samples/client/petstore/java/retrofit2-play25/build.sbt +++ b/samples/client/petstore/java/retrofit2-play25/build.sbt @@ -12,9 +12,9 @@ lazy val root = (project in file(".")). "com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile", "com.typesafe.play" % "play-java-ws_2.11" % "2.5.15" % "compile", - "com.fasterxml.jackson.core" % "jackson-core" % "2.7.8" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.8" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.8" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile", "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", diff --git a/samples/client/petstore/java/retrofit2-play25/pom.xml b/samples/client/petstore/java/retrofit2-play25/pom.xml index e00541e270..ced3973a7c 100644 --- a/samples/client/petstore/java/retrofit2-play25/pom.xml +++ b/samples/client/petstore/java/retrofit2-play25/pom.xml @@ -272,9 +272,9 @@ ${java.version} ${java.version} 1.8.3 - 1.5.21 - 2.8.11.3 - 2.7.8 + 1.5.22 + 2.9.9 + 2.9.9 2.5.15 2.5.0 1.3.8 diff --git a/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/retrofit2-play26/build.gradle b/samples/client/petstore/java/retrofit2-play26/build.gradle index 9f8584c647..9807ba7527 100644 --- a/samples/client/petstore/java/retrofit2-play26/build.gradle +++ b/samples/client/petstore/java/retrofit2-play26/build.gradle @@ -97,10 +97,10 @@ if(hasProperty('target') && target == 'android') { ext { oltu_version = "1.0.1" retrofit_version = "2.3.0" - jackson_version = "2.8.11" - jackson_databind_version = "2.8.11.3" + jackson_version = "2.9.9" + jackson_databind_version = "2.9.9" play_version = "2.6.7" - swagger_annotations_version = "1.5.21" + swagger_annotations_version = "1.5.22" junit_version = "4.12" threetenbp_version = "1.3.5" json_fire_version = "1.8.0" diff --git a/samples/client/petstore/java/retrofit2-play26/build.sbt b/samples/client/petstore/java/retrofit2-play26/build.sbt index 82aa18736e..700e77c21d 100644 --- a/samples/client/petstore/java/retrofit2-play26/build.sbt +++ b/samples/client/petstore/java/retrofit2-play26/build.sbt @@ -13,9 +13,9 @@ lazy val root = (project in file(".")). "com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile", "com.typesafe.play" % "play-ahc-ws_2.12" % "2.6.7" % "compile", "javax.validation" % "validation-api" % "1.1.0.Final" % "compile", - "com.fasterxml.jackson.core" % "jackson-core" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.11" % "compile", - "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.11.3" % "compile", + "com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile", "com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", diff --git a/samples/client/petstore/java/retrofit2-play26/pom.xml b/samples/client/petstore/java/retrofit2-play26/pom.xml index 2ca39726b1..4a764c94f8 100644 --- a/samples/client/petstore/java/retrofit2-play26/pom.xml +++ b/samples/client/petstore/java/retrofit2-play26/pom.xml @@ -277,9 +277,9 @@ ${java.version} ${java.version} 1.8.3 - 1.5.21 - 2.8.11.3 - 2.8.11 + 1.5.22 + 2.9.9 + 2.9.9 2.6.7 2.5.0 1.3.8 diff --git a/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/retrofit2/build.gradle b/samples/client/petstore/java/retrofit2/build.gradle index 2a4c0ce4fc..65eb8fc672 100644 --- a/samples/client/petstore/java/retrofit2/build.gradle +++ b/samples/client/petstore/java/retrofit2/build.gradle @@ -97,7 +97,7 @@ if(hasProperty('target') && target == 'android') { ext { oltu_version = "1.0.1" retrofit_version = "2.3.0" - swagger_annotations_version = "1.5.21" + swagger_annotations_version = "1.5.22" junit_version = "4.12" threetenbp_version = "1.3.5" json_fire_version = "1.8.0" diff --git a/samples/client/petstore/java/retrofit2/pom.xml b/samples/client/petstore/java/retrofit2/pom.xml index a1a1ae29f0..5307e5f124 100644 --- a/samples/client/petstore/java/retrofit2/pom.xml +++ b/samples/client/petstore/java/retrofit2/pom.xml @@ -241,7 +241,7 @@ ${java.version} ${java.version} 1.8.3 - 1.5.21 + 1.5.22 2.5.0 1.3.8 1.0.1 diff --git a/samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/retrofit2rx/build.gradle b/samples/client/petstore/java/retrofit2rx/build.gradle index 2926742562..2be7dc0d84 100644 --- a/samples/client/petstore/java/retrofit2rx/build.gradle +++ b/samples/client/petstore/java/retrofit2rx/build.gradle @@ -97,7 +97,7 @@ if(hasProperty('target') && target == 'android') { ext { oltu_version = "1.0.1" retrofit_version = "2.3.0" - swagger_annotations_version = "1.5.21" + swagger_annotations_version = "1.5.22" junit_version = "4.12" rx_java_version = "1.3.0" threetenbp_version = "1.3.5" diff --git a/samples/client/petstore/java/retrofit2rx/pom.xml b/samples/client/petstore/java/retrofit2rx/pom.xml index ca57d73d8e..7cb53b5916 100644 --- a/samples/client/petstore/java/retrofit2rx/pom.xml +++ b/samples/client/petstore/java/retrofit2rx/pom.xml @@ -251,7 +251,7 @@ ${java.version} ${java.version} 1.8.3 - 1.5.21 + 1.5.22 2.5.0 1.3.0 1.3.8 diff --git a/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/retrofit2rx2/build.gradle b/samples/client/petstore/java/retrofit2rx2/build.gradle index 872de771a4..304e3c78ee 100644 --- a/samples/client/petstore/java/retrofit2rx2/build.gradle +++ b/samples/client/petstore/java/retrofit2rx2/build.gradle @@ -97,7 +97,7 @@ if(hasProperty('target') && target == 'android') { ext { oltu_version = "1.0.1" retrofit_version = "2.3.0" - swagger_annotations_version = "1.5.21" + swagger_annotations_version = "1.5.22" junit_version = "4.12" rx_java_version = "2.1.1" threetenbp_version = "1.3.5" diff --git a/samples/client/petstore/java/retrofit2rx2/pom.xml b/samples/client/petstore/java/retrofit2rx2/pom.xml index 90ddc5d127..d4e60aced9 100644 --- a/samples/client/petstore/java/retrofit2rx2/pom.xml +++ b/samples/client/petstore/java/retrofit2rx2/pom.xml @@ -251,7 +251,7 @@ ${java.version} ${java.version} 1.8.3 - 1.5.21 + 1.5.22 2.5.0 2.1.1 1.3.8 diff --git a/samples/client/petstore/java/vertx/.openapi-generator/VERSION b/samples/client/petstore/java/vertx/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/java/vertx/.openapi-generator/VERSION +++ b/samples/client/petstore/java/vertx/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/vertx/build.gradle b/samples/client/petstore/java/vertx/build.gradle index c098a5170d..2145131264 100644 --- a/samples/client/petstore/java/vertx/build.gradle +++ b/samples/client/petstore/java/vertx/build.gradle @@ -28,8 +28,8 @@ task execute(type:JavaExec) { ext { swagger_annotations_version = "1.5.21" - jackson_version = "2.8.9" - jackson_databind_version = "2.8.11.3" + jackson_version = "2.9.9" + jackson_databind_version = "2.9.9" vertx_version = "3.4.2" junit_version = "4.12" } diff --git a/samples/client/petstore/java/vertx/pom.xml b/samples/client/petstore/java/vertx/pom.xml index 52c8f3dddf..1b536fe832 100644 --- a/samples/client/petstore/java/vertx/pom.xml +++ b/samples/client/petstore/java/vertx/pom.xml @@ -253,9 +253,9 @@ UTF-8 3.4.2 - 1.5.21 - 2.8.11 - 2.8.11.3 + 1.5.22 + 2.9.9 + 2.9.9 4.12 diff --git a/samples/client/petstore/java/webclient/.openapi-generator/VERSION b/samples/client/petstore/java/webclient/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/java/webclient/.openapi-generator/VERSION +++ b/samples/client/petstore/java/webclient/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/java/webclient/build.gradle b/samples/client/petstore/java/webclient/build.gradle index 0f635dfe95..b2be386265 100644 --- a/samples/client/petstore/java/webclient/build.gradle +++ b/samples/client/petstore/java/webclient/build.gradle @@ -32,6 +32,7 @@ if(hasProperty('target') && target == 'android') { minSdkVersion 14 targetSdkVersion 25 } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -110,9 +111,9 @@ if(hasProperty('target') && target == 'android') { } ext { - swagger_annotations_version = "1.5.17" - jackson_version = "2.8.11" - jackson_databind_version = "2.8.11.2" + swagger_annotations_version = "1.5.22" + jackson_version = "2.9.9" + jackson_databind_version = "2.9.9" jersey_version = "1.19.4" jodatime_version = "2.9.9" junit_version = "4.12" diff --git a/samples/client/petstore/java/webclient/pom.xml b/samples/client/petstore/java/webclient/pom.xml index 4b2d82b79a..262a5b0b5c 100644 --- a/samples/client/petstore/java/webclient/pom.xml +++ b/samples/client/petstore/java/webclient/pom.xml @@ -108,10 +108,10 @@ UTF-8 - 1.5.20 + 1.5.22 5.0.7.RELEASE - 2.8.11 - 2.8.11.3 + 2.9.9 + 2.9.9 4.12 3.1.8.RELEASE 0.7.8.RELEASE diff --git a/samples/client/petstore/javascript-es6/.openapi-generator/VERSION b/samples/client/petstore/javascript-es6/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/javascript-es6/.openapi-generator/VERSION +++ b/samples/client/petstore/javascript-es6/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION b/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION +++ b/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/javascript-promise/.openapi-generator/VERSION b/samples/client/petstore/javascript-promise/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/javascript-promise/.openapi-generator/VERSION +++ b/samples/client/petstore/javascript-promise/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/javascript-promise/src/ApiClient.js b/samples/client/petstore/javascript-promise/src/ApiClient.js index d925f12d58..358cf4859a 100644 --- a/samples/client/petstore/javascript-promise/src/ApiClient.js +++ b/samples/client/petstore/javascript-promise/src/ApiClient.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js b/samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js index 378918f435..5861c38500 100644 --- a/samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js +++ b/samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/api/FakeApi.js b/samples/client/petstore/javascript-promise/src/api/FakeApi.js index bccf87b9f3..a51252544e 100644 --- a/samples/client/petstore/javascript-promise/src/api/FakeApi.js +++ b/samples/client/petstore/javascript-promise/src/api/FakeApi.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js b/samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js index 382507fb3f..26ae323293 100644 --- a/samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js +++ b/samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/api/PetApi.js b/samples/client/petstore/javascript-promise/src/api/PetApi.js index 268dc614e3..33c0809e8b 100644 --- a/samples/client/petstore/javascript-promise/src/api/PetApi.js +++ b/samples/client/petstore/javascript-promise/src/api/PetApi.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/api/StoreApi.js b/samples/client/petstore/javascript-promise/src/api/StoreApi.js index afc4eae0b5..1edc756ffb 100644 --- a/samples/client/petstore/javascript-promise/src/api/StoreApi.js +++ b/samples/client/petstore/javascript-promise/src/api/StoreApi.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/api/UserApi.js b/samples/client/petstore/javascript-promise/src/api/UserApi.js index e41446e5e1..ac275781ad 100644 --- a/samples/client/petstore/javascript-promise/src/api/UserApi.js +++ b/samples/client/petstore/javascript-promise/src/api/UserApi.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/index.js b/samples/client/petstore/javascript-promise/src/index.js index d172e7c3e0..f7028db83e 100644 --- a/samples/client/petstore/javascript-promise/src/index.js +++ b/samples/client/petstore/javascript-promise/src/index.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesAnyType.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesAnyType.js index 73b58a733b..267f3041d0 100644 --- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesAnyType.js +++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesAnyType.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesArray.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesArray.js index 3a1f4ecc9d..f1d4f890be 100644 --- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesArray.js +++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesArray.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesBoolean.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesBoolean.js index 5306f6bd01..309dc0f315 100644 --- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesBoolean.js +++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesBoolean.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js index bd62237ca2..638b611596 100644 --- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js +++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesInteger.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesInteger.js index 8f678419e2..717be11a92 100644 --- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesInteger.js +++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesInteger.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesNumber.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesNumber.js index 651c8894aa..04a967d133 100644 --- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesNumber.js +++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesNumber.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesObject.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesObject.js index b5180bbe82..3e5e7a8042 100644 --- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesObject.js +++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesObject.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesString.js b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesString.js index 9181dac601..1cf681db0d 100644 --- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesString.js +++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesString.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/Animal.js b/samples/client/petstore/javascript-promise/src/model/Animal.js index 4477ebc5a9..b10270da2f 100644 --- a/samples/client/petstore/javascript-promise/src/model/Animal.js +++ b/samples/client/petstore/javascript-promise/src/model/Animal.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/ApiResponse.js b/samples/client/petstore/javascript-promise/src/model/ApiResponse.js index c7d3ebad56..3f2944d597 100644 --- a/samples/client/petstore/javascript-promise/src/model/ApiResponse.js +++ b/samples/client/petstore/javascript-promise/src/model/ApiResponse.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js b/samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js index ab73a6916d..dcd8e0c1d4 100644 --- a/samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js +++ b/samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js b/samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js index b82c364903..a86a2a9901 100644 --- a/samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js +++ b/samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/ArrayTest.js b/samples/client/petstore/javascript-promise/src/model/ArrayTest.js index 4e4a96d085..8255b45a00 100644 --- a/samples/client/petstore/javascript-promise/src/model/ArrayTest.js +++ b/samples/client/petstore/javascript-promise/src/model/ArrayTest.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/Capitalization.js b/samples/client/petstore/javascript-promise/src/model/Capitalization.js index 30232f689d..ae1fd0c469 100644 --- a/samples/client/petstore/javascript-promise/src/model/Capitalization.js +++ b/samples/client/petstore/javascript-promise/src/model/Capitalization.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/Cat.js b/samples/client/petstore/javascript-promise/src/model/Cat.js index 415bd14582..4e31715711 100644 --- a/samples/client/petstore/javascript-promise/src/model/Cat.js +++ b/samples/client/petstore/javascript-promise/src/model/Cat.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/CatAllOf.js b/samples/client/petstore/javascript-promise/src/model/CatAllOf.js index 6b26f6e753..86b0e9d9b1 100644 --- a/samples/client/petstore/javascript-promise/src/model/CatAllOf.js +++ b/samples/client/petstore/javascript-promise/src/model/CatAllOf.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/Category.js b/samples/client/petstore/javascript-promise/src/model/Category.js index 20f5627520..c8d128d4bc 100644 --- a/samples/client/petstore/javascript-promise/src/model/Category.js +++ b/samples/client/petstore/javascript-promise/src/model/Category.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/ClassModel.js b/samples/client/petstore/javascript-promise/src/model/ClassModel.js index b8ecf485e6..7da6fc886e 100644 --- a/samples/client/petstore/javascript-promise/src/model/ClassModel.js +++ b/samples/client/petstore/javascript-promise/src/model/ClassModel.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/Client.js b/samples/client/petstore/javascript-promise/src/model/Client.js index 42cabd2a03..08e68c21c0 100644 --- a/samples/client/petstore/javascript-promise/src/model/Client.js +++ b/samples/client/petstore/javascript-promise/src/model/Client.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/Dog.js b/samples/client/petstore/javascript-promise/src/model/Dog.js index 21820fddb0..105da1d74c 100644 --- a/samples/client/petstore/javascript-promise/src/model/Dog.js +++ b/samples/client/petstore/javascript-promise/src/model/Dog.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/DogAllOf.js b/samples/client/petstore/javascript-promise/src/model/DogAllOf.js index 4110fbfd30..e51ad6c75e 100644 --- a/samples/client/petstore/javascript-promise/src/model/DogAllOf.js +++ b/samples/client/petstore/javascript-promise/src/model/DogAllOf.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/EnumArrays.js b/samples/client/petstore/javascript-promise/src/model/EnumArrays.js index b8b3dc3757..6db6b6f038 100644 --- a/samples/client/petstore/javascript-promise/src/model/EnumArrays.js +++ b/samples/client/petstore/javascript-promise/src/model/EnumArrays.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/EnumClass.js b/samples/client/petstore/javascript-promise/src/model/EnumClass.js index d1e33b4d8e..72e5e9e906 100644 --- a/samples/client/petstore/javascript-promise/src/model/EnumClass.js +++ b/samples/client/petstore/javascript-promise/src/model/EnumClass.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/EnumTest.js b/samples/client/petstore/javascript-promise/src/model/EnumTest.js index 0083ab49b0..ea0657f1cb 100644 --- a/samples/client/petstore/javascript-promise/src/model/EnumTest.js +++ b/samples/client/petstore/javascript-promise/src/model/EnumTest.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/File.js b/samples/client/petstore/javascript-promise/src/model/File.js index 0d270851df..f3b57b5bd9 100644 --- a/samples/client/petstore/javascript-promise/src/model/File.js +++ b/samples/client/petstore/javascript-promise/src/model/File.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js b/samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js index 9461ed3171..88c4724af6 100644 --- a/samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js +++ b/samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/FormatTest.js b/samples/client/petstore/javascript-promise/src/model/FormatTest.js index 050a26eccb..1021f5e7c5 100644 --- a/samples/client/petstore/javascript-promise/src/model/FormatTest.js +++ b/samples/client/petstore/javascript-promise/src/model/FormatTest.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js b/samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js index 9b2205f028..11e051c3bd 100644 --- a/samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js +++ b/samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/List.js b/samples/client/petstore/javascript-promise/src/model/List.js index 288cd0f916..3831877898 100644 --- a/samples/client/petstore/javascript-promise/src/model/List.js +++ b/samples/client/petstore/javascript-promise/src/model/List.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/MapTest.js b/samples/client/petstore/javascript-promise/src/model/MapTest.js index 6d50eff835..f51233405d 100644 --- a/samples/client/petstore/javascript-promise/src/model/MapTest.js +++ b/samples/client/petstore/javascript-promise/src/model/MapTest.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js b/samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js index 4c5ab29b9e..639e878b75 100644 --- a/samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js +++ b/samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/Model200Response.js b/samples/client/petstore/javascript-promise/src/model/Model200Response.js index e5c9e8c5e7..c21fbf9be3 100644 --- a/samples/client/petstore/javascript-promise/src/model/Model200Response.js +++ b/samples/client/petstore/javascript-promise/src/model/Model200Response.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/ModelReturn.js b/samples/client/petstore/javascript-promise/src/model/ModelReturn.js index eddfd298fd..ea982d9119 100644 --- a/samples/client/petstore/javascript-promise/src/model/ModelReturn.js +++ b/samples/client/petstore/javascript-promise/src/model/ModelReturn.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/Name.js b/samples/client/petstore/javascript-promise/src/model/Name.js index 80eeb127d2..dccefb9e2d 100644 --- a/samples/client/petstore/javascript-promise/src/model/Name.js +++ b/samples/client/petstore/javascript-promise/src/model/Name.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/NumberOnly.js b/samples/client/petstore/javascript-promise/src/model/NumberOnly.js index a71b576260..607f61dd6d 100644 --- a/samples/client/petstore/javascript-promise/src/model/NumberOnly.js +++ b/samples/client/petstore/javascript-promise/src/model/NumberOnly.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/Order.js b/samples/client/petstore/javascript-promise/src/model/Order.js index 699e9fc673..1c1d05c932 100644 --- a/samples/client/petstore/javascript-promise/src/model/Order.js +++ b/samples/client/petstore/javascript-promise/src/model/Order.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/OuterComposite.js b/samples/client/petstore/javascript-promise/src/model/OuterComposite.js index faf1409f5b..2eee4f2396 100644 --- a/samples/client/petstore/javascript-promise/src/model/OuterComposite.js +++ b/samples/client/petstore/javascript-promise/src/model/OuterComposite.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/OuterEnum.js b/samples/client/petstore/javascript-promise/src/model/OuterEnum.js index 5cf00a1d8d..174afad364 100644 --- a/samples/client/petstore/javascript-promise/src/model/OuterEnum.js +++ b/samples/client/petstore/javascript-promise/src/model/OuterEnum.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/Pet.js b/samples/client/petstore/javascript-promise/src/model/Pet.js index 114ccfd7b1..5132d7172b 100644 --- a/samples/client/petstore/javascript-promise/src/model/Pet.js +++ b/samples/client/petstore/javascript-promise/src/model/Pet.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js b/samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js index 51720fc94d..f43eef275f 100644 --- a/samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js +++ b/samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js b/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js index 3b9f178097..556ee41d59 100644 --- a/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js +++ b/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/Tag.js b/samples/client/petstore/javascript-promise/src/model/Tag.js index 2bfb449378..01c5cb5363 100644 --- a/samples/client/petstore/javascript-promise/src/model/Tag.js +++ b/samples/client/petstore/javascript-promise/src/model/Tag.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/TypeHolderDefault.js b/samples/client/petstore/javascript-promise/src/model/TypeHolderDefault.js index 10413cd990..992354a4d3 100644 --- a/samples/client/petstore/javascript-promise/src/model/TypeHolderDefault.js +++ b/samples/client/petstore/javascript-promise/src/model/TypeHolderDefault.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/TypeHolderExample.js b/samples/client/petstore/javascript-promise/src/model/TypeHolderExample.js index dc1e94db3a..6a431f0091 100644 --- a/samples/client/petstore/javascript-promise/src/model/TypeHolderExample.js +++ b/samples/client/petstore/javascript-promise/src/model/TypeHolderExample.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/User.js b/samples/client/petstore/javascript-promise/src/model/User.js index c593bbd335..ce63af2883 100644 --- a/samples/client/petstore/javascript-promise/src/model/User.js +++ b/samples/client/petstore/javascript-promise/src/model/User.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript-promise/src/model/XmlItem.js b/samples/client/petstore/javascript-promise/src/model/XmlItem.js index d10fa246a7..d410574ad5 100644 --- a/samples/client/petstore/javascript-promise/src/model/XmlItem.js +++ b/samples/client/petstore/javascript-promise/src/model/XmlItem.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/.openapi-generator/VERSION b/samples/client/petstore/javascript/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/javascript/.openapi-generator/VERSION +++ b/samples/client/petstore/javascript/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/javascript/src/ApiClient.js b/samples/client/petstore/javascript/src/ApiClient.js index 2f95d354aa..d529537b74 100644 --- a/samples/client/petstore/javascript/src/ApiClient.js +++ b/samples/client/petstore/javascript/src/ApiClient.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/api/AnotherFakeApi.js b/samples/client/petstore/javascript/src/api/AnotherFakeApi.js index a205bd82cb..e803c53e82 100644 --- a/samples/client/petstore/javascript/src/api/AnotherFakeApi.js +++ b/samples/client/petstore/javascript/src/api/AnotherFakeApi.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/api/FakeApi.js b/samples/client/petstore/javascript/src/api/FakeApi.js index fbc5aef79d..2a0543d727 100644 --- a/samples/client/petstore/javascript/src/api/FakeApi.js +++ b/samples/client/petstore/javascript/src/api/FakeApi.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/api/FakeClassnameTags123Api.js b/samples/client/petstore/javascript/src/api/FakeClassnameTags123Api.js index 957408b720..250f78205f 100644 --- a/samples/client/petstore/javascript/src/api/FakeClassnameTags123Api.js +++ b/samples/client/petstore/javascript/src/api/FakeClassnameTags123Api.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/api/PetApi.js b/samples/client/petstore/javascript/src/api/PetApi.js index 6c6f509fc1..28fd3b3d24 100644 --- a/samples/client/petstore/javascript/src/api/PetApi.js +++ b/samples/client/petstore/javascript/src/api/PetApi.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/api/StoreApi.js b/samples/client/petstore/javascript/src/api/StoreApi.js index aaa4b5f23e..8a27948b47 100644 --- a/samples/client/petstore/javascript/src/api/StoreApi.js +++ b/samples/client/petstore/javascript/src/api/StoreApi.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/api/UserApi.js b/samples/client/petstore/javascript/src/api/UserApi.js index 3d6e941a08..e63050a8e5 100644 --- a/samples/client/petstore/javascript/src/api/UserApi.js +++ b/samples/client/petstore/javascript/src/api/UserApi.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/index.js b/samples/client/petstore/javascript/src/index.js index d172e7c3e0..f7028db83e 100644 --- a/samples/client/petstore/javascript/src/index.js +++ b/samples/client/petstore/javascript/src/index.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesAnyType.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesAnyType.js index 73b58a733b..267f3041d0 100644 --- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesAnyType.js +++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesAnyType.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesArray.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesArray.js index 3a1f4ecc9d..f1d4f890be 100644 --- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesArray.js +++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesArray.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesBoolean.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesBoolean.js index 5306f6bd01..309dc0f315 100644 --- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesBoolean.js +++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesBoolean.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js index bd62237ca2..638b611596 100644 --- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js +++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesClass.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesInteger.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesInteger.js index 8f678419e2..717be11a92 100644 --- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesInteger.js +++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesInteger.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesNumber.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesNumber.js index 651c8894aa..04a967d133 100644 --- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesNumber.js +++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesNumber.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesObject.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesObject.js index b5180bbe82..3e5e7a8042 100644 --- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesObject.js +++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesObject.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/AdditionalPropertiesString.js b/samples/client/petstore/javascript/src/model/AdditionalPropertiesString.js index 9181dac601..1cf681db0d 100644 --- a/samples/client/petstore/javascript/src/model/AdditionalPropertiesString.js +++ b/samples/client/petstore/javascript/src/model/AdditionalPropertiesString.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/Animal.js b/samples/client/petstore/javascript/src/model/Animal.js index 4477ebc5a9..b10270da2f 100644 --- a/samples/client/petstore/javascript/src/model/Animal.js +++ b/samples/client/petstore/javascript/src/model/Animal.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/ApiResponse.js b/samples/client/petstore/javascript/src/model/ApiResponse.js index c7d3ebad56..3f2944d597 100644 --- a/samples/client/petstore/javascript/src/model/ApiResponse.js +++ b/samples/client/petstore/javascript/src/model/ApiResponse.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/ArrayOfArrayOfNumberOnly.js b/samples/client/petstore/javascript/src/model/ArrayOfArrayOfNumberOnly.js index ab73a6916d..dcd8e0c1d4 100644 --- a/samples/client/petstore/javascript/src/model/ArrayOfArrayOfNumberOnly.js +++ b/samples/client/petstore/javascript/src/model/ArrayOfArrayOfNumberOnly.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/ArrayOfNumberOnly.js b/samples/client/petstore/javascript/src/model/ArrayOfNumberOnly.js index b82c364903..a86a2a9901 100644 --- a/samples/client/petstore/javascript/src/model/ArrayOfNumberOnly.js +++ b/samples/client/petstore/javascript/src/model/ArrayOfNumberOnly.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/ArrayTest.js b/samples/client/petstore/javascript/src/model/ArrayTest.js index 4e4a96d085..8255b45a00 100644 --- a/samples/client/petstore/javascript/src/model/ArrayTest.js +++ b/samples/client/petstore/javascript/src/model/ArrayTest.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/Capitalization.js b/samples/client/petstore/javascript/src/model/Capitalization.js index 30232f689d..ae1fd0c469 100644 --- a/samples/client/petstore/javascript/src/model/Capitalization.js +++ b/samples/client/petstore/javascript/src/model/Capitalization.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/Cat.js b/samples/client/petstore/javascript/src/model/Cat.js index 415bd14582..4e31715711 100644 --- a/samples/client/petstore/javascript/src/model/Cat.js +++ b/samples/client/petstore/javascript/src/model/Cat.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/CatAllOf.js b/samples/client/petstore/javascript/src/model/CatAllOf.js index 6b26f6e753..86b0e9d9b1 100644 --- a/samples/client/petstore/javascript/src/model/CatAllOf.js +++ b/samples/client/petstore/javascript/src/model/CatAllOf.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/Category.js b/samples/client/petstore/javascript/src/model/Category.js index 20f5627520..c8d128d4bc 100644 --- a/samples/client/petstore/javascript/src/model/Category.js +++ b/samples/client/petstore/javascript/src/model/Category.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/ClassModel.js b/samples/client/petstore/javascript/src/model/ClassModel.js index b8ecf485e6..7da6fc886e 100644 --- a/samples/client/petstore/javascript/src/model/ClassModel.js +++ b/samples/client/petstore/javascript/src/model/ClassModel.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/Client.js b/samples/client/petstore/javascript/src/model/Client.js index 42cabd2a03..08e68c21c0 100644 --- a/samples/client/petstore/javascript/src/model/Client.js +++ b/samples/client/petstore/javascript/src/model/Client.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/Dog.js b/samples/client/petstore/javascript/src/model/Dog.js index 21820fddb0..105da1d74c 100644 --- a/samples/client/petstore/javascript/src/model/Dog.js +++ b/samples/client/petstore/javascript/src/model/Dog.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/DogAllOf.js b/samples/client/petstore/javascript/src/model/DogAllOf.js index 4110fbfd30..e51ad6c75e 100644 --- a/samples/client/petstore/javascript/src/model/DogAllOf.js +++ b/samples/client/petstore/javascript/src/model/DogAllOf.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/EnumArrays.js b/samples/client/petstore/javascript/src/model/EnumArrays.js index b8b3dc3757..6db6b6f038 100644 --- a/samples/client/petstore/javascript/src/model/EnumArrays.js +++ b/samples/client/petstore/javascript/src/model/EnumArrays.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/EnumClass.js b/samples/client/petstore/javascript/src/model/EnumClass.js index d1e33b4d8e..72e5e9e906 100644 --- a/samples/client/petstore/javascript/src/model/EnumClass.js +++ b/samples/client/petstore/javascript/src/model/EnumClass.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/EnumTest.js b/samples/client/petstore/javascript/src/model/EnumTest.js index 0083ab49b0..ea0657f1cb 100644 --- a/samples/client/petstore/javascript/src/model/EnumTest.js +++ b/samples/client/petstore/javascript/src/model/EnumTest.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/File.js b/samples/client/petstore/javascript/src/model/File.js index 0d270851df..f3b57b5bd9 100644 --- a/samples/client/petstore/javascript/src/model/File.js +++ b/samples/client/petstore/javascript/src/model/File.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/FileSchemaTestClass.js b/samples/client/petstore/javascript/src/model/FileSchemaTestClass.js index 9461ed3171..88c4724af6 100644 --- a/samples/client/petstore/javascript/src/model/FileSchemaTestClass.js +++ b/samples/client/petstore/javascript/src/model/FileSchemaTestClass.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/FormatTest.js b/samples/client/petstore/javascript/src/model/FormatTest.js index 050a26eccb..1021f5e7c5 100644 --- a/samples/client/petstore/javascript/src/model/FormatTest.js +++ b/samples/client/petstore/javascript/src/model/FormatTest.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/HasOnlyReadOnly.js b/samples/client/petstore/javascript/src/model/HasOnlyReadOnly.js index 9b2205f028..11e051c3bd 100644 --- a/samples/client/petstore/javascript/src/model/HasOnlyReadOnly.js +++ b/samples/client/petstore/javascript/src/model/HasOnlyReadOnly.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/List.js b/samples/client/petstore/javascript/src/model/List.js index 288cd0f916..3831877898 100644 --- a/samples/client/petstore/javascript/src/model/List.js +++ b/samples/client/petstore/javascript/src/model/List.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/MapTest.js b/samples/client/petstore/javascript/src/model/MapTest.js index 6d50eff835..f51233405d 100644 --- a/samples/client/petstore/javascript/src/model/MapTest.js +++ b/samples/client/petstore/javascript/src/model/MapTest.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js b/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js index 4c5ab29b9e..639e878b75 100644 --- a/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js +++ b/samples/client/petstore/javascript/src/model/MixedPropertiesAndAdditionalPropertiesClass.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/Model200Response.js b/samples/client/petstore/javascript/src/model/Model200Response.js index e5c9e8c5e7..c21fbf9be3 100644 --- a/samples/client/petstore/javascript/src/model/Model200Response.js +++ b/samples/client/petstore/javascript/src/model/Model200Response.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/ModelReturn.js b/samples/client/petstore/javascript/src/model/ModelReturn.js index eddfd298fd..ea982d9119 100644 --- a/samples/client/petstore/javascript/src/model/ModelReturn.js +++ b/samples/client/petstore/javascript/src/model/ModelReturn.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/Name.js b/samples/client/petstore/javascript/src/model/Name.js index 80eeb127d2..dccefb9e2d 100644 --- a/samples/client/petstore/javascript/src/model/Name.js +++ b/samples/client/petstore/javascript/src/model/Name.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/NumberOnly.js b/samples/client/petstore/javascript/src/model/NumberOnly.js index a71b576260..607f61dd6d 100644 --- a/samples/client/petstore/javascript/src/model/NumberOnly.js +++ b/samples/client/petstore/javascript/src/model/NumberOnly.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/Order.js b/samples/client/petstore/javascript/src/model/Order.js index 699e9fc673..1c1d05c932 100644 --- a/samples/client/petstore/javascript/src/model/Order.js +++ b/samples/client/petstore/javascript/src/model/Order.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/OuterComposite.js b/samples/client/petstore/javascript/src/model/OuterComposite.js index faf1409f5b..2eee4f2396 100644 --- a/samples/client/petstore/javascript/src/model/OuterComposite.js +++ b/samples/client/petstore/javascript/src/model/OuterComposite.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/OuterEnum.js b/samples/client/petstore/javascript/src/model/OuterEnum.js index 5cf00a1d8d..174afad364 100644 --- a/samples/client/petstore/javascript/src/model/OuterEnum.js +++ b/samples/client/petstore/javascript/src/model/OuterEnum.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/Pet.js b/samples/client/petstore/javascript/src/model/Pet.js index 114ccfd7b1..5132d7172b 100644 --- a/samples/client/petstore/javascript/src/model/Pet.js +++ b/samples/client/petstore/javascript/src/model/Pet.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js b/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js index 51720fc94d..f43eef275f 100644 --- a/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js +++ b/samples/client/petstore/javascript/src/model/ReadOnlyFirst.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/SpecialModelName.js b/samples/client/petstore/javascript/src/model/SpecialModelName.js index 3b9f178097..556ee41d59 100644 --- a/samples/client/petstore/javascript/src/model/SpecialModelName.js +++ b/samples/client/petstore/javascript/src/model/SpecialModelName.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/Tag.js b/samples/client/petstore/javascript/src/model/Tag.js index 2bfb449378..01c5cb5363 100644 --- a/samples/client/petstore/javascript/src/model/Tag.js +++ b/samples/client/petstore/javascript/src/model/Tag.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/TypeHolderDefault.js b/samples/client/petstore/javascript/src/model/TypeHolderDefault.js index 10413cd990..992354a4d3 100644 --- a/samples/client/petstore/javascript/src/model/TypeHolderDefault.js +++ b/samples/client/petstore/javascript/src/model/TypeHolderDefault.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/TypeHolderExample.js b/samples/client/petstore/javascript/src/model/TypeHolderExample.js index dc1e94db3a..6a431f0091 100644 --- a/samples/client/petstore/javascript/src/model/TypeHolderExample.js +++ b/samples/client/petstore/javascript/src/model/TypeHolderExample.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/User.js b/samples/client/petstore/javascript/src/model/User.js index c593bbd335..ce63af2883 100644 --- a/samples/client/petstore/javascript/src/model/User.js +++ b/samples/client/petstore/javascript/src/model/User.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/javascript/src/model/XmlItem.js b/samples/client/petstore/javascript/src/model/XmlItem.js index d10fa246a7..d410574ad5 100644 --- a/samples/client/petstore/javascript/src/model/XmlItem.js +++ b/samples/client/petstore/javascript/src/model/XmlItem.js @@ -7,7 +7,11 @@ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * https://openapi-generator.tech * +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master * * Do not edit the class manually. * diff --git a/samples/client/petstore/kotlin-string/.openapi-generator/VERSION b/samples/client/petstore/kotlin-string/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/kotlin-string/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-string/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/kotlin-string/build.gradle b/samples/client/petstore/kotlin-string/build.gradle index 07bdfbe04d..2f5e364279 100644 --- a/samples/client/petstore/kotlin-string/build.gradle +++ b/samples/client/petstore/kotlin-string/build.gradle @@ -30,9 +30,8 @@ test { dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - compile "com.squareup.moshi:moshi-kotlin:1.5.0" - compile "com.squareup.moshi:moshi-adapters:1.5.0" - compile "com.squareup.okhttp3:okhttp:3.14.0" - compile "org.threeten:threetenbp:1.3.8" + compile "com.squareup.moshi:moshi-kotlin:1.8.0" + compile "com.squareup.moshi:moshi-adapters:1.8.0" + compile "com.squareup.okhttp3:okhttp:3.14.2" testImplementation "io.kotlintest:kotlintest-runner-junit5:3.1.0" } diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index c075b4fbb7..c9107fcb08 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -1,8 +1,5 @@ package org.openapitools.client.infrastructure -import com.squareup.moshi.FromJson -import com.squareup.moshi.Moshi -import com.squareup.moshi.ToJson import okhttp3.OkHttpClient import okhttp3.RequestBody import okhttp3.MediaType @@ -11,7 +8,6 @@ import okhttp3.HttpUrl import okhttp3.ResponseBody import okhttp3.Request import java.io.File -import java.util.UUID open class ApiClient(val baseUrl: String) { companion object { @@ -23,7 +19,7 @@ open class ApiClient(val baseUrl: String) { protected const val XmlMediaType = "application/xml" @JvmStatic - val client by lazy { + val client: OkHttpClient by lazy { builder.build() } @@ -37,13 +33,13 @@ open class ApiClient(val baseUrl: String) { MediaType.parse(mediaType), content ) mediaType == FormDataMediaType || mediaType == FormUrlEncMediaType -> { - var builder = FormBody.Builder() - // content's type *must* be Map - @Suppress("UNCHECKED_CAST") - (content as Map).forEach { key, value -> - builder = builder.add(key, value) - } - builder.build() + FormBody.Builder().apply { + // content's type *must* be Map + @Suppress("UNCHECKED_CAST") + (content as Map).forEach { (key, value) -> + add(key, value) + } + }.build() } mediaType == JsonMediaType -> RequestBody.create( MediaType.parse(mediaType), Serializer.moshi.adapter(T::class.java).toJson(content) @@ -58,18 +54,11 @@ open class ApiClient(val baseUrl: String) { return null } val bodyContent = body.string() - if (bodyContent.length == 0) { + if (bodyContent.isEmpty()) { return null } return when(mediaType) { - JsonMediaType -> Moshi.Builder().add(object { - @ToJson - fun toJson(uuid: UUID) = uuid.toString() - @FromJson - fun fromJson(s: String) = UUID.fromString(s) - }) - .add(ByteArrayAdapter()) - .build().adapter(T::class.java).fromJson(bodyContent) + JsonMediaType -> Serializer.moshi.adapter(T::class.java).fromJson(bodyContent) else -> TODO("responseBody currently only supports JSON body.") } } @@ -77,23 +66,22 @@ open class ApiClient(val baseUrl: String) { protected inline fun request(requestConfig: RequestConfig, body : Any? = null): ApiInfrastructureResponse { val httpUrl = HttpUrl.parse(baseUrl) ?: throw IllegalStateException("baseUrl is invalid.") - var urlBuilder = httpUrl.newBuilder() - .addPathSegments(requestConfig.path.trimStart('/')) - - requestConfig.query.forEach { query -> - query.value.forEach { queryValue -> - urlBuilder = urlBuilder.addQueryParameter(query.key, queryValue) - } - } - - val url = urlBuilder.build() + val url = httpUrl.newBuilder() + .addPathSegments(requestConfig.path.trimStart('/')) + .apply { + requestConfig.query.forEach { query -> + query.value.forEach { queryValue -> + addQueryParameter(query.key, queryValue) + } + } + }.build() // take content-type/accept from spec or set to default (application/json) if not defined if (requestConfig.headers[ContentType].isNullOrEmpty()) { - requestConfig.headers.put(ContentType, JsonMediaType) + requestConfig.headers[ContentType] = JsonMediaType } if (requestConfig.headers[Accept].isNullOrEmpty()) { - requestConfig.headers.put(Accept, JsonMediaType) + requestConfig.headers[Accept] = JsonMediaType } val headers = requestConfig.headers @@ -108,7 +96,7 @@ open class ApiClient(val baseUrl: String) { // TODO: support multiple contentType options here. val contentType = (headers[ContentType] as String).substringBefore(";").toLowerCase() - var request : Request.Builder = when (requestConfig.method) { + val request = when (requestConfig.method) { RequestMethod.DELETE -> Request.Builder().url(url).delete() RequestMethod.GET -> Request.Builder().url(url) RequestMethod.HEAD -> Request.Builder().url(url).head() @@ -116,12 +104,11 @@ open class ApiClient(val baseUrl: String) { RequestMethod.PUT -> Request.Builder().url(url).put(requestBody(body, contentType)) RequestMethod.POST -> Request.Builder().url(url).post(requestBody(body, contentType)) RequestMethod.OPTIONS -> Request.Builder().url(url).method("OPTIONS", null) - } + }.apply { + headers.forEach { header -> addHeader(header.key, header.value) } + }.build() - headers.forEach { header -> request = request.addHeader(header.key, header.value) } - - val realRequest = request.build() - val response = client.newCall(realRequest).execute() + val response = client.newCall(request).execute() val accept = response.header(ContentType)?.substringBefore(";")?.toLowerCase() // TODO: handle specific mapping types. e.g. Map> @@ -153,4 +140,4 @@ open class ApiClient(val baseUrl: String) { ) } } -} \ No newline at end of file +} diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt new file mode 100644 index 0000000000..b2e1654479 --- /dev/null +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt @@ -0,0 +1,19 @@ +package org.openapitools.client.infrastructure + +import com.squareup.moshi.FromJson +import com.squareup.moshi.ToJson +import java.time.LocalDate +import java.time.format.DateTimeFormatter + +class LocalDateAdapter { + @ToJson + fun toJson(value: LocalDate): String { + return DateTimeFormatter.ISO_LOCAL_DATE.format(value) + } + + @FromJson + fun fromJson(value: String): LocalDate { + return LocalDate.parse(value, DateTimeFormatter.ISO_LOCAL_DATE) + } + +} diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt new file mode 100644 index 0000000000..e082db9481 --- /dev/null +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt @@ -0,0 +1,19 @@ +package org.openapitools.client.infrastructure + +import com.squareup.moshi.FromJson +import com.squareup.moshi.ToJson +import java.time.LocalDateTime +import java.time.format.DateTimeFormatter + +class LocalDateTimeAdapter { + @ToJson + fun toJson(value: LocalDateTime): String { + return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(value) + } + + @FromJson + fun fromJson(value: String): LocalDateTime { + return LocalDateTime.parse(value, DateTimeFormatter.ISO_LOCAL_DATE_TIME) + } + +} diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt index cf3fe8203d..7c5a353e0f 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt @@ -1,14 +1,18 @@ package org.openapitools.client.infrastructure -import com.squareup.moshi.KotlinJsonAdapterFactory import com.squareup.moshi.Moshi -import com.squareup.moshi.Rfc3339DateJsonAdapter -import java.util.* +import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter +import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory +import java.util.Date object Serializer { @JvmStatic val moshi: Moshi = Moshi.Builder() - .add(KotlinJsonAdapterFactory()) .add(Date::class.java, Rfc3339DateJsonAdapter().nullSafe()) + .add(LocalDateTimeAdapter()) + .add(LocalDateAdapter()) + .add(UUIDAdapter()) + .add(ByteArrayAdapter()) + .add(KotlinJsonAdapterFactory()) .build() } diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/UUIDAdapter.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/UUIDAdapter.kt new file mode 100644 index 0000000000..a4a44cc18b --- /dev/null +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/UUIDAdapter.kt @@ -0,0 +1,13 @@ +package org.openapitools.client.infrastructure + +import com.squareup.moshi.FromJson +import com.squareup.moshi.ToJson +import java.util.UUID + +class UUIDAdapter { + @ToJson + fun toJson(uuid: UUID) = uuid.toString() + + @FromJson + fun fromJson(s: String) = UUID.fromString(s) +} diff --git a/samples/client/petstore/kotlin-string/src/test/kotlin/org/openapitools/client/PetApiTest.kt b/samples/client/petstore/kotlin-string/src/test/kotlin/org/openapitools/client/PetApiTest.kt index ad28e4cf8e..d1c20493bc 100644 --- a/samples/client/petstore/kotlin-string/src/test/kotlin/org/openapitools/client/PetApiTest.kt +++ b/samples/client/petstore/kotlin-string/src/test/kotlin/org/openapitools/client/PetApiTest.kt @@ -2,8 +2,11 @@ package org.openapitools.client import io.kotlintest.shouldBe import io.kotlintest.matchers.numerics.shouldBeGreaterThan +import io.kotlintest.matchers.string.shouldContain +import io.kotlintest.shouldThrow import io.kotlintest.specs.ShouldSpec import org.openapitools.client.apis.PetApi +import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.models.Category import org.openapitools.client.models.Pet import org.openapitools.client.models.Tag @@ -11,8 +14,11 @@ import org.openapitools.client.models.Tag class PetApiTest : ShouldSpec() { init { + val petId:Long = 10006 + val api = PetApi() + should("add a pet") { - val petId:Long = 10006 + val pet = Pet( id = petId, name = "kotlin client test", @@ -20,15 +26,11 @@ class PetApiTest : ShouldSpec() { category = Category(petId, "test kotlin category"), tags = arrayOf(Tag(petId, "test kotlin tag")) ) - - val api = PetApi() api.addPet(pet) } should("get pet by id") { - val petId: Long = 10006 - val api = PetApi() val result = api.getPetById(petId) result.id shouldBe (petId) @@ -42,7 +44,6 @@ class PetApiTest : ShouldSpec() { } should("find pet by status") { - val api = PetApi() val result = api.findPetsByStatus(arrayOf("available")) result.size.shouldBeGreaterThan(0) @@ -58,15 +59,12 @@ class PetApiTest : ShouldSpec() { } should("update a pet") { - val petId:Long = 10007 val pet = Pet( id = petId, name = "kotlin client updatePet", status = Pet.Status.pending, photoUrls = arrayOf("http://test_kotlin_unit_test.com") ) - - val api = PetApi() api.updatePet(pet) // verify updated Pet @@ -77,14 +75,10 @@ class PetApiTest : ShouldSpec() { } - //TODO the test fail cause client doesn't support other JSON contentType/Accept - /* should("update a pet with form") { - val petId:Long = 10007 val name = "kotlin client updatePet with Form" val status = "pending" - val api = PetApi() api.updatePetWithForm(petId, name, status) // verify updated Pet @@ -94,7 +88,16 @@ class PetApiTest : ShouldSpec() { result.status shouldBe (Pet.Status.pending) } - */ + + should("delete a pet") { + api.deletePet(petId, "apiKey") + + // verify updated Pet + val exception = shouldThrow { + api.getPetById(petId) + } + exception.message?.shouldContain("Pet not found") + } } diff --git a/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION b/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/kotlin-threetenbp/build.gradle b/samples/client/petstore/kotlin-threetenbp/build.gradle index 07bdfbe04d..334389dc6e 100644 --- a/samples/client/petstore/kotlin-threetenbp/build.gradle +++ b/samples/client/petstore/kotlin-threetenbp/build.gradle @@ -30,9 +30,9 @@ test { dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - compile "com.squareup.moshi:moshi-kotlin:1.5.0" - compile "com.squareup.moshi:moshi-adapters:1.5.0" - compile "com.squareup.okhttp3:okhttp:3.14.0" + compile "com.squareup.moshi:moshi-kotlin:1.8.0" + compile "com.squareup.moshi:moshi-adapters:1.8.0" + compile "com.squareup.okhttp3:okhttp:3.14.2" compile "org.threeten:threetenbp:1.3.8" testImplementation "io.kotlintest:kotlintest-runner-junit5:3.1.0" } diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 16fa15b6d6..36c7ad8261 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -25,7 +25,6 @@ import org.openapitools.client.infrastructure.RequestMethod import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -import org.threeten.bp.LocalDateTime class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt index 68cfec2bc3..891b91d681 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt @@ -24,7 +24,6 @@ import org.openapitools.client.infrastructure.RequestMethod import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -import org.threeten.bp.LocalDateTime class StoreApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index 3c31014133..ea538f439a 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -24,7 +24,6 @@ import org.openapitools.client.infrastructure.RequestMethod import org.openapitools.client.infrastructure.ResponseType import org.openapitools.client.infrastructure.Success import org.openapitools.client.infrastructure.toMultiValue -import org.threeten.bp.LocalDateTime class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiClient(basePath) { diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index c075b4fbb7..c9107fcb08 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -1,8 +1,5 @@ package org.openapitools.client.infrastructure -import com.squareup.moshi.FromJson -import com.squareup.moshi.Moshi -import com.squareup.moshi.ToJson import okhttp3.OkHttpClient import okhttp3.RequestBody import okhttp3.MediaType @@ -11,7 +8,6 @@ import okhttp3.HttpUrl import okhttp3.ResponseBody import okhttp3.Request import java.io.File -import java.util.UUID open class ApiClient(val baseUrl: String) { companion object { @@ -23,7 +19,7 @@ open class ApiClient(val baseUrl: String) { protected const val XmlMediaType = "application/xml" @JvmStatic - val client by lazy { + val client: OkHttpClient by lazy { builder.build() } @@ -37,13 +33,13 @@ open class ApiClient(val baseUrl: String) { MediaType.parse(mediaType), content ) mediaType == FormDataMediaType || mediaType == FormUrlEncMediaType -> { - var builder = FormBody.Builder() - // content's type *must* be Map - @Suppress("UNCHECKED_CAST") - (content as Map).forEach { key, value -> - builder = builder.add(key, value) - } - builder.build() + FormBody.Builder().apply { + // content's type *must* be Map + @Suppress("UNCHECKED_CAST") + (content as Map).forEach { (key, value) -> + add(key, value) + } + }.build() } mediaType == JsonMediaType -> RequestBody.create( MediaType.parse(mediaType), Serializer.moshi.adapter(T::class.java).toJson(content) @@ -58,18 +54,11 @@ open class ApiClient(val baseUrl: String) { return null } val bodyContent = body.string() - if (bodyContent.length == 0) { + if (bodyContent.isEmpty()) { return null } return when(mediaType) { - JsonMediaType -> Moshi.Builder().add(object { - @ToJson - fun toJson(uuid: UUID) = uuid.toString() - @FromJson - fun fromJson(s: String) = UUID.fromString(s) - }) - .add(ByteArrayAdapter()) - .build().adapter(T::class.java).fromJson(bodyContent) + JsonMediaType -> Serializer.moshi.adapter(T::class.java).fromJson(bodyContent) else -> TODO("responseBody currently only supports JSON body.") } } @@ -77,23 +66,22 @@ open class ApiClient(val baseUrl: String) { protected inline fun request(requestConfig: RequestConfig, body : Any? = null): ApiInfrastructureResponse { val httpUrl = HttpUrl.parse(baseUrl) ?: throw IllegalStateException("baseUrl is invalid.") - var urlBuilder = httpUrl.newBuilder() - .addPathSegments(requestConfig.path.trimStart('/')) - - requestConfig.query.forEach { query -> - query.value.forEach { queryValue -> - urlBuilder = urlBuilder.addQueryParameter(query.key, queryValue) - } - } - - val url = urlBuilder.build() + val url = httpUrl.newBuilder() + .addPathSegments(requestConfig.path.trimStart('/')) + .apply { + requestConfig.query.forEach { query -> + query.value.forEach { queryValue -> + addQueryParameter(query.key, queryValue) + } + } + }.build() // take content-type/accept from spec or set to default (application/json) if not defined if (requestConfig.headers[ContentType].isNullOrEmpty()) { - requestConfig.headers.put(ContentType, JsonMediaType) + requestConfig.headers[ContentType] = JsonMediaType } if (requestConfig.headers[Accept].isNullOrEmpty()) { - requestConfig.headers.put(Accept, JsonMediaType) + requestConfig.headers[Accept] = JsonMediaType } val headers = requestConfig.headers @@ -108,7 +96,7 @@ open class ApiClient(val baseUrl: String) { // TODO: support multiple contentType options here. val contentType = (headers[ContentType] as String).substringBefore(";").toLowerCase() - var request : Request.Builder = when (requestConfig.method) { + val request = when (requestConfig.method) { RequestMethod.DELETE -> Request.Builder().url(url).delete() RequestMethod.GET -> Request.Builder().url(url) RequestMethod.HEAD -> Request.Builder().url(url).head() @@ -116,12 +104,11 @@ open class ApiClient(val baseUrl: String) { RequestMethod.PUT -> Request.Builder().url(url).put(requestBody(body, contentType)) RequestMethod.POST -> Request.Builder().url(url).post(requestBody(body, contentType)) RequestMethod.OPTIONS -> Request.Builder().url(url).method("OPTIONS", null) - } + }.apply { + headers.forEach { header -> addHeader(header.key, header.value) } + }.build() - headers.forEach { header -> request = request.addHeader(header.key, header.value) } - - val realRequest = request.build() - val response = client.newCall(realRequest).execute() + val response = client.newCall(request).execute() val accept = response.header(ContentType)?.substringBefore(";")?.toLowerCase() // TODO: handle specific mapping types. e.g. Map> @@ -153,4 +140,4 @@ open class ApiClient(val baseUrl: String) { ) } } -} \ No newline at end of file +} diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt new file mode 100644 index 0000000000..ff5439aeb4 --- /dev/null +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt @@ -0,0 +1,19 @@ +package org.openapitools.client.infrastructure + +import com.squareup.moshi.FromJson +import com.squareup.moshi.ToJson +import org.threeten.bp.LocalDate +import org.threeten.bp.format.DateTimeFormatter + +class LocalDateAdapter { + @ToJson + fun toJson(value: LocalDate): String { + return DateTimeFormatter.ISO_LOCAL_DATE.format(value) + } + + @FromJson + fun fromJson(value: String): LocalDate { + return LocalDate.parse(value, DateTimeFormatter.ISO_LOCAL_DATE) + } + +} diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt new file mode 100644 index 0000000000..710a9cc131 --- /dev/null +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt @@ -0,0 +1,19 @@ +package org.openapitools.client.infrastructure + +import com.squareup.moshi.FromJson +import com.squareup.moshi.ToJson +import org.threeten.bp.LocalDateTime +import org.threeten.bp.format.DateTimeFormatter + +class LocalDateTimeAdapter { + @ToJson + fun toJson(value: LocalDateTime): String { + return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(value) + } + + @FromJson + fun fromJson(value: String): LocalDateTime { + return LocalDateTime.parse(value, DateTimeFormatter.ISO_LOCAL_DATE_TIME) + } + +} diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt index cf3fe8203d..7c5a353e0f 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt @@ -1,14 +1,18 @@ package org.openapitools.client.infrastructure -import com.squareup.moshi.KotlinJsonAdapterFactory import com.squareup.moshi.Moshi -import com.squareup.moshi.Rfc3339DateJsonAdapter -import java.util.* +import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter +import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory +import java.util.Date object Serializer { @JvmStatic val moshi: Moshi = Moshi.Builder() - .add(KotlinJsonAdapterFactory()) .add(Date::class.java, Rfc3339DateJsonAdapter().nullSafe()) + .add(LocalDateTimeAdapter()) + .add(LocalDateAdapter()) + .add(UUIDAdapter()) + .add(ByteArrayAdapter()) + .add(KotlinJsonAdapterFactory()) .build() } diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/UUIDAdapter.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/UUIDAdapter.kt new file mode 100644 index 0000000000..a4a44cc18b --- /dev/null +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/UUIDAdapter.kt @@ -0,0 +1,13 @@ +package org.openapitools.client.infrastructure + +import com.squareup.moshi.FromJson +import com.squareup.moshi.ToJson +import java.util.UUID + +class UUIDAdapter { + @ToJson + fun toJson(uuid: UUID) = uuid.toString() + + @FromJson + fun fromJson(s: String) = UUID.fromString(s) +} diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt index f22a6670fa..47109faf61 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt @@ -11,7 +11,6 @@ */ package org.openapitools.client.models -import org.threeten.bp.LocalDateTime import com.squareup.moshi.Json /** diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Category.kt index e0de72025f..f068a02b1a 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -11,7 +11,6 @@ */ package org.openapitools.client.models -import org.threeten.bp.LocalDateTime import com.squareup.moshi.Json /** diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt index 277cb9b605..916fe3094b 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -11,7 +11,6 @@ */ package org.openapitools.client.models -import org.threeten.bp.LocalDateTime import com.squareup.moshi.Json /** diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Pet.kt index 0b296b0a42..88a536ea62 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -13,7 +13,6 @@ package org.openapitools.client.models import org.openapitools.client.models.Category import org.openapitools.client.models.Tag -import org.threeten.bp.LocalDateTime import com.squareup.moshi.Json /** diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Tag.kt index 147643f4ff..e67b899b1f 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -11,7 +11,6 @@ */ package org.openapitools.client.models -import org.threeten.bp.LocalDateTime import com.squareup.moshi.Json /** diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/User.kt index 8ecf3a0de2..6a66d8e523 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/User.kt @@ -11,7 +11,6 @@ */ package org.openapitools.client.models -import org.threeten.bp.LocalDateTime import com.squareup.moshi.Json /** diff --git a/samples/client/petstore/kotlin-threetenbp/src/test/kotlin/org/openapitools/client/PetApiTest.kt b/samples/client/petstore/kotlin-threetenbp/src/test/kotlin/org/openapitools/client/PetApiTest.kt index ad28e4cf8e..d1c20493bc 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/test/kotlin/org/openapitools/client/PetApiTest.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/test/kotlin/org/openapitools/client/PetApiTest.kt @@ -2,8 +2,11 @@ package org.openapitools.client import io.kotlintest.shouldBe import io.kotlintest.matchers.numerics.shouldBeGreaterThan +import io.kotlintest.matchers.string.shouldContain +import io.kotlintest.shouldThrow import io.kotlintest.specs.ShouldSpec import org.openapitools.client.apis.PetApi +import org.openapitools.client.infrastructure.ClientException import org.openapitools.client.models.Category import org.openapitools.client.models.Pet import org.openapitools.client.models.Tag @@ -11,8 +14,11 @@ import org.openapitools.client.models.Tag class PetApiTest : ShouldSpec() { init { + val petId:Long = 10006 + val api = PetApi() + should("add a pet") { - val petId:Long = 10006 + val pet = Pet( id = petId, name = "kotlin client test", @@ -20,15 +26,11 @@ class PetApiTest : ShouldSpec() { category = Category(petId, "test kotlin category"), tags = arrayOf(Tag(petId, "test kotlin tag")) ) - - val api = PetApi() api.addPet(pet) } should("get pet by id") { - val petId: Long = 10006 - val api = PetApi() val result = api.getPetById(petId) result.id shouldBe (petId) @@ -42,7 +44,6 @@ class PetApiTest : ShouldSpec() { } should("find pet by status") { - val api = PetApi() val result = api.findPetsByStatus(arrayOf("available")) result.size.shouldBeGreaterThan(0) @@ -58,15 +59,12 @@ class PetApiTest : ShouldSpec() { } should("update a pet") { - val petId:Long = 10007 val pet = Pet( id = petId, name = "kotlin client updatePet", status = Pet.Status.pending, photoUrls = arrayOf("http://test_kotlin_unit_test.com") ) - - val api = PetApi() api.updatePet(pet) // verify updated Pet @@ -77,14 +75,10 @@ class PetApiTest : ShouldSpec() { } - //TODO the test fail cause client doesn't support other JSON contentType/Accept - /* should("update a pet with form") { - val petId:Long = 10007 val name = "kotlin client updatePet with Form" val status = "pending" - val api = PetApi() api.updatePetWithForm(petId, name, status) // verify updated Pet @@ -94,7 +88,16 @@ class PetApiTest : ShouldSpec() { result.status shouldBe (Pet.Status.pending) } - */ + + should("delete a pet") { + api.deletePet(petId, "apiKey") + + // verify updated Pet + val exception = shouldThrow { + api.getPetById(petId) + } + exception.message?.shouldContain("Pet not found") + } } diff --git a/samples/client/petstore/kotlin/.openapi-generator/VERSION b/samples/client/petstore/kotlin/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/kotlin/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/kotlin/build.gradle b/samples/client/petstore/kotlin/build.gradle index 07bdfbe04d..2f5e364279 100644 --- a/samples/client/petstore/kotlin/build.gradle +++ b/samples/client/petstore/kotlin/build.gradle @@ -30,9 +30,8 @@ test { dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - compile "com.squareup.moshi:moshi-kotlin:1.5.0" - compile "com.squareup.moshi:moshi-adapters:1.5.0" - compile "com.squareup.okhttp3:okhttp:3.14.0" - compile "org.threeten:threetenbp:1.3.8" + compile "com.squareup.moshi:moshi-kotlin:1.8.0" + compile "com.squareup.moshi:moshi-adapters:1.8.0" + compile "com.squareup.okhttp3:okhttp:3.14.2" testImplementation "io.kotlintest:kotlintest-runner-junit5:3.1.0" } diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index c075b4fbb7..c9107fcb08 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -1,8 +1,5 @@ package org.openapitools.client.infrastructure -import com.squareup.moshi.FromJson -import com.squareup.moshi.Moshi -import com.squareup.moshi.ToJson import okhttp3.OkHttpClient import okhttp3.RequestBody import okhttp3.MediaType @@ -11,7 +8,6 @@ import okhttp3.HttpUrl import okhttp3.ResponseBody import okhttp3.Request import java.io.File -import java.util.UUID open class ApiClient(val baseUrl: String) { companion object { @@ -23,7 +19,7 @@ open class ApiClient(val baseUrl: String) { protected const val XmlMediaType = "application/xml" @JvmStatic - val client by lazy { + val client: OkHttpClient by lazy { builder.build() } @@ -37,13 +33,13 @@ open class ApiClient(val baseUrl: String) { MediaType.parse(mediaType), content ) mediaType == FormDataMediaType || mediaType == FormUrlEncMediaType -> { - var builder = FormBody.Builder() - // content's type *must* be Map - @Suppress("UNCHECKED_CAST") - (content as Map).forEach { key, value -> - builder = builder.add(key, value) - } - builder.build() + FormBody.Builder().apply { + // content's type *must* be Map + @Suppress("UNCHECKED_CAST") + (content as Map).forEach { (key, value) -> + add(key, value) + } + }.build() } mediaType == JsonMediaType -> RequestBody.create( MediaType.parse(mediaType), Serializer.moshi.adapter(T::class.java).toJson(content) @@ -58,18 +54,11 @@ open class ApiClient(val baseUrl: String) { return null } val bodyContent = body.string() - if (bodyContent.length == 0) { + if (bodyContent.isEmpty()) { return null } return when(mediaType) { - JsonMediaType -> Moshi.Builder().add(object { - @ToJson - fun toJson(uuid: UUID) = uuid.toString() - @FromJson - fun fromJson(s: String) = UUID.fromString(s) - }) - .add(ByteArrayAdapter()) - .build().adapter(T::class.java).fromJson(bodyContent) + JsonMediaType -> Serializer.moshi.adapter(T::class.java).fromJson(bodyContent) else -> TODO("responseBody currently only supports JSON body.") } } @@ -77,23 +66,22 @@ open class ApiClient(val baseUrl: String) { protected inline fun request(requestConfig: RequestConfig, body : Any? = null): ApiInfrastructureResponse { val httpUrl = HttpUrl.parse(baseUrl) ?: throw IllegalStateException("baseUrl is invalid.") - var urlBuilder = httpUrl.newBuilder() - .addPathSegments(requestConfig.path.trimStart('/')) - - requestConfig.query.forEach { query -> - query.value.forEach { queryValue -> - urlBuilder = urlBuilder.addQueryParameter(query.key, queryValue) - } - } - - val url = urlBuilder.build() + val url = httpUrl.newBuilder() + .addPathSegments(requestConfig.path.trimStart('/')) + .apply { + requestConfig.query.forEach { query -> + query.value.forEach { queryValue -> + addQueryParameter(query.key, queryValue) + } + } + }.build() // take content-type/accept from spec or set to default (application/json) if not defined if (requestConfig.headers[ContentType].isNullOrEmpty()) { - requestConfig.headers.put(ContentType, JsonMediaType) + requestConfig.headers[ContentType] = JsonMediaType } if (requestConfig.headers[Accept].isNullOrEmpty()) { - requestConfig.headers.put(Accept, JsonMediaType) + requestConfig.headers[Accept] = JsonMediaType } val headers = requestConfig.headers @@ -108,7 +96,7 @@ open class ApiClient(val baseUrl: String) { // TODO: support multiple contentType options here. val contentType = (headers[ContentType] as String).substringBefore(";").toLowerCase() - var request : Request.Builder = when (requestConfig.method) { + val request = when (requestConfig.method) { RequestMethod.DELETE -> Request.Builder().url(url).delete() RequestMethod.GET -> Request.Builder().url(url) RequestMethod.HEAD -> Request.Builder().url(url).head() @@ -116,12 +104,11 @@ open class ApiClient(val baseUrl: String) { RequestMethod.PUT -> Request.Builder().url(url).put(requestBody(body, contentType)) RequestMethod.POST -> Request.Builder().url(url).post(requestBody(body, contentType)) RequestMethod.OPTIONS -> Request.Builder().url(url).method("OPTIONS", null) - } + }.apply { + headers.forEach { header -> addHeader(header.key, header.value) } + }.build() - headers.forEach { header -> request = request.addHeader(header.key, header.value) } - - val realRequest = request.build() - val response = client.newCall(realRequest).execute() + val response = client.newCall(request).execute() val accept = response.header(ContentType)?.substringBefore(";")?.toLowerCase() // TODO: handle specific mapping types. e.g. Map> @@ -153,4 +140,4 @@ open class ApiClient(val baseUrl: String) { ) } } -} \ No newline at end of file +} diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt new file mode 100644 index 0000000000..b2e1654479 --- /dev/null +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt @@ -0,0 +1,19 @@ +package org.openapitools.client.infrastructure + +import com.squareup.moshi.FromJson +import com.squareup.moshi.ToJson +import java.time.LocalDate +import java.time.format.DateTimeFormatter + +class LocalDateAdapter { + @ToJson + fun toJson(value: LocalDate): String { + return DateTimeFormatter.ISO_LOCAL_DATE.format(value) + } + + @FromJson + fun fromJson(value: String): LocalDate { + return LocalDate.parse(value, DateTimeFormatter.ISO_LOCAL_DATE) + } + +} diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt new file mode 100644 index 0000000000..e082db9481 --- /dev/null +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt @@ -0,0 +1,19 @@ +package org.openapitools.client.infrastructure + +import com.squareup.moshi.FromJson +import com.squareup.moshi.ToJson +import java.time.LocalDateTime +import java.time.format.DateTimeFormatter + +class LocalDateTimeAdapter { + @ToJson + fun toJson(value: LocalDateTime): String { + return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(value) + } + + @FromJson + fun fromJson(value: String): LocalDateTime { + return LocalDateTime.parse(value, DateTimeFormatter.ISO_LOCAL_DATE_TIME) + } + +} diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt index cf3fe8203d..7c5a353e0f 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt @@ -1,14 +1,18 @@ package org.openapitools.client.infrastructure -import com.squareup.moshi.KotlinJsonAdapterFactory import com.squareup.moshi.Moshi -import com.squareup.moshi.Rfc3339DateJsonAdapter -import java.util.* +import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter +import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory +import java.util.Date object Serializer { @JvmStatic val moshi: Moshi = Moshi.Builder() - .add(KotlinJsonAdapterFactory()) .add(Date::class.java, Rfc3339DateJsonAdapter().nullSafe()) + .add(LocalDateTimeAdapter()) + .add(LocalDateAdapter()) + .add(UUIDAdapter()) + .add(ByteArrayAdapter()) + .add(KotlinJsonAdapterFactory()) .build() } diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/UUIDAdapter.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/UUIDAdapter.kt new file mode 100644 index 0000000000..a4a44cc18b --- /dev/null +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/UUIDAdapter.kt @@ -0,0 +1,13 @@ +package org.openapitools.client.infrastructure + +import com.squareup.moshi.FromJson +import com.squareup.moshi.ToJson +import java.util.UUID + +class UUIDAdapter { + @ToJson + fun toJson(uuid: UUID) = uuid.toString() + + @FromJson + fun fromJson(s: String) = UUID.fromString(s) +} diff --git a/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt b/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt new file mode 100644 index 0000000000..1807e516eb --- /dev/null +++ b/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt @@ -0,0 +1,48 @@ +package org.openapitools.client + +import io.kotlintest.shouldBe +import io.kotlintest.specs.ShouldSpec +import org.openapitools.client.apis.PetApi +import org.openapitools.client.apis.StoreApi +import org.openapitools.client.models.Order +import org.openapitools.client.models.Pet +import java.time.LocalDateTime.now + +class StoreApiTest : ShouldSpec() { + init { + + val petId:Long = 10006 + val petApi = PetApi() + val storeApi = StoreApi() + + val pet = Pet( + id = petId, + name = "kotlin client test", + photoUrls = arrayOf("http://test_kotlin_unit_test.com") + ) + petApi.addPet(pet) + + should("add an order") { + + val order = Order( + id = 12, + petId = petId, + quantity = 2, + shipDate = now(), + complete = true + ) + storeApi.placeOrder(order); + + } + + should("get order by id") { + val result = storeApi.getOrderById(12) + + // verify order + result.petId shouldBe (petId) + result.quantity shouldBe (2) + } + + } + +} diff --git a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION +++ b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php index b78f0f310b..c3aaf3d20b 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php index 7352afe5c6..5477004f94 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** @@ -2807,7 +2811,7 @@ class FakeApi */ public function testGroupParametersWithHttpInfo($associative_array) { - $request = $this->testGroupParametersRequest($associative_array['required_string_group'], $associative_array['required_boolean_group'], $associative_array['required_int64_group'], $associative_array['string_group'], $associative_array['boolean_group'], $associative_array['int64_group']); + $request = $this->testGroupParametersRequest($associative_array); try { $options = $this->createHttpClientOption(); diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php index 38f93ed957..5651a2fd16 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php index 369e578510..febabc576b 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php index c9d394c6bc..8d8e4ae6a3 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php index 12f4fe9809..c8cd92a807 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php index b8ec60f9e9..1af0b51146 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php index 5bc1ac15ac..289bbc307f 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php b/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php index 4e4091726a..52c22ea059 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesAnyType.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesAnyType.php index 3b8b4612de..a6803e5803 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesAnyType.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesAnyType.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesArray.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesArray.php index b9f80292c7..a15528b8f4 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesArray.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesArray.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesBoolean.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesBoolean.php index 0935afc626..1cb6c4c7bd 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesBoolean.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesBoolean.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php index 0dc0123415..107b7ddb0c 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesInteger.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesInteger.php index 2c812b25e6..22614b7c29 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesInteger.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesInteger.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesNumber.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesNumber.php index fd79e50705..3a3c606512 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesNumber.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesNumber.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesObject.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesObject.php index 55d4138250..b744d32319 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesObject.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesObject.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesString.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesString.php index cbd82cbfa0..ddbfb971e8 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesString.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesString.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php index b5b1b28055..43aba1da96 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php index d438ba4288..a07721ebd8 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php index 29186e6bb5..ef4cd4ca08 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php index aa47c6b47d..92ef71f42e 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php index 32d8792607..b46190f4c7 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php index 3529cefaa1..f6286db004 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php index bba97a6ca7..c50dc123ab 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php index ea9af0e3c3..48717ce58b 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php index 9bcb8e9cd8..ece76d6c6d 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php index 5792577511..5cad59a7f0 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php index 1eea5d0899..6640bbc6b1 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php index 227eb0aaf7..54fec011e1 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php index a70ae53fbc..938e1ea398 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php index 938c787b0e..91be99e0bc 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php index f14dc2bff3..181d7764d9 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php index 7e454f6286..1f2085b8b0 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php index 85fc4184a0..60b41efb14 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php index fdad10d436..65c0e19fd3 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php index 312bdf9cd6..4e3939f4df 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php index ad8c4cac37..b0c83533b7 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php index e039e474d2..715e100063 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php index 624813bf0e..be0b0c47f1 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php index 04199bad53..be94b12329 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php index 68e093dc88..26611c645f 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php index b8925b7ecc..5256d38d74 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php index c20a8d23a2..524dd442b7 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php index 809c9c6243..d3b9cd22bb 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php index 79f96d52fd..cb41e21354 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php index 677ccb106f..2656b24ccf 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php index 657654ce9e..75c749625a 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php index f341400c11..0c1f605da4 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php index b66ccee7cf..7e70821dcd 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php index 6925a9ef15..fbccef8f72 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php index 64e88049d7..9502d28bcb 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php index 79132e8b0c..30c12617d0 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderDefault.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderDefault.php index 2cab44106d..f3ba45aa0e 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderDefault.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderDefault.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderExample.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderExample.php index 82926a0c64..fa83e27738 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderExample.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderExample.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php index 669360fee5..d811f1f281 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/XmlItem.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/XmlItem.php index a2a690ad4d..19f39a0192 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/XmlItem.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/XmlItem.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php index 1dfe2db9f6..a5e751952f 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php index 53ee52ccbc..6166b47a4e 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php index beaf7ec347..2a215ce9c3 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php index 3831b1e2df..15e330ba25 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php index bfdcc5d6e8..8549eecd01 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php index 4799a949fa..08cd08c38a 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php index 6c4ec889b2..1389e04ded 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesAnyTypeTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesAnyTypeTest.php index 127df02309..fb18154914 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesAnyTypeTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesAnyTypeTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesArrayTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesArrayTest.php index 91cad352f7..a37e2fa774 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesArrayTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesArrayTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesBooleanTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesBooleanTest.php index 9228e312e3..1c9ccba974 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesBooleanTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesBooleanTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php index ad95a50939..6477faccc7 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesIntegerTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesIntegerTest.php index 562b5e6a22..821822ab3a 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesIntegerTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesIntegerTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesNumberTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesNumberTest.php index b502d7d989..502f80ac64 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesNumberTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesNumberTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesObjectTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesObjectTest.php index 973bed6dc9..3af964ed4c 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesObjectTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesObjectTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesStringTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesStringTest.php index 0d739feed1..7bf85f19f7 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesStringTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesStringTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php index c534223842..15830e6b1a 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php index 89656b032c..ef544551e8 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php index 1080f7a6b9..87145daa25 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php index 3aac20d534..fcac8540e8 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php index 56c06699e5..17bdbbd08b 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php index d72763b175..9fcb2dba7f 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php index 515164ea4b..1a2e5985c7 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php index 8eaba70e32..96b5187fe1 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php index 1f3c307205..33b1525195 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php index 6ff7e3b413..5a266dc4ab 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php index 86715c7394..111803dbd2 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php index c5d7e6b5a3..d7af86e0fa 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php index 0d504dbd2c..e418514270 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php index 092f5f2a3a..3fb1c3c30c 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php index c5e6c97735..8631e819b2 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php index 4cf96be1a9..5f3a72fe43 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php index 9224e29fdb..c10be01d4b 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php index ca5a839132..b366c65dc5 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php index c7f054bb5d..6e2952491c 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php index 781e9ea05b..6f8cc6d45e 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php index 988f84325b..ee02e3c286 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php index e9c0be20db..46343472fe 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php index f1642dde44..b23e6adb91 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php index 09780d92b5..0094fc127c 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php index f434b7022f..594f007c87 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php index 4bb7896b08..7b6357a62d 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php index 1dfde7afc1..b7cd833f99 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php index d75e55996a..b3e9359c47 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php index 13a8caae0c..d5c6612332 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php index f4dc59e100..eca5ba854f 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php index a0a132187b..9e987a1d80 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php index 2af7be4caf..e0767c886e 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php index 6ecf877b9e..a2fef7b4b9 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php index 56eeb12d85..0134bc3542 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderDefaultTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderDefaultTest.php index 0cdc184355..9fcf8db4f9 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderDefaultTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderDefaultTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderExampleTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderExampleTest.php index a677e810f7..53da7b211e 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderExampleTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderExampleTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php index 8ba90d5289..c5720784e8 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/XmlItemTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/XmlItemTest.php index 9ffd08c51d..0371b82b80 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/XmlItemTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/XmlItemTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/client/petstore/python-asyncio/.openapi-generator/VERSION b/samples/client/petstore/python-asyncio/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/python-asyncio/.openapi-generator/VERSION +++ b/samples/client/petstore/python-asyncio/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/python-asyncio/docs/AnotherFakeApi.md b/samples/client/petstore/python-asyncio/docs/AnotherFakeApi.md index c1c76a67fd..c3f84772cf 100644 --- a/samples/client/petstore/python-asyncio/docs/AnotherFakeApi.md +++ b/samples/client/petstore/python-asyncio/docs/AnotherFakeApi.md @@ -54,5 +54,10 @@ No authorization required - **Content-Type**: application/json - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/client/petstore/python-asyncio/docs/FakeApi.md b/samples/client/petstore/python-asyncio/docs/FakeApi.md index c46bf1e497..946a8ce3e7 100644 --- a/samples/client/petstore/python-asyncio/docs/FakeApi.md +++ b/samples/client/petstore/python-asyncio/docs/FakeApi.md @@ -65,6 +65,11 @@ No authorization required - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16 - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **fake_outer_boolean_serialize** @@ -113,6 +118,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output boolean | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **fake_outer_composite_serialize** @@ -161,6 +171,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output composite | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **fake_outer_number_serialize** @@ -209,6 +224,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output number | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **fake_outer_string_serialize** @@ -257,6 +277,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output string | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_body_with_file_schema** @@ -304,6 +329,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Success | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_body_with_query_params** @@ -351,6 +381,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Success | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_client_model** @@ -400,6 +435,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_endpoint_parameters** @@ -479,6 +519,12 @@ void (empty response body) - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid username supplied | - | +**404** | User not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_enum_parameters** @@ -541,6 +587,12 @@ No authorization required - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid request | - | +**404** | Not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_group_parameters** @@ -599,6 +651,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Someting wrong | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_inline_additional_properties** @@ -645,6 +702,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_json_form_data** @@ -693,5 +755,10 @@ No authorization required - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/client/petstore/python-asyncio/docs/FakeClassnameTags123Api.md b/samples/client/petstore/python-asyncio/docs/FakeClassnameTags123Api.md index aed30cb56d..7ffcf21122 100644 --- a/samples/client/petstore/python-asyncio/docs/FakeClassnameTags123Api.md +++ b/samples/client/petstore/python-asyncio/docs/FakeClassnameTags123Api.md @@ -60,5 +60,10 @@ Name | Type | Description | Notes - **Content-Type**: application/json - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/client/petstore/python-asyncio/docs/PetApi.md b/samples/client/petstore/python-asyncio/docs/PetApi.md index 227fa2ada1..3ed2551bd6 100644 --- a/samples/client/petstore/python-asyncio/docs/PetApi.md +++ b/samples/client/petstore/python-asyncio/docs/PetApi.md @@ -63,6 +63,12 @@ void (empty response body) - **Content-Type**: application/json, application/xml - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**405** | Invalid input | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **delete_pet** @@ -115,6 +121,12 @@ void (empty response body) - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid pet value | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **find_pets_by_status** @@ -168,6 +180,12 @@ Name | Type | Description | Notes - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid status value | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **find_pets_by_tags** @@ -221,6 +239,12 @@ Name | Type | Description | Notes - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid tag value | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **get_pet_by_id** @@ -276,6 +300,13 @@ Name | Type | Description | Notes - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid ID supplied | - | +**404** | Pet not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **update_pet** @@ -326,6 +357,14 @@ void (empty response body) - **Content-Type**: application/json, application/xml - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid ID supplied | - | +**404** | Pet not found | - | +**405** | Validation exception | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **update_pet_with_form** @@ -380,6 +419,11 @@ void (empty response body) - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**405** | Invalid input | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **upload_file** @@ -435,6 +479,11 @@ Name | Type | Description | Notes - **Content-Type**: multipart/form-data - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **upload_file_with_required_file** @@ -490,5 +539,10 @@ Name | Type | Description | Notes - **Content-Type**: multipart/form-data - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/client/petstore/python-asyncio/docs/StoreApi.md b/samples/client/petstore/python-asyncio/docs/StoreApi.md index af190f931d..76b94f73dc 100644 --- a/samples/client/petstore/python-asyncio/docs/StoreApi.md +++ b/samples/client/petstore/python-asyncio/docs/StoreApi.md @@ -56,6 +56,12 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid ID supplied | - | +**404** | Order not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **get_inventory** @@ -107,6 +113,11 @@ This endpoint does not need any parameter. - **Content-Type**: Not defined - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **get_order_by_id** @@ -156,6 +167,13 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid ID supplied | - | +**404** | Order not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **place_order** @@ -203,5 +221,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid Order | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/client/petstore/python-asyncio/docs/UserApi.md b/samples/client/petstore/python-asyncio/docs/UserApi.md index 907dc9ec36..fdc2c30df9 100644 --- a/samples/client/petstore/python-asyncio/docs/UserApi.md +++ b/samples/client/petstore/python-asyncio/docs/UserApi.md @@ -60,6 +60,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **create_users_with_array_input** @@ -106,6 +111,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **create_users_with_list_input** @@ -152,6 +162,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **delete_user** @@ -200,6 +215,12 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid username supplied | - | +**404** | User not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **get_user_by_name** @@ -247,6 +268,13 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid username supplied | - | +**404** | User not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **login_user** @@ -296,6 +324,12 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | * X-Rate-Limit - calls per hour allowed by the user
* X-Expires-After - date in UTC when token expires
| +**400** | Invalid username/password supplied | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **logout_user** @@ -338,6 +372,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **update_user** @@ -388,5 +427,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid user supplied | - | +**404** | User not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/client/petstore/python-asyncio/petstore_api/api/another_fake_api.py b/samples/client/petstore/python-asyncio/petstore_api/api/another_fake_api.py index d44e05e78c..a47a8e3ea1 100644 --- a/samples/client/petstore/python-asyncio/petstore_api/api/another_fake_api.py +++ b/samples/client/petstore/python-asyncio/petstore_api/api/another_fake_api.py @@ -45,18 +45,21 @@ class AnotherFakeApi(object): >>> thread = api.call_123_test_special_tags(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client body: client model (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Client If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.call_123_test_special_tags_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.call_123_test_special_tags_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.call_123_test_special_tags_with_http_info(body, **kwargs) # noqa: E501 def call_123_test_special_tags_with_http_info(self, body, **kwargs): # noqa: E501 """To test special tags # noqa: E501 @@ -67,9 +70,18 @@ class AnotherFakeApi(object): >>> thread = api.call_123_test_special_tags_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client body: client model (required) - :return: Client + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Client, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ diff --git a/samples/client/petstore/python-asyncio/petstore_api/api/fake_api.py b/samples/client/petstore/python-asyncio/petstore_api/api/fake_api.py index 08b6578095..1847804c55 100644 --- a/samples/client/petstore/python-asyncio/petstore_api/api/fake_api.py +++ b/samples/client/petstore/python-asyncio/petstore_api/api/fake_api.py @@ -45,18 +45,21 @@ class FakeApi(object): >>> thread = api.create_xml_item(xml_item, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param XmlItem xml_item: XmlItem Body (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.create_xml_item_with_http_info(xml_item, **kwargs) # noqa: E501 - else: - (data) = self.create_xml_item_with_http_info(xml_item, **kwargs) # noqa: E501 - return data + return self.create_xml_item_with_http_info(xml_item, **kwargs) # noqa: E501 def create_xml_item_with_http_info(self, xml_item, **kwargs): # noqa: E501 """creates an XmlItem # noqa: E501 @@ -67,8 +70,17 @@ class FakeApi(object): >>> thread = api.create_xml_item_with_http_info(xml_item, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param XmlItem xml_item: XmlItem Body (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -141,18 +153,21 @@ class FakeApi(object): >>> thread = api.fake_outer_boolean_serialize(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param bool body: Input boolean as post body + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: bool If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.fake_outer_boolean_serialize_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.fake_outer_boolean_serialize_with_http_info(**kwargs) # noqa: E501 - return data + return self.fake_outer_boolean_serialize_with_http_info(**kwargs) # noqa: E501 def fake_outer_boolean_serialize_with_http_info(self, **kwargs): # noqa: E501 """fake_outer_boolean_serialize # noqa: E501 @@ -163,9 +178,18 @@ class FakeApi(object): >>> thread = api.fake_outer_boolean_serialize_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param bool body: Input boolean as post body - :return: bool + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(bool, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -233,18 +257,21 @@ class FakeApi(object): >>> thread = api.fake_outer_composite_serialize(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param OuterComposite body: Input composite as post body + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: OuterComposite If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.fake_outer_composite_serialize_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.fake_outer_composite_serialize_with_http_info(**kwargs) # noqa: E501 - return data + return self.fake_outer_composite_serialize_with_http_info(**kwargs) # noqa: E501 def fake_outer_composite_serialize_with_http_info(self, **kwargs): # noqa: E501 """fake_outer_composite_serialize # noqa: E501 @@ -255,9 +282,18 @@ class FakeApi(object): >>> thread = api.fake_outer_composite_serialize_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param OuterComposite body: Input composite as post body - :return: OuterComposite + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(OuterComposite, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -325,18 +361,21 @@ class FakeApi(object): >>> thread = api.fake_outer_number_serialize(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param float body: Input number as post body + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: float If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.fake_outer_number_serialize_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.fake_outer_number_serialize_with_http_info(**kwargs) # noqa: E501 - return data + return self.fake_outer_number_serialize_with_http_info(**kwargs) # noqa: E501 def fake_outer_number_serialize_with_http_info(self, **kwargs): # noqa: E501 """fake_outer_number_serialize # noqa: E501 @@ -347,9 +386,18 @@ class FakeApi(object): >>> thread = api.fake_outer_number_serialize_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param float body: Input number as post body - :return: float + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(float, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -417,18 +465,21 @@ class FakeApi(object): >>> thread = api.fake_outer_string_serialize(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str body: Input string as post body + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: str If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.fake_outer_string_serialize_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.fake_outer_string_serialize_with_http_info(**kwargs) # noqa: E501 - return data + return self.fake_outer_string_serialize_with_http_info(**kwargs) # noqa: E501 def fake_outer_string_serialize_with_http_info(self, **kwargs): # noqa: E501 """fake_outer_string_serialize # noqa: E501 @@ -439,9 +490,18 @@ class FakeApi(object): >>> thread = api.fake_outer_string_serialize_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str body: Input string as post body - :return: str + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(str, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -509,18 +569,21 @@ class FakeApi(object): >>> thread = api.test_body_with_file_schema(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param FileSchemaTestClass body: (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_body_with_file_schema_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.test_body_with_file_schema_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.test_body_with_file_schema_with_http_info(body, **kwargs) # noqa: E501 def test_body_with_file_schema_with_http_info(self, body, **kwargs): # noqa: E501 """test_body_with_file_schema # noqa: E501 @@ -531,8 +594,17 @@ class FakeApi(object): >>> thread = api.test_body_with_file_schema_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param FileSchemaTestClass body: (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -604,19 +676,22 @@ class FakeApi(object): >>> thread = api.test_body_with_query_params(query, body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str query: (required) :param User body: (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_body_with_query_params_with_http_info(query, body, **kwargs) # noqa: E501 - else: - (data) = self.test_body_with_query_params_with_http_info(query, body, **kwargs) # noqa: E501 - return data + return self.test_body_with_query_params_with_http_info(query, body, **kwargs) # noqa: E501 def test_body_with_query_params_with_http_info(self, query, body, **kwargs): # noqa: E501 """test_body_with_query_params # noqa: E501 @@ -626,9 +701,18 @@ class FakeApi(object): >>> thread = api.test_body_with_query_params_with_http_info(query, body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str query: (required) :param User body: (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -707,18 +791,21 @@ class FakeApi(object): >>> thread = api.test_client_model(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client body: client model (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Client If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_client_model_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.test_client_model_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.test_client_model_with_http_info(body, **kwargs) # noqa: E501 def test_client_model_with_http_info(self, body, **kwargs): # noqa: E501 """To test \"client\" model # noqa: E501 @@ -729,9 +816,18 @@ class FakeApi(object): >>> thread = api.test_client_model_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client body: client model (required) - :return: Client + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Client, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -807,7 +903,7 @@ class FakeApi(object): >>> thread = api.test_endpoint_parameters(number, double, pattern_without_delimiter, byte, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param float number: None (required) :param float double: None (required) :param str pattern_without_delimiter: None (required) @@ -822,16 +918,19 @@ class FakeApi(object): :param datetime date_time: None :param str password: None :param str param_callback: None + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, **kwargs) # noqa: E501 - else: - (data) = self.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, **kwargs) # noqa: E501 - return data + return self.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, **kwargs) # noqa: E501 def test_endpoint_parameters_with_http_info(self, number, double, pattern_without_delimiter, byte, **kwargs): # noqa: E501 """Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 # noqa: E501 @@ -842,7 +941,7 @@ class FakeApi(object): >>> thread = api.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param float number: None (required) :param float double: None (required) :param str pattern_without_delimiter: None (required) @@ -857,6 +956,15 @@ class FakeApi(object): :param datetime date_time: None :param str password: None :param str param_callback: None + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -995,7 +1103,7 @@ class FakeApi(object): >>> thread = api.test_enum_parameters(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] enum_header_string_array: Header parameter enum test (string array) :param str enum_header_string: Header parameter enum test (string) :param list[str] enum_query_string_array: Query parameter enum test (string array) @@ -1004,16 +1112,19 @@ class FakeApi(object): :param float enum_query_double: Query parameter enum test (double) :param list[str] enum_form_string_array: Form parameter enum test (string array) :param str enum_form_string: Form parameter enum test (string) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_enum_parameters_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.test_enum_parameters_with_http_info(**kwargs) # noqa: E501 - return data + return self.test_enum_parameters_with_http_info(**kwargs) # noqa: E501 def test_enum_parameters_with_http_info(self, **kwargs): # noqa: E501 """To test enum parameters # noqa: E501 @@ -1024,7 +1135,7 @@ class FakeApi(object): >>> thread = api.test_enum_parameters_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] enum_header_string_array: Header parameter enum test (string array) :param str enum_header_string: Header parameter enum test (string) :param list[str] enum_query_string_array: Query parameter enum test (string array) @@ -1033,6 +1144,15 @@ class FakeApi(object): :param float enum_query_double: Query parameter enum test (double) :param list[str] enum_form_string_array: Form parameter enum test (string array) :param str enum_form_string: Form parameter enum test (string) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -1118,23 +1238,26 @@ class FakeApi(object): >>> thread = api.test_group_parameters(required_string_group, required_boolean_group, required_int64_group, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int required_string_group: Required String in group parameters (required) :param bool required_boolean_group: Required Boolean in group parameters (required) :param int required_int64_group: Required Integer in group parameters (required) :param int string_group: String in group parameters :param bool boolean_group: Boolean in group parameters :param int int64_group: Integer in group parameters + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, **kwargs) # noqa: E501 - else: - (data) = self.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, **kwargs) # noqa: E501 - return data + return self.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, **kwargs) # noqa: E501 def test_group_parameters_with_http_info(self, required_string_group, required_boolean_group, required_int64_group, **kwargs): # noqa: E501 """Fake endpoint to test group parameters (optional) # noqa: E501 @@ -1145,13 +1268,22 @@ class FakeApi(object): >>> thread = api.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int required_string_group: Required String in group parameters (required) :param bool required_boolean_group: Required Boolean in group parameters (required) :param int required_int64_group: Required Integer in group parameters (required) :param int string_group: String in group parameters :param bool boolean_group: Boolean in group parameters :param int int64_group: Integer in group parameters + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -1237,18 +1369,21 @@ class FakeApi(object): >>> thread = api.test_inline_additional_properties(param, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param dict(str, str) param: request body (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_inline_additional_properties_with_http_info(param, **kwargs) # noqa: E501 - else: - (data) = self.test_inline_additional_properties_with_http_info(param, **kwargs) # noqa: E501 - return data + return self.test_inline_additional_properties_with_http_info(param, **kwargs) # noqa: E501 def test_inline_additional_properties_with_http_info(self, param, **kwargs): # noqa: E501 """test inline additionalProperties # noqa: E501 @@ -1258,8 +1393,17 @@ class FakeApi(object): >>> thread = api.test_inline_additional_properties_with_http_info(param, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param dict(str, str) param: request body (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -1331,19 +1475,22 @@ class FakeApi(object): >>> thread = api.test_json_form_data(param, param2, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str param: field1 (required) :param str param2: field2 (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_json_form_data_with_http_info(param, param2, **kwargs) # noqa: E501 - else: - (data) = self.test_json_form_data_with_http_info(param, param2, **kwargs) # noqa: E501 - return data + return self.test_json_form_data_with_http_info(param, param2, **kwargs) # noqa: E501 def test_json_form_data_with_http_info(self, param, param2, **kwargs): # noqa: E501 """test json serialization of form data # noqa: E501 @@ -1353,9 +1500,18 @@ class FakeApi(object): >>> thread = api.test_json_form_data_with_http_info(param, param2, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str param: field1 (required) :param str param2: field2 (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. diff --git a/samples/client/petstore/python-asyncio/petstore_api/api/fake_classname_tags_123_api.py b/samples/client/petstore/python-asyncio/petstore_api/api/fake_classname_tags_123_api.py index 635d968283..3e778e9226 100644 --- a/samples/client/petstore/python-asyncio/petstore_api/api/fake_classname_tags_123_api.py +++ b/samples/client/petstore/python-asyncio/petstore_api/api/fake_classname_tags_123_api.py @@ -45,18 +45,21 @@ class FakeClassnameTags123Api(object): >>> thread = api.test_classname(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client body: client model (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Client If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_classname_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.test_classname_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.test_classname_with_http_info(body, **kwargs) # noqa: E501 def test_classname_with_http_info(self, body, **kwargs): # noqa: E501 """To test class name in snake case # noqa: E501 @@ -67,9 +70,18 @@ class FakeClassnameTags123Api(object): >>> thread = api.test_classname_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client body: client model (required) - :return: Client + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Client, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ diff --git a/samples/client/petstore/python-asyncio/petstore_api/api/pet_api.py b/samples/client/petstore/python-asyncio/petstore_api/api/pet_api.py index 7bb32c68aa..1deb664c43 100644 --- a/samples/client/petstore/python-asyncio/petstore_api/api/pet_api.py +++ b/samples/client/petstore/python-asyncio/petstore_api/api/pet_api.py @@ -44,18 +44,21 @@ class PetApi(object): >>> thread = api.add_pet(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Pet body: Pet object that needs to be added to the store (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.add_pet_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.add_pet_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.add_pet_with_http_info(body, **kwargs) # noqa: E501 def add_pet_with_http_info(self, body, **kwargs): # noqa: E501 """Add a new pet to the store # noqa: E501 @@ -65,8 +68,17 @@ class PetApi(object): >>> thread = api.add_pet_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Pet body: Pet object that needs to be added to the store (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -138,19 +150,22 @@ class PetApi(object): >>> thread = api.delete_pet(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: Pet id to delete (required) :param str api_key: + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.delete_pet_with_http_info(pet_id, **kwargs) # noqa: E501 - else: - (data) = self.delete_pet_with_http_info(pet_id, **kwargs) # noqa: E501 - return data + return self.delete_pet_with_http_info(pet_id, **kwargs) # noqa: E501 def delete_pet_with_http_info(self, pet_id, **kwargs): # noqa: E501 """Deletes a pet # noqa: E501 @@ -160,9 +175,18 @@ class PetApi(object): >>> thread = api.delete_pet_with_http_info(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: Pet id to delete (required) :param str api_key: + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -233,18 +257,21 @@ class PetApi(object): >>> thread = api.find_pets_by_status(status, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] status: Status values that need to be considered for filter (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: list[Pet] If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.find_pets_by_status_with_http_info(status, **kwargs) # noqa: E501 - else: - (data) = self.find_pets_by_status_with_http_info(status, **kwargs) # noqa: E501 - return data + return self.find_pets_by_status_with_http_info(status, **kwargs) # noqa: E501 def find_pets_by_status_with_http_info(self, status, **kwargs): # noqa: E501 """Finds Pets by status # noqa: E501 @@ -255,9 +282,18 @@ class PetApi(object): >>> thread = api.find_pets_by_status_with_http_info(status, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] status: Status values that need to be considered for filter (required) - :return: list[Pet] + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -330,18 +366,21 @@ class PetApi(object): >>> thread = api.find_pets_by_tags(tags, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] tags: Tags to filter by (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: list[Pet] If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.find_pets_by_tags_with_http_info(tags, **kwargs) # noqa: E501 - else: - (data) = self.find_pets_by_tags_with_http_info(tags, **kwargs) # noqa: E501 - return data + return self.find_pets_by_tags_with_http_info(tags, **kwargs) # noqa: E501 def find_pets_by_tags_with_http_info(self, tags, **kwargs): # noqa: E501 """Finds Pets by tags # noqa: E501 @@ -352,9 +391,18 @@ class PetApi(object): >>> thread = api.find_pets_by_tags_with_http_info(tags, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] tags: Tags to filter by (required) - :return: list[Pet] + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -427,18 +475,21 @@ class PetApi(object): >>> thread = api.get_pet_by_id(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to return (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Pet If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.get_pet_by_id_with_http_info(pet_id, **kwargs) # noqa: E501 - else: - (data) = self.get_pet_by_id_with_http_info(pet_id, **kwargs) # noqa: E501 - return data + return self.get_pet_by_id_with_http_info(pet_id, **kwargs) # noqa: E501 def get_pet_by_id_with_http_info(self, pet_id, **kwargs): # noqa: E501 """Find pet by ID # noqa: E501 @@ -449,9 +500,18 @@ class PetApi(object): >>> thread = api.get_pet_by_id_with_http_info(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to return (required) - :return: Pet + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Pet, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -522,18 +582,21 @@ class PetApi(object): >>> thread = api.update_pet(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Pet body: Pet object that needs to be added to the store (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.update_pet_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.update_pet_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.update_pet_with_http_info(body, **kwargs) # noqa: E501 def update_pet_with_http_info(self, body, **kwargs): # noqa: E501 """Update an existing pet # noqa: E501 @@ -543,8 +606,17 @@ class PetApi(object): >>> thread = api.update_pet_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Pet body: Pet object that needs to be added to the store (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -616,20 +688,23 @@ class PetApi(object): >>> thread = api.update_pet_with_form(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet that needs to be updated (required) :param str name: Updated name of the pet :param str status: Updated status of the pet + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.update_pet_with_form_with_http_info(pet_id, **kwargs) # noqa: E501 - else: - (data) = self.update_pet_with_form_with_http_info(pet_id, **kwargs) # noqa: E501 - return data + return self.update_pet_with_form_with_http_info(pet_id, **kwargs) # noqa: E501 def update_pet_with_form_with_http_info(self, pet_id, **kwargs): # noqa: E501 """Updates a pet in the store with form data # noqa: E501 @@ -639,10 +714,19 @@ class PetApi(object): >>> thread = api.update_pet_with_form_with_http_info(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet that needs to be updated (required) :param str name: Updated name of the pet :param str status: Updated status of the pet + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -718,20 +802,23 @@ class PetApi(object): >>> thread = api.upload_file(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to update (required) :param str additional_metadata: Additional data to pass to server :param file file: file to upload + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: ApiResponse If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.upload_file_with_http_info(pet_id, **kwargs) # noqa: E501 - else: - (data) = self.upload_file_with_http_info(pet_id, **kwargs) # noqa: E501 - return data + return self.upload_file_with_http_info(pet_id, **kwargs) # noqa: E501 def upload_file_with_http_info(self, pet_id, **kwargs): # noqa: E501 """uploads an image # noqa: E501 @@ -741,11 +828,20 @@ class PetApi(object): >>> thread = api.upload_file_with_http_info(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to update (required) :param str additional_metadata: Additional data to pass to server :param file file: file to upload - :return: ApiResponse + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -824,20 +920,23 @@ class PetApi(object): >>> thread = api.upload_file_with_required_file(pet_id, required_file, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to update (required) :param file required_file: file to upload (required) :param str additional_metadata: Additional data to pass to server + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: ApiResponse If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.upload_file_with_required_file_with_http_info(pet_id, required_file, **kwargs) # noqa: E501 - else: - (data) = self.upload_file_with_required_file_with_http_info(pet_id, required_file, **kwargs) # noqa: E501 - return data + return self.upload_file_with_required_file_with_http_info(pet_id, required_file, **kwargs) # noqa: E501 def upload_file_with_required_file_with_http_info(self, pet_id, required_file, **kwargs): # noqa: E501 """uploads an image (required) # noqa: E501 @@ -847,11 +946,20 @@ class PetApi(object): >>> thread = api.upload_file_with_required_file_with_http_info(pet_id, required_file, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to update (required) :param file required_file: file to upload (required) :param str additional_metadata: Additional data to pass to server - :return: ApiResponse + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ diff --git a/samples/client/petstore/python-asyncio/petstore_api/api/store_api.py b/samples/client/petstore/python-asyncio/petstore_api/api/store_api.py index 5ed68b1c3a..c3aa1c4a3d 100644 --- a/samples/client/petstore/python-asyncio/petstore_api/api/store_api.py +++ b/samples/client/petstore/python-asyncio/petstore_api/api/store_api.py @@ -45,18 +45,21 @@ class StoreApi(object): >>> thread = api.delete_order(order_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str order_id: ID of the order that needs to be deleted (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.delete_order_with_http_info(order_id, **kwargs) # noqa: E501 - else: - (data) = self.delete_order_with_http_info(order_id, **kwargs) # noqa: E501 - return data + return self.delete_order_with_http_info(order_id, **kwargs) # noqa: E501 def delete_order_with_http_info(self, order_id, **kwargs): # noqa: E501 """Delete purchase order by ID # noqa: E501 @@ -67,8 +70,17 @@ class StoreApi(object): >>> thread = api.delete_order_with_http_info(order_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str order_id: ID of the order that needs to be deleted (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -137,17 +149,20 @@ class StoreApi(object): >>> thread = api.get_inventory(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: dict(str, int) If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.get_inventory_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.get_inventory_with_http_info(**kwargs) # noqa: E501 - return data + return self.get_inventory_with_http_info(**kwargs) # noqa: E501 def get_inventory_with_http_info(self, **kwargs): # noqa: E501 """Returns pet inventories by status # noqa: E501 @@ -158,8 +173,17 @@ class StoreApi(object): >>> thread = api.get_inventory_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool - :return: dict(str, int) + :param async_req bool: execute request asynchronously + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(dict(str, int), status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -225,18 +249,21 @@ class StoreApi(object): >>> thread = api.get_order_by_id(order_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int order_id: ID of pet that needs to be fetched (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Order If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.get_order_by_id_with_http_info(order_id, **kwargs) # noqa: E501 - else: - (data) = self.get_order_by_id_with_http_info(order_id, **kwargs) # noqa: E501 - return data + return self.get_order_by_id_with_http_info(order_id, **kwargs) # noqa: E501 def get_order_by_id_with_http_info(self, order_id, **kwargs): # noqa: E501 """Find purchase order by ID # noqa: E501 @@ -247,9 +274,18 @@ class StoreApi(object): >>> thread = api.get_order_by_id_with_http_info(order_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int order_id: ID of pet that needs to be fetched (required) - :return: Order + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Order, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -324,18 +360,21 @@ class StoreApi(object): >>> thread = api.place_order(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Order body: order placed for purchasing the pet (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Order If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.place_order_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.place_order_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.place_order_with_http_info(body, **kwargs) # noqa: E501 def place_order_with_http_info(self, body, **kwargs): # noqa: E501 """Place an order for a pet # noqa: E501 @@ -345,9 +384,18 @@ class StoreApi(object): >>> thread = api.place_order_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Order body: order placed for purchasing the pet (required) - :return: Order + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Order, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ diff --git a/samples/client/petstore/python-asyncio/petstore_api/api/user_api.py b/samples/client/petstore/python-asyncio/petstore_api/api/user_api.py index 923f6347a2..d3674f5ba5 100644 --- a/samples/client/petstore/python-asyncio/petstore_api/api/user_api.py +++ b/samples/client/petstore/python-asyncio/petstore_api/api/user_api.py @@ -45,18 +45,21 @@ class UserApi(object): >>> thread = api.create_user(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param User body: Created user object (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.create_user_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.create_user_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.create_user_with_http_info(body, **kwargs) # noqa: E501 def create_user_with_http_info(self, body, **kwargs): # noqa: E501 """Create user # noqa: E501 @@ -67,8 +70,17 @@ class UserApi(object): >>> thread = api.create_user_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param User body: Created user object (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -136,18 +148,21 @@ class UserApi(object): >>> thread = api.create_users_with_array_input(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[User] body: List of user object (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.create_users_with_array_input_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.create_users_with_array_input_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.create_users_with_array_input_with_http_info(body, **kwargs) # noqa: E501 def create_users_with_array_input_with_http_info(self, body, **kwargs): # noqa: E501 """Creates list of users with given input array # noqa: E501 @@ -157,8 +172,17 @@ class UserApi(object): >>> thread = api.create_users_with_array_input_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[User] body: List of user object (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -226,18 +250,21 @@ class UserApi(object): >>> thread = api.create_users_with_list_input(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[User] body: List of user object (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.create_users_with_list_input_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.create_users_with_list_input_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.create_users_with_list_input_with_http_info(body, **kwargs) # noqa: E501 def create_users_with_list_input_with_http_info(self, body, **kwargs): # noqa: E501 """Creates list of users with given input array # noqa: E501 @@ -247,8 +274,17 @@ class UserApi(object): >>> thread = api.create_users_with_list_input_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[User] body: List of user object (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -317,18 +353,21 @@ class UserApi(object): >>> thread = api.delete_user(username, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The name that needs to be deleted (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.delete_user_with_http_info(username, **kwargs) # noqa: E501 - else: - (data) = self.delete_user_with_http_info(username, **kwargs) # noqa: E501 - return data + return self.delete_user_with_http_info(username, **kwargs) # noqa: E501 def delete_user_with_http_info(self, username, **kwargs): # noqa: E501 """Delete user # noqa: E501 @@ -339,8 +378,17 @@ class UserApi(object): >>> thread = api.delete_user_with_http_info(username, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The name that needs to be deleted (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -408,18 +456,21 @@ class UserApi(object): >>> thread = api.get_user_by_name(username, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The name that needs to be fetched. Use user1 for testing. (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: User If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.get_user_by_name_with_http_info(username, **kwargs) # noqa: E501 - else: - (data) = self.get_user_by_name_with_http_info(username, **kwargs) # noqa: E501 - return data + return self.get_user_by_name_with_http_info(username, **kwargs) # noqa: E501 def get_user_by_name_with_http_info(self, username, **kwargs): # noqa: E501 """Get user by user name # noqa: E501 @@ -429,9 +480,18 @@ class UserApi(object): >>> thread = api.get_user_by_name_with_http_info(username, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The name that needs to be fetched. Use user1 for testing. (required) - :return: User + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(User, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -502,19 +562,22 @@ class UserApi(object): >>> thread = api.login_user(username, password, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The user name for login (required) :param str password: The password for login in clear text (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: str If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.login_user_with_http_info(username, password, **kwargs) # noqa: E501 - else: - (data) = self.login_user_with_http_info(username, password, **kwargs) # noqa: E501 - return data + return self.login_user_with_http_info(username, password, **kwargs) # noqa: E501 def login_user_with_http_info(self, username, password, **kwargs): # noqa: E501 """Logs user into the system # noqa: E501 @@ -524,10 +587,19 @@ class UserApi(object): >>> thread = api.login_user_with_http_info(username, password, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The user name for login (required) :param str password: The password for login in clear text (required) - :return: str + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(str, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -604,17 +676,20 @@ class UserApi(object): >>> thread = api.logout_user(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.logout_user_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.logout_user_with_http_info(**kwargs) # noqa: E501 - return data + return self.logout_user_with_http_info(**kwargs) # noqa: E501 def logout_user_with_http_info(self, **kwargs): # noqa: E501 """Logs out current logged in user session # noqa: E501 @@ -624,7 +699,16 @@ class UserApi(object): >>> thread = api.logout_user_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -687,19 +771,22 @@ class UserApi(object): >>> thread = api.update_user(username, body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: name that need to be deleted (required) :param User body: Updated user object (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.update_user_with_http_info(username, body, **kwargs) # noqa: E501 - else: - (data) = self.update_user_with_http_info(username, body, **kwargs) # noqa: E501 - return data + return self.update_user_with_http_info(username, body, **kwargs) # noqa: E501 def update_user_with_http_info(self, username, body, **kwargs): # noqa: E501 """Updated user # noqa: E501 @@ -710,9 +797,18 @@ class UserApi(object): >>> thread = api.update_user_with_http_info(username, body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: name that need to be deleted (required) :param User body: Updated user object (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. diff --git a/samples/client/petstore/python-asyncio/petstore_api/configuration.py b/samples/client/petstore/python-asyncio/petstore_api/configuration.py index 53b08487f0..fa0c3f4d32 100644 --- a/samples/client/petstore/python-asyncio/petstore_api/configuration.py +++ b/samples/client/petstore/python-asyncio/petstore_api/configuration.py @@ -27,9 +27,9 @@ class TypeWithDefault(type): super(TypeWithDefault, cls).__init__(name, bases, dct) cls._default = None - def __call__(cls): + def __call__(cls, **kwargs): if cls._default is None: - cls._default = type.__call__(cls) + cls._default = type.__call__(cls, **kwargs) return copy.copy(cls._default) def set_default(cls, default): @@ -41,69 +41,100 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)): Ref: https://openapi-generator.tech Do not edit the class manually. + + :param host: Base url + :param api_key: Dict to store API key(s) + :param api_key_prefix: Dict to store API prefix (e.g. Bearer) + :param username: Username for HTTP basic authentication + :param password: Password for HTTP basic authentication """ - def __init__(self): - """Constructor""" - # Default Base url - self.host = "http://petstore.swagger.io:80/v2" - # Temp file folder for downloading files + def __init__(self, host="http://petstore.swagger.io:80/v2", + api_key={}, api_key_prefix={}, + username="", password=""): + """Constructor + """ + self.host = host + """Default Base url + """ self.temp_folder_path = None - + """Temp file folder for downloading files + """ # Authentication Settings - # dict to store API key(s) - self.api_key = {} - # dict to store API prefix (e.g. Bearer) - self.api_key_prefix = {} - # Username for HTTP basic authentication - self.username = "" - # Password for HTTP basic authentication - self.password = "" - # access token for OAuth/Bearer + self.api_key = api_key + """dict to store API key(s) + """ + self.api_key_prefix = api_key_prefix + """dict to store API prefix (e.g. Bearer) + """ + self.username = username + """Username for HTTP basic authentication + """ + self.password = password + """Password for HTTP basic authentication + """ self.access_token = "" - # Logging Settings + """access token for OAuth/Bearer + """ self.logger = {} + """Logging Settings + """ self.logger["package_logger"] = logging.getLogger("petstore_api") self.logger["urllib3_logger"] = logging.getLogger("urllib3") - # Log format self.logger_format = '%(asctime)s %(levelname)s %(message)s' - # Log stream handler + """Log format + """ self.logger_stream_handler = None - # Log file handler + """Log stream handler + """ self.logger_file_handler = None - # Debug file location + """Log file handler + """ self.logger_file = None - # Debug switch + """Debug file location + """ self.debug = False + """Debug switch + """ - # SSL/TLS verification - # Set this to false to skip verifying SSL certificate when calling API - # from https server. self.verify_ssl = True - # Set this to customize the certificate file to verify the peer. + """SSL/TLS verification + Set this to false to skip verifying SSL certificate when calling API + from https server. + """ self.ssl_ca_cert = None - # client certificate file + """Set this to customize the certificate file to verify the peer. + """ self.cert_file = None - # client key file + """client certificate file + """ self.key_file = None - # Set this to True/False to enable/disable SSL hostname verification. + """client key file + """ self.assert_hostname = None + """Set this to True/False to enable/disable SSL hostname verification. + """ - # urllib3 connection pool's maximum number of connections saved - # per pool. urllib3 uses 1 connection as default value, but this is - # not the best value when you are making a lot of possibly parallel - # requests to the same host, which is often the case here. - # cpu_count * 5 is used as default value to increase performance. self.connection_pool_maxsize = multiprocessing.cpu_count() * 5 + """urllib3 connection pool's maximum number of connections saved + per pool. urllib3 uses 1 connection as default value, but this is + not the best value when you are making a lot of possibly parallel + requests to the same host, which is often the case here. + cpu_count * 5 is used as default value to increase performance. + """ - # Proxy URL self.proxy = None - # Proxy headers + """Proxy URL + """ self.proxy_headers = None - # Safe chars for path_param + """Proxy headers + """ self.safe_chars_for_path_param = '' - # Adding retries to override urllib3 default value 3 + """Safe chars for path_param + """ self.retries = None + """Adding retries to override urllib3 default value 3 + """ @property def logger_file(self): diff --git a/samples/client/petstore/python-tornado/.openapi-generator/VERSION b/samples/client/petstore/python-tornado/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/python-tornado/.openapi-generator/VERSION +++ b/samples/client/petstore/python-tornado/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/python-tornado/docs/AnotherFakeApi.md b/samples/client/petstore/python-tornado/docs/AnotherFakeApi.md index c1c76a67fd..c3f84772cf 100644 --- a/samples/client/petstore/python-tornado/docs/AnotherFakeApi.md +++ b/samples/client/petstore/python-tornado/docs/AnotherFakeApi.md @@ -54,5 +54,10 @@ No authorization required - **Content-Type**: application/json - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/client/petstore/python-tornado/docs/FakeApi.md b/samples/client/petstore/python-tornado/docs/FakeApi.md index c46bf1e497..946a8ce3e7 100644 --- a/samples/client/petstore/python-tornado/docs/FakeApi.md +++ b/samples/client/petstore/python-tornado/docs/FakeApi.md @@ -65,6 +65,11 @@ No authorization required - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16 - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **fake_outer_boolean_serialize** @@ -113,6 +118,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output boolean | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **fake_outer_composite_serialize** @@ -161,6 +171,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output composite | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **fake_outer_number_serialize** @@ -209,6 +224,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output number | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **fake_outer_string_serialize** @@ -257,6 +277,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output string | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_body_with_file_schema** @@ -304,6 +329,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Success | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_body_with_query_params** @@ -351,6 +381,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Success | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_client_model** @@ -400,6 +435,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_endpoint_parameters** @@ -479,6 +519,12 @@ void (empty response body) - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid username supplied | - | +**404** | User not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_enum_parameters** @@ -541,6 +587,12 @@ No authorization required - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid request | - | +**404** | Not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_group_parameters** @@ -599,6 +651,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Someting wrong | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_inline_additional_properties** @@ -645,6 +702,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_json_form_data** @@ -693,5 +755,10 @@ No authorization required - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/client/petstore/python-tornado/docs/FakeClassnameTags123Api.md b/samples/client/petstore/python-tornado/docs/FakeClassnameTags123Api.md index aed30cb56d..7ffcf21122 100644 --- a/samples/client/petstore/python-tornado/docs/FakeClassnameTags123Api.md +++ b/samples/client/petstore/python-tornado/docs/FakeClassnameTags123Api.md @@ -60,5 +60,10 @@ Name | Type | Description | Notes - **Content-Type**: application/json - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/client/petstore/python-tornado/docs/PetApi.md b/samples/client/petstore/python-tornado/docs/PetApi.md index 227fa2ada1..3ed2551bd6 100644 --- a/samples/client/petstore/python-tornado/docs/PetApi.md +++ b/samples/client/petstore/python-tornado/docs/PetApi.md @@ -63,6 +63,12 @@ void (empty response body) - **Content-Type**: application/json, application/xml - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**405** | Invalid input | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **delete_pet** @@ -115,6 +121,12 @@ void (empty response body) - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid pet value | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **find_pets_by_status** @@ -168,6 +180,12 @@ Name | Type | Description | Notes - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid status value | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **find_pets_by_tags** @@ -221,6 +239,12 @@ Name | Type | Description | Notes - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid tag value | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **get_pet_by_id** @@ -276,6 +300,13 @@ Name | Type | Description | Notes - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid ID supplied | - | +**404** | Pet not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **update_pet** @@ -326,6 +357,14 @@ void (empty response body) - **Content-Type**: application/json, application/xml - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid ID supplied | - | +**404** | Pet not found | - | +**405** | Validation exception | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **update_pet_with_form** @@ -380,6 +419,11 @@ void (empty response body) - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**405** | Invalid input | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **upload_file** @@ -435,6 +479,11 @@ Name | Type | Description | Notes - **Content-Type**: multipart/form-data - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **upload_file_with_required_file** @@ -490,5 +539,10 @@ Name | Type | Description | Notes - **Content-Type**: multipart/form-data - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/client/petstore/python-tornado/docs/StoreApi.md b/samples/client/petstore/python-tornado/docs/StoreApi.md index af190f931d..76b94f73dc 100644 --- a/samples/client/petstore/python-tornado/docs/StoreApi.md +++ b/samples/client/petstore/python-tornado/docs/StoreApi.md @@ -56,6 +56,12 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid ID supplied | - | +**404** | Order not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **get_inventory** @@ -107,6 +113,11 @@ This endpoint does not need any parameter. - **Content-Type**: Not defined - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **get_order_by_id** @@ -156,6 +167,13 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid ID supplied | - | +**404** | Order not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **place_order** @@ -203,5 +221,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid Order | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/client/petstore/python-tornado/docs/UserApi.md b/samples/client/petstore/python-tornado/docs/UserApi.md index 907dc9ec36..fdc2c30df9 100644 --- a/samples/client/petstore/python-tornado/docs/UserApi.md +++ b/samples/client/petstore/python-tornado/docs/UserApi.md @@ -60,6 +60,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **create_users_with_array_input** @@ -106,6 +111,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **create_users_with_list_input** @@ -152,6 +162,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **delete_user** @@ -200,6 +215,12 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid username supplied | - | +**404** | User not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **get_user_by_name** @@ -247,6 +268,13 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid username supplied | - | +**404** | User not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **login_user** @@ -296,6 +324,12 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | * X-Rate-Limit - calls per hour allowed by the user
* X-Expires-After - date in UTC when token expires
| +**400** | Invalid username/password supplied | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **logout_user** @@ -338,6 +372,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **update_user** @@ -388,5 +427,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid user supplied | - | +**404** | User not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/client/petstore/python-tornado/petstore_api/api/another_fake_api.py b/samples/client/petstore/python-tornado/petstore_api/api/another_fake_api.py index d44e05e78c..a47a8e3ea1 100644 --- a/samples/client/petstore/python-tornado/petstore_api/api/another_fake_api.py +++ b/samples/client/petstore/python-tornado/petstore_api/api/another_fake_api.py @@ -45,18 +45,21 @@ class AnotherFakeApi(object): >>> thread = api.call_123_test_special_tags(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client body: client model (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Client If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.call_123_test_special_tags_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.call_123_test_special_tags_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.call_123_test_special_tags_with_http_info(body, **kwargs) # noqa: E501 def call_123_test_special_tags_with_http_info(self, body, **kwargs): # noqa: E501 """To test special tags # noqa: E501 @@ -67,9 +70,18 @@ class AnotherFakeApi(object): >>> thread = api.call_123_test_special_tags_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client body: client model (required) - :return: Client + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Client, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ diff --git a/samples/client/petstore/python-tornado/petstore_api/api/fake_api.py b/samples/client/petstore/python-tornado/petstore_api/api/fake_api.py index 08b6578095..1847804c55 100644 --- a/samples/client/petstore/python-tornado/petstore_api/api/fake_api.py +++ b/samples/client/petstore/python-tornado/petstore_api/api/fake_api.py @@ -45,18 +45,21 @@ class FakeApi(object): >>> thread = api.create_xml_item(xml_item, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param XmlItem xml_item: XmlItem Body (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.create_xml_item_with_http_info(xml_item, **kwargs) # noqa: E501 - else: - (data) = self.create_xml_item_with_http_info(xml_item, **kwargs) # noqa: E501 - return data + return self.create_xml_item_with_http_info(xml_item, **kwargs) # noqa: E501 def create_xml_item_with_http_info(self, xml_item, **kwargs): # noqa: E501 """creates an XmlItem # noqa: E501 @@ -67,8 +70,17 @@ class FakeApi(object): >>> thread = api.create_xml_item_with_http_info(xml_item, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param XmlItem xml_item: XmlItem Body (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -141,18 +153,21 @@ class FakeApi(object): >>> thread = api.fake_outer_boolean_serialize(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param bool body: Input boolean as post body + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: bool If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.fake_outer_boolean_serialize_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.fake_outer_boolean_serialize_with_http_info(**kwargs) # noqa: E501 - return data + return self.fake_outer_boolean_serialize_with_http_info(**kwargs) # noqa: E501 def fake_outer_boolean_serialize_with_http_info(self, **kwargs): # noqa: E501 """fake_outer_boolean_serialize # noqa: E501 @@ -163,9 +178,18 @@ class FakeApi(object): >>> thread = api.fake_outer_boolean_serialize_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param bool body: Input boolean as post body - :return: bool + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(bool, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -233,18 +257,21 @@ class FakeApi(object): >>> thread = api.fake_outer_composite_serialize(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param OuterComposite body: Input composite as post body + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: OuterComposite If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.fake_outer_composite_serialize_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.fake_outer_composite_serialize_with_http_info(**kwargs) # noqa: E501 - return data + return self.fake_outer_composite_serialize_with_http_info(**kwargs) # noqa: E501 def fake_outer_composite_serialize_with_http_info(self, **kwargs): # noqa: E501 """fake_outer_composite_serialize # noqa: E501 @@ -255,9 +282,18 @@ class FakeApi(object): >>> thread = api.fake_outer_composite_serialize_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param OuterComposite body: Input composite as post body - :return: OuterComposite + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(OuterComposite, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -325,18 +361,21 @@ class FakeApi(object): >>> thread = api.fake_outer_number_serialize(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param float body: Input number as post body + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: float If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.fake_outer_number_serialize_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.fake_outer_number_serialize_with_http_info(**kwargs) # noqa: E501 - return data + return self.fake_outer_number_serialize_with_http_info(**kwargs) # noqa: E501 def fake_outer_number_serialize_with_http_info(self, **kwargs): # noqa: E501 """fake_outer_number_serialize # noqa: E501 @@ -347,9 +386,18 @@ class FakeApi(object): >>> thread = api.fake_outer_number_serialize_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param float body: Input number as post body - :return: float + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(float, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -417,18 +465,21 @@ class FakeApi(object): >>> thread = api.fake_outer_string_serialize(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str body: Input string as post body + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: str If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.fake_outer_string_serialize_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.fake_outer_string_serialize_with_http_info(**kwargs) # noqa: E501 - return data + return self.fake_outer_string_serialize_with_http_info(**kwargs) # noqa: E501 def fake_outer_string_serialize_with_http_info(self, **kwargs): # noqa: E501 """fake_outer_string_serialize # noqa: E501 @@ -439,9 +490,18 @@ class FakeApi(object): >>> thread = api.fake_outer_string_serialize_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str body: Input string as post body - :return: str + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(str, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -509,18 +569,21 @@ class FakeApi(object): >>> thread = api.test_body_with_file_schema(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param FileSchemaTestClass body: (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_body_with_file_schema_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.test_body_with_file_schema_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.test_body_with_file_schema_with_http_info(body, **kwargs) # noqa: E501 def test_body_with_file_schema_with_http_info(self, body, **kwargs): # noqa: E501 """test_body_with_file_schema # noqa: E501 @@ -531,8 +594,17 @@ class FakeApi(object): >>> thread = api.test_body_with_file_schema_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param FileSchemaTestClass body: (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -604,19 +676,22 @@ class FakeApi(object): >>> thread = api.test_body_with_query_params(query, body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str query: (required) :param User body: (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_body_with_query_params_with_http_info(query, body, **kwargs) # noqa: E501 - else: - (data) = self.test_body_with_query_params_with_http_info(query, body, **kwargs) # noqa: E501 - return data + return self.test_body_with_query_params_with_http_info(query, body, **kwargs) # noqa: E501 def test_body_with_query_params_with_http_info(self, query, body, **kwargs): # noqa: E501 """test_body_with_query_params # noqa: E501 @@ -626,9 +701,18 @@ class FakeApi(object): >>> thread = api.test_body_with_query_params_with_http_info(query, body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str query: (required) :param User body: (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -707,18 +791,21 @@ class FakeApi(object): >>> thread = api.test_client_model(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client body: client model (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Client If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_client_model_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.test_client_model_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.test_client_model_with_http_info(body, **kwargs) # noqa: E501 def test_client_model_with_http_info(self, body, **kwargs): # noqa: E501 """To test \"client\" model # noqa: E501 @@ -729,9 +816,18 @@ class FakeApi(object): >>> thread = api.test_client_model_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client body: client model (required) - :return: Client + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Client, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -807,7 +903,7 @@ class FakeApi(object): >>> thread = api.test_endpoint_parameters(number, double, pattern_without_delimiter, byte, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param float number: None (required) :param float double: None (required) :param str pattern_without_delimiter: None (required) @@ -822,16 +918,19 @@ class FakeApi(object): :param datetime date_time: None :param str password: None :param str param_callback: None + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, **kwargs) # noqa: E501 - else: - (data) = self.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, **kwargs) # noqa: E501 - return data + return self.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, **kwargs) # noqa: E501 def test_endpoint_parameters_with_http_info(self, number, double, pattern_without_delimiter, byte, **kwargs): # noqa: E501 """Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 # noqa: E501 @@ -842,7 +941,7 @@ class FakeApi(object): >>> thread = api.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param float number: None (required) :param float double: None (required) :param str pattern_without_delimiter: None (required) @@ -857,6 +956,15 @@ class FakeApi(object): :param datetime date_time: None :param str password: None :param str param_callback: None + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -995,7 +1103,7 @@ class FakeApi(object): >>> thread = api.test_enum_parameters(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] enum_header_string_array: Header parameter enum test (string array) :param str enum_header_string: Header parameter enum test (string) :param list[str] enum_query_string_array: Query parameter enum test (string array) @@ -1004,16 +1112,19 @@ class FakeApi(object): :param float enum_query_double: Query parameter enum test (double) :param list[str] enum_form_string_array: Form parameter enum test (string array) :param str enum_form_string: Form parameter enum test (string) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_enum_parameters_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.test_enum_parameters_with_http_info(**kwargs) # noqa: E501 - return data + return self.test_enum_parameters_with_http_info(**kwargs) # noqa: E501 def test_enum_parameters_with_http_info(self, **kwargs): # noqa: E501 """To test enum parameters # noqa: E501 @@ -1024,7 +1135,7 @@ class FakeApi(object): >>> thread = api.test_enum_parameters_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] enum_header_string_array: Header parameter enum test (string array) :param str enum_header_string: Header parameter enum test (string) :param list[str] enum_query_string_array: Query parameter enum test (string array) @@ -1033,6 +1144,15 @@ class FakeApi(object): :param float enum_query_double: Query parameter enum test (double) :param list[str] enum_form_string_array: Form parameter enum test (string array) :param str enum_form_string: Form parameter enum test (string) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -1118,23 +1238,26 @@ class FakeApi(object): >>> thread = api.test_group_parameters(required_string_group, required_boolean_group, required_int64_group, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int required_string_group: Required String in group parameters (required) :param bool required_boolean_group: Required Boolean in group parameters (required) :param int required_int64_group: Required Integer in group parameters (required) :param int string_group: String in group parameters :param bool boolean_group: Boolean in group parameters :param int int64_group: Integer in group parameters + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, **kwargs) # noqa: E501 - else: - (data) = self.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, **kwargs) # noqa: E501 - return data + return self.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, **kwargs) # noqa: E501 def test_group_parameters_with_http_info(self, required_string_group, required_boolean_group, required_int64_group, **kwargs): # noqa: E501 """Fake endpoint to test group parameters (optional) # noqa: E501 @@ -1145,13 +1268,22 @@ class FakeApi(object): >>> thread = api.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int required_string_group: Required String in group parameters (required) :param bool required_boolean_group: Required Boolean in group parameters (required) :param int required_int64_group: Required Integer in group parameters (required) :param int string_group: String in group parameters :param bool boolean_group: Boolean in group parameters :param int int64_group: Integer in group parameters + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -1237,18 +1369,21 @@ class FakeApi(object): >>> thread = api.test_inline_additional_properties(param, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param dict(str, str) param: request body (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_inline_additional_properties_with_http_info(param, **kwargs) # noqa: E501 - else: - (data) = self.test_inline_additional_properties_with_http_info(param, **kwargs) # noqa: E501 - return data + return self.test_inline_additional_properties_with_http_info(param, **kwargs) # noqa: E501 def test_inline_additional_properties_with_http_info(self, param, **kwargs): # noqa: E501 """test inline additionalProperties # noqa: E501 @@ -1258,8 +1393,17 @@ class FakeApi(object): >>> thread = api.test_inline_additional_properties_with_http_info(param, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param dict(str, str) param: request body (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -1331,19 +1475,22 @@ class FakeApi(object): >>> thread = api.test_json_form_data(param, param2, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str param: field1 (required) :param str param2: field2 (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_json_form_data_with_http_info(param, param2, **kwargs) # noqa: E501 - else: - (data) = self.test_json_form_data_with_http_info(param, param2, **kwargs) # noqa: E501 - return data + return self.test_json_form_data_with_http_info(param, param2, **kwargs) # noqa: E501 def test_json_form_data_with_http_info(self, param, param2, **kwargs): # noqa: E501 """test json serialization of form data # noqa: E501 @@ -1353,9 +1500,18 @@ class FakeApi(object): >>> thread = api.test_json_form_data_with_http_info(param, param2, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str param: field1 (required) :param str param2: field2 (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. diff --git a/samples/client/petstore/python-tornado/petstore_api/api/fake_classname_tags_123_api.py b/samples/client/petstore/python-tornado/petstore_api/api/fake_classname_tags_123_api.py index 635d968283..3e778e9226 100644 --- a/samples/client/petstore/python-tornado/petstore_api/api/fake_classname_tags_123_api.py +++ b/samples/client/petstore/python-tornado/petstore_api/api/fake_classname_tags_123_api.py @@ -45,18 +45,21 @@ class FakeClassnameTags123Api(object): >>> thread = api.test_classname(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client body: client model (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Client If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_classname_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.test_classname_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.test_classname_with_http_info(body, **kwargs) # noqa: E501 def test_classname_with_http_info(self, body, **kwargs): # noqa: E501 """To test class name in snake case # noqa: E501 @@ -67,9 +70,18 @@ class FakeClassnameTags123Api(object): >>> thread = api.test_classname_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client body: client model (required) - :return: Client + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Client, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ diff --git a/samples/client/petstore/python-tornado/petstore_api/api/pet_api.py b/samples/client/petstore/python-tornado/petstore_api/api/pet_api.py index 7bb32c68aa..1deb664c43 100644 --- a/samples/client/petstore/python-tornado/petstore_api/api/pet_api.py +++ b/samples/client/petstore/python-tornado/petstore_api/api/pet_api.py @@ -44,18 +44,21 @@ class PetApi(object): >>> thread = api.add_pet(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Pet body: Pet object that needs to be added to the store (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.add_pet_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.add_pet_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.add_pet_with_http_info(body, **kwargs) # noqa: E501 def add_pet_with_http_info(self, body, **kwargs): # noqa: E501 """Add a new pet to the store # noqa: E501 @@ -65,8 +68,17 @@ class PetApi(object): >>> thread = api.add_pet_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Pet body: Pet object that needs to be added to the store (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -138,19 +150,22 @@ class PetApi(object): >>> thread = api.delete_pet(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: Pet id to delete (required) :param str api_key: + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.delete_pet_with_http_info(pet_id, **kwargs) # noqa: E501 - else: - (data) = self.delete_pet_with_http_info(pet_id, **kwargs) # noqa: E501 - return data + return self.delete_pet_with_http_info(pet_id, **kwargs) # noqa: E501 def delete_pet_with_http_info(self, pet_id, **kwargs): # noqa: E501 """Deletes a pet # noqa: E501 @@ -160,9 +175,18 @@ class PetApi(object): >>> thread = api.delete_pet_with_http_info(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: Pet id to delete (required) :param str api_key: + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -233,18 +257,21 @@ class PetApi(object): >>> thread = api.find_pets_by_status(status, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] status: Status values that need to be considered for filter (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: list[Pet] If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.find_pets_by_status_with_http_info(status, **kwargs) # noqa: E501 - else: - (data) = self.find_pets_by_status_with_http_info(status, **kwargs) # noqa: E501 - return data + return self.find_pets_by_status_with_http_info(status, **kwargs) # noqa: E501 def find_pets_by_status_with_http_info(self, status, **kwargs): # noqa: E501 """Finds Pets by status # noqa: E501 @@ -255,9 +282,18 @@ class PetApi(object): >>> thread = api.find_pets_by_status_with_http_info(status, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] status: Status values that need to be considered for filter (required) - :return: list[Pet] + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -330,18 +366,21 @@ class PetApi(object): >>> thread = api.find_pets_by_tags(tags, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] tags: Tags to filter by (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: list[Pet] If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.find_pets_by_tags_with_http_info(tags, **kwargs) # noqa: E501 - else: - (data) = self.find_pets_by_tags_with_http_info(tags, **kwargs) # noqa: E501 - return data + return self.find_pets_by_tags_with_http_info(tags, **kwargs) # noqa: E501 def find_pets_by_tags_with_http_info(self, tags, **kwargs): # noqa: E501 """Finds Pets by tags # noqa: E501 @@ -352,9 +391,18 @@ class PetApi(object): >>> thread = api.find_pets_by_tags_with_http_info(tags, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] tags: Tags to filter by (required) - :return: list[Pet] + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -427,18 +475,21 @@ class PetApi(object): >>> thread = api.get_pet_by_id(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to return (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Pet If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.get_pet_by_id_with_http_info(pet_id, **kwargs) # noqa: E501 - else: - (data) = self.get_pet_by_id_with_http_info(pet_id, **kwargs) # noqa: E501 - return data + return self.get_pet_by_id_with_http_info(pet_id, **kwargs) # noqa: E501 def get_pet_by_id_with_http_info(self, pet_id, **kwargs): # noqa: E501 """Find pet by ID # noqa: E501 @@ -449,9 +500,18 @@ class PetApi(object): >>> thread = api.get_pet_by_id_with_http_info(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to return (required) - :return: Pet + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Pet, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -522,18 +582,21 @@ class PetApi(object): >>> thread = api.update_pet(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Pet body: Pet object that needs to be added to the store (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.update_pet_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.update_pet_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.update_pet_with_http_info(body, **kwargs) # noqa: E501 def update_pet_with_http_info(self, body, **kwargs): # noqa: E501 """Update an existing pet # noqa: E501 @@ -543,8 +606,17 @@ class PetApi(object): >>> thread = api.update_pet_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Pet body: Pet object that needs to be added to the store (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -616,20 +688,23 @@ class PetApi(object): >>> thread = api.update_pet_with_form(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet that needs to be updated (required) :param str name: Updated name of the pet :param str status: Updated status of the pet + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.update_pet_with_form_with_http_info(pet_id, **kwargs) # noqa: E501 - else: - (data) = self.update_pet_with_form_with_http_info(pet_id, **kwargs) # noqa: E501 - return data + return self.update_pet_with_form_with_http_info(pet_id, **kwargs) # noqa: E501 def update_pet_with_form_with_http_info(self, pet_id, **kwargs): # noqa: E501 """Updates a pet in the store with form data # noqa: E501 @@ -639,10 +714,19 @@ class PetApi(object): >>> thread = api.update_pet_with_form_with_http_info(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet that needs to be updated (required) :param str name: Updated name of the pet :param str status: Updated status of the pet + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -718,20 +802,23 @@ class PetApi(object): >>> thread = api.upload_file(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to update (required) :param str additional_metadata: Additional data to pass to server :param file file: file to upload + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: ApiResponse If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.upload_file_with_http_info(pet_id, **kwargs) # noqa: E501 - else: - (data) = self.upload_file_with_http_info(pet_id, **kwargs) # noqa: E501 - return data + return self.upload_file_with_http_info(pet_id, **kwargs) # noqa: E501 def upload_file_with_http_info(self, pet_id, **kwargs): # noqa: E501 """uploads an image # noqa: E501 @@ -741,11 +828,20 @@ class PetApi(object): >>> thread = api.upload_file_with_http_info(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to update (required) :param str additional_metadata: Additional data to pass to server :param file file: file to upload - :return: ApiResponse + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -824,20 +920,23 @@ class PetApi(object): >>> thread = api.upload_file_with_required_file(pet_id, required_file, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to update (required) :param file required_file: file to upload (required) :param str additional_metadata: Additional data to pass to server + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: ApiResponse If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.upload_file_with_required_file_with_http_info(pet_id, required_file, **kwargs) # noqa: E501 - else: - (data) = self.upload_file_with_required_file_with_http_info(pet_id, required_file, **kwargs) # noqa: E501 - return data + return self.upload_file_with_required_file_with_http_info(pet_id, required_file, **kwargs) # noqa: E501 def upload_file_with_required_file_with_http_info(self, pet_id, required_file, **kwargs): # noqa: E501 """uploads an image (required) # noqa: E501 @@ -847,11 +946,20 @@ class PetApi(object): >>> thread = api.upload_file_with_required_file_with_http_info(pet_id, required_file, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to update (required) :param file required_file: file to upload (required) :param str additional_metadata: Additional data to pass to server - :return: ApiResponse + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ diff --git a/samples/client/petstore/python-tornado/petstore_api/api/store_api.py b/samples/client/petstore/python-tornado/petstore_api/api/store_api.py index 5ed68b1c3a..c3aa1c4a3d 100644 --- a/samples/client/petstore/python-tornado/petstore_api/api/store_api.py +++ b/samples/client/petstore/python-tornado/petstore_api/api/store_api.py @@ -45,18 +45,21 @@ class StoreApi(object): >>> thread = api.delete_order(order_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str order_id: ID of the order that needs to be deleted (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.delete_order_with_http_info(order_id, **kwargs) # noqa: E501 - else: - (data) = self.delete_order_with_http_info(order_id, **kwargs) # noqa: E501 - return data + return self.delete_order_with_http_info(order_id, **kwargs) # noqa: E501 def delete_order_with_http_info(self, order_id, **kwargs): # noqa: E501 """Delete purchase order by ID # noqa: E501 @@ -67,8 +70,17 @@ class StoreApi(object): >>> thread = api.delete_order_with_http_info(order_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str order_id: ID of the order that needs to be deleted (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -137,17 +149,20 @@ class StoreApi(object): >>> thread = api.get_inventory(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: dict(str, int) If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.get_inventory_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.get_inventory_with_http_info(**kwargs) # noqa: E501 - return data + return self.get_inventory_with_http_info(**kwargs) # noqa: E501 def get_inventory_with_http_info(self, **kwargs): # noqa: E501 """Returns pet inventories by status # noqa: E501 @@ -158,8 +173,17 @@ class StoreApi(object): >>> thread = api.get_inventory_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool - :return: dict(str, int) + :param async_req bool: execute request asynchronously + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(dict(str, int), status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -225,18 +249,21 @@ class StoreApi(object): >>> thread = api.get_order_by_id(order_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int order_id: ID of pet that needs to be fetched (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Order If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.get_order_by_id_with_http_info(order_id, **kwargs) # noqa: E501 - else: - (data) = self.get_order_by_id_with_http_info(order_id, **kwargs) # noqa: E501 - return data + return self.get_order_by_id_with_http_info(order_id, **kwargs) # noqa: E501 def get_order_by_id_with_http_info(self, order_id, **kwargs): # noqa: E501 """Find purchase order by ID # noqa: E501 @@ -247,9 +274,18 @@ class StoreApi(object): >>> thread = api.get_order_by_id_with_http_info(order_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int order_id: ID of pet that needs to be fetched (required) - :return: Order + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Order, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -324,18 +360,21 @@ class StoreApi(object): >>> thread = api.place_order(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Order body: order placed for purchasing the pet (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Order If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.place_order_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.place_order_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.place_order_with_http_info(body, **kwargs) # noqa: E501 def place_order_with_http_info(self, body, **kwargs): # noqa: E501 """Place an order for a pet # noqa: E501 @@ -345,9 +384,18 @@ class StoreApi(object): >>> thread = api.place_order_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Order body: order placed for purchasing the pet (required) - :return: Order + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Order, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ diff --git a/samples/client/petstore/python-tornado/petstore_api/api/user_api.py b/samples/client/petstore/python-tornado/petstore_api/api/user_api.py index 923f6347a2..d3674f5ba5 100644 --- a/samples/client/petstore/python-tornado/petstore_api/api/user_api.py +++ b/samples/client/petstore/python-tornado/petstore_api/api/user_api.py @@ -45,18 +45,21 @@ class UserApi(object): >>> thread = api.create_user(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param User body: Created user object (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.create_user_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.create_user_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.create_user_with_http_info(body, **kwargs) # noqa: E501 def create_user_with_http_info(self, body, **kwargs): # noqa: E501 """Create user # noqa: E501 @@ -67,8 +70,17 @@ class UserApi(object): >>> thread = api.create_user_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param User body: Created user object (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -136,18 +148,21 @@ class UserApi(object): >>> thread = api.create_users_with_array_input(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[User] body: List of user object (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.create_users_with_array_input_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.create_users_with_array_input_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.create_users_with_array_input_with_http_info(body, **kwargs) # noqa: E501 def create_users_with_array_input_with_http_info(self, body, **kwargs): # noqa: E501 """Creates list of users with given input array # noqa: E501 @@ -157,8 +172,17 @@ class UserApi(object): >>> thread = api.create_users_with_array_input_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[User] body: List of user object (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -226,18 +250,21 @@ class UserApi(object): >>> thread = api.create_users_with_list_input(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[User] body: List of user object (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.create_users_with_list_input_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.create_users_with_list_input_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.create_users_with_list_input_with_http_info(body, **kwargs) # noqa: E501 def create_users_with_list_input_with_http_info(self, body, **kwargs): # noqa: E501 """Creates list of users with given input array # noqa: E501 @@ -247,8 +274,17 @@ class UserApi(object): >>> thread = api.create_users_with_list_input_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[User] body: List of user object (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -317,18 +353,21 @@ class UserApi(object): >>> thread = api.delete_user(username, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The name that needs to be deleted (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.delete_user_with_http_info(username, **kwargs) # noqa: E501 - else: - (data) = self.delete_user_with_http_info(username, **kwargs) # noqa: E501 - return data + return self.delete_user_with_http_info(username, **kwargs) # noqa: E501 def delete_user_with_http_info(self, username, **kwargs): # noqa: E501 """Delete user # noqa: E501 @@ -339,8 +378,17 @@ class UserApi(object): >>> thread = api.delete_user_with_http_info(username, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The name that needs to be deleted (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -408,18 +456,21 @@ class UserApi(object): >>> thread = api.get_user_by_name(username, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The name that needs to be fetched. Use user1 for testing. (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: User If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.get_user_by_name_with_http_info(username, **kwargs) # noqa: E501 - else: - (data) = self.get_user_by_name_with_http_info(username, **kwargs) # noqa: E501 - return data + return self.get_user_by_name_with_http_info(username, **kwargs) # noqa: E501 def get_user_by_name_with_http_info(self, username, **kwargs): # noqa: E501 """Get user by user name # noqa: E501 @@ -429,9 +480,18 @@ class UserApi(object): >>> thread = api.get_user_by_name_with_http_info(username, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The name that needs to be fetched. Use user1 for testing. (required) - :return: User + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(User, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -502,19 +562,22 @@ class UserApi(object): >>> thread = api.login_user(username, password, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The user name for login (required) :param str password: The password for login in clear text (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: str If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.login_user_with_http_info(username, password, **kwargs) # noqa: E501 - else: - (data) = self.login_user_with_http_info(username, password, **kwargs) # noqa: E501 - return data + return self.login_user_with_http_info(username, password, **kwargs) # noqa: E501 def login_user_with_http_info(self, username, password, **kwargs): # noqa: E501 """Logs user into the system # noqa: E501 @@ -524,10 +587,19 @@ class UserApi(object): >>> thread = api.login_user_with_http_info(username, password, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The user name for login (required) :param str password: The password for login in clear text (required) - :return: str + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(str, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -604,17 +676,20 @@ class UserApi(object): >>> thread = api.logout_user(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.logout_user_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.logout_user_with_http_info(**kwargs) # noqa: E501 - return data + return self.logout_user_with_http_info(**kwargs) # noqa: E501 def logout_user_with_http_info(self, **kwargs): # noqa: E501 """Logs out current logged in user session # noqa: E501 @@ -624,7 +699,16 @@ class UserApi(object): >>> thread = api.logout_user_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -687,19 +771,22 @@ class UserApi(object): >>> thread = api.update_user(username, body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: name that need to be deleted (required) :param User body: Updated user object (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.update_user_with_http_info(username, body, **kwargs) # noqa: E501 - else: - (data) = self.update_user_with_http_info(username, body, **kwargs) # noqa: E501 - return data + return self.update_user_with_http_info(username, body, **kwargs) # noqa: E501 def update_user_with_http_info(self, username, body, **kwargs): # noqa: E501 """Updated user # noqa: E501 @@ -710,9 +797,18 @@ class UserApi(object): >>> thread = api.update_user_with_http_info(username, body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: name that need to be deleted (required) :param User body: Updated user object (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. diff --git a/samples/client/petstore/python-tornado/petstore_api/configuration.py b/samples/client/petstore/python-tornado/petstore_api/configuration.py index 53b08487f0..fa0c3f4d32 100644 --- a/samples/client/petstore/python-tornado/petstore_api/configuration.py +++ b/samples/client/petstore/python-tornado/petstore_api/configuration.py @@ -27,9 +27,9 @@ class TypeWithDefault(type): super(TypeWithDefault, cls).__init__(name, bases, dct) cls._default = None - def __call__(cls): + def __call__(cls, **kwargs): if cls._default is None: - cls._default = type.__call__(cls) + cls._default = type.__call__(cls, **kwargs) return copy.copy(cls._default) def set_default(cls, default): @@ -41,69 +41,100 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)): Ref: https://openapi-generator.tech Do not edit the class manually. + + :param host: Base url + :param api_key: Dict to store API key(s) + :param api_key_prefix: Dict to store API prefix (e.g. Bearer) + :param username: Username for HTTP basic authentication + :param password: Password for HTTP basic authentication """ - def __init__(self): - """Constructor""" - # Default Base url - self.host = "http://petstore.swagger.io:80/v2" - # Temp file folder for downloading files + def __init__(self, host="http://petstore.swagger.io:80/v2", + api_key={}, api_key_prefix={}, + username="", password=""): + """Constructor + """ + self.host = host + """Default Base url + """ self.temp_folder_path = None - + """Temp file folder for downloading files + """ # Authentication Settings - # dict to store API key(s) - self.api_key = {} - # dict to store API prefix (e.g. Bearer) - self.api_key_prefix = {} - # Username for HTTP basic authentication - self.username = "" - # Password for HTTP basic authentication - self.password = "" - # access token for OAuth/Bearer + self.api_key = api_key + """dict to store API key(s) + """ + self.api_key_prefix = api_key_prefix + """dict to store API prefix (e.g. Bearer) + """ + self.username = username + """Username for HTTP basic authentication + """ + self.password = password + """Password for HTTP basic authentication + """ self.access_token = "" - # Logging Settings + """access token for OAuth/Bearer + """ self.logger = {} + """Logging Settings + """ self.logger["package_logger"] = logging.getLogger("petstore_api") self.logger["urllib3_logger"] = logging.getLogger("urllib3") - # Log format self.logger_format = '%(asctime)s %(levelname)s %(message)s' - # Log stream handler + """Log format + """ self.logger_stream_handler = None - # Log file handler + """Log stream handler + """ self.logger_file_handler = None - # Debug file location + """Log file handler + """ self.logger_file = None - # Debug switch + """Debug file location + """ self.debug = False + """Debug switch + """ - # SSL/TLS verification - # Set this to false to skip verifying SSL certificate when calling API - # from https server. self.verify_ssl = True - # Set this to customize the certificate file to verify the peer. + """SSL/TLS verification + Set this to false to skip verifying SSL certificate when calling API + from https server. + """ self.ssl_ca_cert = None - # client certificate file + """Set this to customize the certificate file to verify the peer. + """ self.cert_file = None - # client key file + """client certificate file + """ self.key_file = None - # Set this to True/False to enable/disable SSL hostname verification. + """client key file + """ self.assert_hostname = None + """Set this to True/False to enable/disable SSL hostname verification. + """ - # urllib3 connection pool's maximum number of connections saved - # per pool. urllib3 uses 1 connection as default value, but this is - # not the best value when you are making a lot of possibly parallel - # requests to the same host, which is often the case here. - # cpu_count * 5 is used as default value to increase performance. self.connection_pool_maxsize = multiprocessing.cpu_count() * 5 + """urllib3 connection pool's maximum number of connections saved + per pool. urllib3 uses 1 connection as default value, but this is + not the best value when you are making a lot of possibly parallel + requests to the same host, which is often the case here. + cpu_count * 5 is used as default value to increase performance. + """ - # Proxy URL self.proxy = None - # Proxy headers + """Proxy URL + """ self.proxy_headers = None - # Safe chars for path_param + """Proxy headers + """ self.safe_chars_for_path_param = '' - # Adding retries to override urllib3 default value 3 + """Safe chars for path_param + """ self.retries = None + """Adding retries to override urllib3 default value 3 + """ @property def logger_file(self): diff --git a/samples/client/petstore/python/.openapi-generator/VERSION b/samples/client/petstore/python/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/python/.openapi-generator/VERSION +++ b/samples/client/petstore/python/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/python/docs/AnotherFakeApi.md b/samples/client/petstore/python/docs/AnotherFakeApi.md index c1c76a67fd..c3f84772cf 100644 --- a/samples/client/petstore/python/docs/AnotherFakeApi.md +++ b/samples/client/petstore/python/docs/AnotherFakeApi.md @@ -54,5 +54,10 @@ No authorization required - **Content-Type**: application/json - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/client/petstore/python/docs/FakeApi.md b/samples/client/petstore/python/docs/FakeApi.md index c46bf1e497..946a8ce3e7 100644 --- a/samples/client/petstore/python/docs/FakeApi.md +++ b/samples/client/petstore/python/docs/FakeApi.md @@ -65,6 +65,11 @@ No authorization required - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16 - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **fake_outer_boolean_serialize** @@ -113,6 +118,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output boolean | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **fake_outer_composite_serialize** @@ -161,6 +171,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output composite | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **fake_outer_number_serialize** @@ -209,6 +224,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output number | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **fake_outer_string_serialize** @@ -257,6 +277,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output string | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_body_with_file_schema** @@ -304,6 +329,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Success | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_body_with_query_params** @@ -351,6 +381,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Success | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_client_model** @@ -400,6 +435,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_endpoint_parameters** @@ -479,6 +519,12 @@ void (empty response body) - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid username supplied | - | +**404** | User not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_enum_parameters** @@ -541,6 +587,12 @@ No authorization required - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid request | - | +**404** | Not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_group_parameters** @@ -599,6 +651,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Someting wrong | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_inline_additional_properties** @@ -645,6 +702,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_json_form_data** @@ -693,5 +755,10 @@ No authorization required - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/client/petstore/python/docs/FakeClassnameTags123Api.md b/samples/client/petstore/python/docs/FakeClassnameTags123Api.md index aed30cb56d..7ffcf21122 100644 --- a/samples/client/petstore/python/docs/FakeClassnameTags123Api.md +++ b/samples/client/petstore/python/docs/FakeClassnameTags123Api.md @@ -60,5 +60,10 @@ Name | Type | Description | Notes - **Content-Type**: application/json - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/client/petstore/python/docs/PetApi.md b/samples/client/petstore/python/docs/PetApi.md index 227fa2ada1..3ed2551bd6 100644 --- a/samples/client/petstore/python/docs/PetApi.md +++ b/samples/client/petstore/python/docs/PetApi.md @@ -63,6 +63,12 @@ void (empty response body) - **Content-Type**: application/json, application/xml - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**405** | Invalid input | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **delete_pet** @@ -115,6 +121,12 @@ void (empty response body) - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid pet value | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **find_pets_by_status** @@ -168,6 +180,12 @@ Name | Type | Description | Notes - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid status value | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **find_pets_by_tags** @@ -221,6 +239,12 @@ Name | Type | Description | Notes - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid tag value | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **get_pet_by_id** @@ -276,6 +300,13 @@ Name | Type | Description | Notes - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid ID supplied | - | +**404** | Pet not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **update_pet** @@ -326,6 +357,14 @@ void (empty response body) - **Content-Type**: application/json, application/xml - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid ID supplied | - | +**404** | Pet not found | - | +**405** | Validation exception | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **update_pet_with_form** @@ -380,6 +419,11 @@ void (empty response body) - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**405** | Invalid input | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **upload_file** @@ -435,6 +479,11 @@ Name | Type | Description | Notes - **Content-Type**: multipart/form-data - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **upload_file_with_required_file** @@ -490,5 +539,10 @@ Name | Type | Description | Notes - **Content-Type**: multipart/form-data - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/client/petstore/python/docs/StoreApi.md b/samples/client/petstore/python/docs/StoreApi.md index af190f931d..76b94f73dc 100644 --- a/samples/client/petstore/python/docs/StoreApi.md +++ b/samples/client/petstore/python/docs/StoreApi.md @@ -56,6 +56,12 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid ID supplied | - | +**404** | Order not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **get_inventory** @@ -107,6 +113,11 @@ This endpoint does not need any parameter. - **Content-Type**: Not defined - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **get_order_by_id** @@ -156,6 +167,13 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid ID supplied | - | +**404** | Order not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **place_order** @@ -203,5 +221,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid Order | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/client/petstore/python/docs/UserApi.md b/samples/client/petstore/python/docs/UserApi.md index 907dc9ec36..fdc2c30df9 100644 --- a/samples/client/petstore/python/docs/UserApi.md +++ b/samples/client/petstore/python/docs/UserApi.md @@ -60,6 +60,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **create_users_with_array_input** @@ -106,6 +111,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **create_users_with_list_input** @@ -152,6 +162,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **delete_user** @@ -200,6 +215,12 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid username supplied | - | +**404** | User not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **get_user_by_name** @@ -247,6 +268,13 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid username supplied | - | +**404** | User not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **login_user** @@ -296,6 +324,12 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | * X-Rate-Limit - calls per hour allowed by the user
* X-Expires-After - date in UTC when token expires
| +**400** | Invalid username/password supplied | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **logout_user** @@ -338,6 +372,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **update_user** @@ -388,5 +427,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid user supplied | - | +**404** | User not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/client/petstore/python/petstore_api/api/another_fake_api.py b/samples/client/petstore/python/petstore_api/api/another_fake_api.py index d44e05e78c..a47a8e3ea1 100644 --- a/samples/client/petstore/python/petstore_api/api/another_fake_api.py +++ b/samples/client/petstore/python/petstore_api/api/another_fake_api.py @@ -45,18 +45,21 @@ class AnotherFakeApi(object): >>> thread = api.call_123_test_special_tags(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client body: client model (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Client If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.call_123_test_special_tags_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.call_123_test_special_tags_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.call_123_test_special_tags_with_http_info(body, **kwargs) # noqa: E501 def call_123_test_special_tags_with_http_info(self, body, **kwargs): # noqa: E501 """To test special tags # noqa: E501 @@ -67,9 +70,18 @@ class AnotherFakeApi(object): >>> thread = api.call_123_test_special_tags_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client body: client model (required) - :return: Client + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Client, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ diff --git a/samples/client/petstore/python/petstore_api/api/fake_api.py b/samples/client/petstore/python/petstore_api/api/fake_api.py index 08b6578095..1847804c55 100644 --- a/samples/client/petstore/python/petstore_api/api/fake_api.py +++ b/samples/client/petstore/python/petstore_api/api/fake_api.py @@ -45,18 +45,21 @@ class FakeApi(object): >>> thread = api.create_xml_item(xml_item, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param XmlItem xml_item: XmlItem Body (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.create_xml_item_with_http_info(xml_item, **kwargs) # noqa: E501 - else: - (data) = self.create_xml_item_with_http_info(xml_item, **kwargs) # noqa: E501 - return data + return self.create_xml_item_with_http_info(xml_item, **kwargs) # noqa: E501 def create_xml_item_with_http_info(self, xml_item, **kwargs): # noqa: E501 """creates an XmlItem # noqa: E501 @@ -67,8 +70,17 @@ class FakeApi(object): >>> thread = api.create_xml_item_with_http_info(xml_item, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param XmlItem xml_item: XmlItem Body (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -141,18 +153,21 @@ class FakeApi(object): >>> thread = api.fake_outer_boolean_serialize(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param bool body: Input boolean as post body + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: bool If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.fake_outer_boolean_serialize_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.fake_outer_boolean_serialize_with_http_info(**kwargs) # noqa: E501 - return data + return self.fake_outer_boolean_serialize_with_http_info(**kwargs) # noqa: E501 def fake_outer_boolean_serialize_with_http_info(self, **kwargs): # noqa: E501 """fake_outer_boolean_serialize # noqa: E501 @@ -163,9 +178,18 @@ class FakeApi(object): >>> thread = api.fake_outer_boolean_serialize_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param bool body: Input boolean as post body - :return: bool + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(bool, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -233,18 +257,21 @@ class FakeApi(object): >>> thread = api.fake_outer_composite_serialize(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param OuterComposite body: Input composite as post body + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: OuterComposite If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.fake_outer_composite_serialize_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.fake_outer_composite_serialize_with_http_info(**kwargs) # noqa: E501 - return data + return self.fake_outer_composite_serialize_with_http_info(**kwargs) # noqa: E501 def fake_outer_composite_serialize_with_http_info(self, **kwargs): # noqa: E501 """fake_outer_composite_serialize # noqa: E501 @@ -255,9 +282,18 @@ class FakeApi(object): >>> thread = api.fake_outer_composite_serialize_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param OuterComposite body: Input composite as post body - :return: OuterComposite + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(OuterComposite, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -325,18 +361,21 @@ class FakeApi(object): >>> thread = api.fake_outer_number_serialize(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param float body: Input number as post body + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: float If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.fake_outer_number_serialize_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.fake_outer_number_serialize_with_http_info(**kwargs) # noqa: E501 - return data + return self.fake_outer_number_serialize_with_http_info(**kwargs) # noqa: E501 def fake_outer_number_serialize_with_http_info(self, **kwargs): # noqa: E501 """fake_outer_number_serialize # noqa: E501 @@ -347,9 +386,18 @@ class FakeApi(object): >>> thread = api.fake_outer_number_serialize_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param float body: Input number as post body - :return: float + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(float, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -417,18 +465,21 @@ class FakeApi(object): >>> thread = api.fake_outer_string_serialize(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str body: Input string as post body + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: str If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.fake_outer_string_serialize_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.fake_outer_string_serialize_with_http_info(**kwargs) # noqa: E501 - return data + return self.fake_outer_string_serialize_with_http_info(**kwargs) # noqa: E501 def fake_outer_string_serialize_with_http_info(self, **kwargs): # noqa: E501 """fake_outer_string_serialize # noqa: E501 @@ -439,9 +490,18 @@ class FakeApi(object): >>> thread = api.fake_outer_string_serialize_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str body: Input string as post body - :return: str + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(str, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -509,18 +569,21 @@ class FakeApi(object): >>> thread = api.test_body_with_file_schema(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param FileSchemaTestClass body: (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_body_with_file_schema_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.test_body_with_file_schema_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.test_body_with_file_schema_with_http_info(body, **kwargs) # noqa: E501 def test_body_with_file_schema_with_http_info(self, body, **kwargs): # noqa: E501 """test_body_with_file_schema # noqa: E501 @@ -531,8 +594,17 @@ class FakeApi(object): >>> thread = api.test_body_with_file_schema_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param FileSchemaTestClass body: (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -604,19 +676,22 @@ class FakeApi(object): >>> thread = api.test_body_with_query_params(query, body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str query: (required) :param User body: (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_body_with_query_params_with_http_info(query, body, **kwargs) # noqa: E501 - else: - (data) = self.test_body_with_query_params_with_http_info(query, body, **kwargs) # noqa: E501 - return data + return self.test_body_with_query_params_with_http_info(query, body, **kwargs) # noqa: E501 def test_body_with_query_params_with_http_info(self, query, body, **kwargs): # noqa: E501 """test_body_with_query_params # noqa: E501 @@ -626,9 +701,18 @@ class FakeApi(object): >>> thread = api.test_body_with_query_params_with_http_info(query, body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str query: (required) :param User body: (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -707,18 +791,21 @@ class FakeApi(object): >>> thread = api.test_client_model(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client body: client model (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Client If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_client_model_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.test_client_model_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.test_client_model_with_http_info(body, **kwargs) # noqa: E501 def test_client_model_with_http_info(self, body, **kwargs): # noqa: E501 """To test \"client\" model # noqa: E501 @@ -729,9 +816,18 @@ class FakeApi(object): >>> thread = api.test_client_model_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client body: client model (required) - :return: Client + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Client, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -807,7 +903,7 @@ class FakeApi(object): >>> thread = api.test_endpoint_parameters(number, double, pattern_without_delimiter, byte, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param float number: None (required) :param float double: None (required) :param str pattern_without_delimiter: None (required) @@ -822,16 +918,19 @@ class FakeApi(object): :param datetime date_time: None :param str password: None :param str param_callback: None + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, **kwargs) # noqa: E501 - else: - (data) = self.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, **kwargs) # noqa: E501 - return data + return self.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, **kwargs) # noqa: E501 def test_endpoint_parameters_with_http_info(self, number, double, pattern_without_delimiter, byte, **kwargs): # noqa: E501 """Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 # noqa: E501 @@ -842,7 +941,7 @@ class FakeApi(object): >>> thread = api.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param float number: None (required) :param float double: None (required) :param str pattern_without_delimiter: None (required) @@ -857,6 +956,15 @@ class FakeApi(object): :param datetime date_time: None :param str password: None :param str param_callback: None + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -995,7 +1103,7 @@ class FakeApi(object): >>> thread = api.test_enum_parameters(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] enum_header_string_array: Header parameter enum test (string array) :param str enum_header_string: Header parameter enum test (string) :param list[str] enum_query_string_array: Query parameter enum test (string array) @@ -1004,16 +1112,19 @@ class FakeApi(object): :param float enum_query_double: Query parameter enum test (double) :param list[str] enum_form_string_array: Form parameter enum test (string array) :param str enum_form_string: Form parameter enum test (string) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_enum_parameters_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.test_enum_parameters_with_http_info(**kwargs) # noqa: E501 - return data + return self.test_enum_parameters_with_http_info(**kwargs) # noqa: E501 def test_enum_parameters_with_http_info(self, **kwargs): # noqa: E501 """To test enum parameters # noqa: E501 @@ -1024,7 +1135,7 @@ class FakeApi(object): >>> thread = api.test_enum_parameters_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] enum_header_string_array: Header parameter enum test (string array) :param str enum_header_string: Header parameter enum test (string) :param list[str] enum_query_string_array: Query parameter enum test (string array) @@ -1033,6 +1144,15 @@ class FakeApi(object): :param float enum_query_double: Query parameter enum test (double) :param list[str] enum_form_string_array: Form parameter enum test (string array) :param str enum_form_string: Form parameter enum test (string) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -1118,23 +1238,26 @@ class FakeApi(object): >>> thread = api.test_group_parameters(required_string_group, required_boolean_group, required_int64_group, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int required_string_group: Required String in group parameters (required) :param bool required_boolean_group: Required Boolean in group parameters (required) :param int required_int64_group: Required Integer in group parameters (required) :param int string_group: String in group parameters :param bool boolean_group: Boolean in group parameters :param int int64_group: Integer in group parameters + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, **kwargs) # noqa: E501 - else: - (data) = self.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, **kwargs) # noqa: E501 - return data + return self.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, **kwargs) # noqa: E501 def test_group_parameters_with_http_info(self, required_string_group, required_boolean_group, required_int64_group, **kwargs): # noqa: E501 """Fake endpoint to test group parameters (optional) # noqa: E501 @@ -1145,13 +1268,22 @@ class FakeApi(object): >>> thread = api.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int required_string_group: Required String in group parameters (required) :param bool required_boolean_group: Required Boolean in group parameters (required) :param int required_int64_group: Required Integer in group parameters (required) :param int string_group: String in group parameters :param bool boolean_group: Boolean in group parameters :param int int64_group: Integer in group parameters + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -1237,18 +1369,21 @@ class FakeApi(object): >>> thread = api.test_inline_additional_properties(param, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param dict(str, str) param: request body (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_inline_additional_properties_with_http_info(param, **kwargs) # noqa: E501 - else: - (data) = self.test_inline_additional_properties_with_http_info(param, **kwargs) # noqa: E501 - return data + return self.test_inline_additional_properties_with_http_info(param, **kwargs) # noqa: E501 def test_inline_additional_properties_with_http_info(self, param, **kwargs): # noqa: E501 """test inline additionalProperties # noqa: E501 @@ -1258,8 +1393,17 @@ class FakeApi(object): >>> thread = api.test_inline_additional_properties_with_http_info(param, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param dict(str, str) param: request body (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -1331,19 +1475,22 @@ class FakeApi(object): >>> thread = api.test_json_form_data(param, param2, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str param: field1 (required) :param str param2: field2 (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_json_form_data_with_http_info(param, param2, **kwargs) # noqa: E501 - else: - (data) = self.test_json_form_data_with_http_info(param, param2, **kwargs) # noqa: E501 - return data + return self.test_json_form_data_with_http_info(param, param2, **kwargs) # noqa: E501 def test_json_form_data_with_http_info(self, param, param2, **kwargs): # noqa: E501 """test json serialization of form data # noqa: E501 @@ -1353,9 +1500,18 @@ class FakeApi(object): >>> thread = api.test_json_form_data_with_http_info(param, param2, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str param: field1 (required) :param str param2: field2 (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. diff --git a/samples/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py b/samples/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py index 635d968283..3e778e9226 100644 --- a/samples/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py +++ b/samples/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py @@ -45,18 +45,21 @@ class FakeClassnameTags123Api(object): >>> thread = api.test_classname(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client body: client model (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Client If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_classname_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.test_classname_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.test_classname_with_http_info(body, **kwargs) # noqa: E501 def test_classname_with_http_info(self, body, **kwargs): # noqa: E501 """To test class name in snake case # noqa: E501 @@ -67,9 +70,18 @@ class FakeClassnameTags123Api(object): >>> thread = api.test_classname_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client body: client model (required) - :return: Client + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Client, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ diff --git a/samples/client/petstore/python/petstore_api/api/pet_api.py b/samples/client/petstore/python/petstore_api/api/pet_api.py index 7bb32c68aa..1deb664c43 100644 --- a/samples/client/petstore/python/petstore_api/api/pet_api.py +++ b/samples/client/petstore/python/petstore_api/api/pet_api.py @@ -44,18 +44,21 @@ class PetApi(object): >>> thread = api.add_pet(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Pet body: Pet object that needs to be added to the store (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.add_pet_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.add_pet_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.add_pet_with_http_info(body, **kwargs) # noqa: E501 def add_pet_with_http_info(self, body, **kwargs): # noqa: E501 """Add a new pet to the store # noqa: E501 @@ -65,8 +68,17 @@ class PetApi(object): >>> thread = api.add_pet_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Pet body: Pet object that needs to be added to the store (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -138,19 +150,22 @@ class PetApi(object): >>> thread = api.delete_pet(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: Pet id to delete (required) :param str api_key: + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.delete_pet_with_http_info(pet_id, **kwargs) # noqa: E501 - else: - (data) = self.delete_pet_with_http_info(pet_id, **kwargs) # noqa: E501 - return data + return self.delete_pet_with_http_info(pet_id, **kwargs) # noqa: E501 def delete_pet_with_http_info(self, pet_id, **kwargs): # noqa: E501 """Deletes a pet # noqa: E501 @@ -160,9 +175,18 @@ class PetApi(object): >>> thread = api.delete_pet_with_http_info(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: Pet id to delete (required) :param str api_key: + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -233,18 +257,21 @@ class PetApi(object): >>> thread = api.find_pets_by_status(status, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] status: Status values that need to be considered for filter (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: list[Pet] If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.find_pets_by_status_with_http_info(status, **kwargs) # noqa: E501 - else: - (data) = self.find_pets_by_status_with_http_info(status, **kwargs) # noqa: E501 - return data + return self.find_pets_by_status_with_http_info(status, **kwargs) # noqa: E501 def find_pets_by_status_with_http_info(self, status, **kwargs): # noqa: E501 """Finds Pets by status # noqa: E501 @@ -255,9 +282,18 @@ class PetApi(object): >>> thread = api.find_pets_by_status_with_http_info(status, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] status: Status values that need to be considered for filter (required) - :return: list[Pet] + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -330,18 +366,21 @@ class PetApi(object): >>> thread = api.find_pets_by_tags(tags, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] tags: Tags to filter by (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: list[Pet] If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.find_pets_by_tags_with_http_info(tags, **kwargs) # noqa: E501 - else: - (data) = self.find_pets_by_tags_with_http_info(tags, **kwargs) # noqa: E501 - return data + return self.find_pets_by_tags_with_http_info(tags, **kwargs) # noqa: E501 def find_pets_by_tags_with_http_info(self, tags, **kwargs): # noqa: E501 """Finds Pets by tags # noqa: E501 @@ -352,9 +391,18 @@ class PetApi(object): >>> thread = api.find_pets_by_tags_with_http_info(tags, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] tags: Tags to filter by (required) - :return: list[Pet] + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -427,18 +475,21 @@ class PetApi(object): >>> thread = api.get_pet_by_id(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to return (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Pet If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.get_pet_by_id_with_http_info(pet_id, **kwargs) # noqa: E501 - else: - (data) = self.get_pet_by_id_with_http_info(pet_id, **kwargs) # noqa: E501 - return data + return self.get_pet_by_id_with_http_info(pet_id, **kwargs) # noqa: E501 def get_pet_by_id_with_http_info(self, pet_id, **kwargs): # noqa: E501 """Find pet by ID # noqa: E501 @@ -449,9 +500,18 @@ class PetApi(object): >>> thread = api.get_pet_by_id_with_http_info(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to return (required) - :return: Pet + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Pet, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -522,18 +582,21 @@ class PetApi(object): >>> thread = api.update_pet(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Pet body: Pet object that needs to be added to the store (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.update_pet_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.update_pet_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.update_pet_with_http_info(body, **kwargs) # noqa: E501 def update_pet_with_http_info(self, body, **kwargs): # noqa: E501 """Update an existing pet # noqa: E501 @@ -543,8 +606,17 @@ class PetApi(object): >>> thread = api.update_pet_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Pet body: Pet object that needs to be added to the store (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -616,20 +688,23 @@ class PetApi(object): >>> thread = api.update_pet_with_form(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet that needs to be updated (required) :param str name: Updated name of the pet :param str status: Updated status of the pet + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.update_pet_with_form_with_http_info(pet_id, **kwargs) # noqa: E501 - else: - (data) = self.update_pet_with_form_with_http_info(pet_id, **kwargs) # noqa: E501 - return data + return self.update_pet_with_form_with_http_info(pet_id, **kwargs) # noqa: E501 def update_pet_with_form_with_http_info(self, pet_id, **kwargs): # noqa: E501 """Updates a pet in the store with form data # noqa: E501 @@ -639,10 +714,19 @@ class PetApi(object): >>> thread = api.update_pet_with_form_with_http_info(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet that needs to be updated (required) :param str name: Updated name of the pet :param str status: Updated status of the pet + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -718,20 +802,23 @@ class PetApi(object): >>> thread = api.upload_file(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to update (required) :param str additional_metadata: Additional data to pass to server :param file file: file to upload + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: ApiResponse If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.upload_file_with_http_info(pet_id, **kwargs) # noqa: E501 - else: - (data) = self.upload_file_with_http_info(pet_id, **kwargs) # noqa: E501 - return data + return self.upload_file_with_http_info(pet_id, **kwargs) # noqa: E501 def upload_file_with_http_info(self, pet_id, **kwargs): # noqa: E501 """uploads an image # noqa: E501 @@ -741,11 +828,20 @@ class PetApi(object): >>> thread = api.upload_file_with_http_info(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to update (required) :param str additional_metadata: Additional data to pass to server :param file file: file to upload - :return: ApiResponse + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -824,20 +920,23 @@ class PetApi(object): >>> thread = api.upload_file_with_required_file(pet_id, required_file, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to update (required) :param file required_file: file to upload (required) :param str additional_metadata: Additional data to pass to server + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: ApiResponse If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.upload_file_with_required_file_with_http_info(pet_id, required_file, **kwargs) # noqa: E501 - else: - (data) = self.upload_file_with_required_file_with_http_info(pet_id, required_file, **kwargs) # noqa: E501 - return data + return self.upload_file_with_required_file_with_http_info(pet_id, required_file, **kwargs) # noqa: E501 def upload_file_with_required_file_with_http_info(self, pet_id, required_file, **kwargs): # noqa: E501 """uploads an image (required) # noqa: E501 @@ -847,11 +946,20 @@ class PetApi(object): >>> thread = api.upload_file_with_required_file_with_http_info(pet_id, required_file, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to update (required) :param file required_file: file to upload (required) :param str additional_metadata: Additional data to pass to server - :return: ApiResponse + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ diff --git a/samples/client/petstore/python/petstore_api/api/store_api.py b/samples/client/petstore/python/petstore_api/api/store_api.py index 5ed68b1c3a..c3aa1c4a3d 100644 --- a/samples/client/petstore/python/petstore_api/api/store_api.py +++ b/samples/client/petstore/python/petstore_api/api/store_api.py @@ -45,18 +45,21 @@ class StoreApi(object): >>> thread = api.delete_order(order_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str order_id: ID of the order that needs to be deleted (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.delete_order_with_http_info(order_id, **kwargs) # noqa: E501 - else: - (data) = self.delete_order_with_http_info(order_id, **kwargs) # noqa: E501 - return data + return self.delete_order_with_http_info(order_id, **kwargs) # noqa: E501 def delete_order_with_http_info(self, order_id, **kwargs): # noqa: E501 """Delete purchase order by ID # noqa: E501 @@ -67,8 +70,17 @@ class StoreApi(object): >>> thread = api.delete_order_with_http_info(order_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str order_id: ID of the order that needs to be deleted (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -137,17 +149,20 @@ class StoreApi(object): >>> thread = api.get_inventory(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: dict(str, int) If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.get_inventory_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.get_inventory_with_http_info(**kwargs) # noqa: E501 - return data + return self.get_inventory_with_http_info(**kwargs) # noqa: E501 def get_inventory_with_http_info(self, **kwargs): # noqa: E501 """Returns pet inventories by status # noqa: E501 @@ -158,8 +173,17 @@ class StoreApi(object): >>> thread = api.get_inventory_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool - :return: dict(str, int) + :param async_req bool: execute request asynchronously + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(dict(str, int), status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -225,18 +249,21 @@ class StoreApi(object): >>> thread = api.get_order_by_id(order_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int order_id: ID of pet that needs to be fetched (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Order If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.get_order_by_id_with_http_info(order_id, **kwargs) # noqa: E501 - else: - (data) = self.get_order_by_id_with_http_info(order_id, **kwargs) # noqa: E501 - return data + return self.get_order_by_id_with_http_info(order_id, **kwargs) # noqa: E501 def get_order_by_id_with_http_info(self, order_id, **kwargs): # noqa: E501 """Find purchase order by ID # noqa: E501 @@ -247,9 +274,18 @@ class StoreApi(object): >>> thread = api.get_order_by_id_with_http_info(order_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int order_id: ID of pet that needs to be fetched (required) - :return: Order + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Order, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -324,18 +360,21 @@ class StoreApi(object): >>> thread = api.place_order(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Order body: order placed for purchasing the pet (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Order If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.place_order_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.place_order_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.place_order_with_http_info(body, **kwargs) # noqa: E501 def place_order_with_http_info(self, body, **kwargs): # noqa: E501 """Place an order for a pet # noqa: E501 @@ -345,9 +384,18 @@ class StoreApi(object): >>> thread = api.place_order_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Order body: order placed for purchasing the pet (required) - :return: Order + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Order, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ diff --git a/samples/client/petstore/python/petstore_api/api/user_api.py b/samples/client/petstore/python/petstore_api/api/user_api.py index 923f6347a2..d3674f5ba5 100644 --- a/samples/client/petstore/python/petstore_api/api/user_api.py +++ b/samples/client/petstore/python/petstore_api/api/user_api.py @@ -45,18 +45,21 @@ class UserApi(object): >>> thread = api.create_user(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param User body: Created user object (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.create_user_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.create_user_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.create_user_with_http_info(body, **kwargs) # noqa: E501 def create_user_with_http_info(self, body, **kwargs): # noqa: E501 """Create user # noqa: E501 @@ -67,8 +70,17 @@ class UserApi(object): >>> thread = api.create_user_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param User body: Created user object (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -136,18 +148,21 @@ class UserApi(object): >>> thread = api.create_users_with_array_input(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[User] body: List of user object (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.create_users_with_array_input_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.create_users_with_array_input_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.create_users_with_array_input_with_http_info(body, **kwargs) # noqa: E501 def create_users_with_array_input_with_http_info(self, body, **kwargs): # noqa: E501 """Creates list of users with given input array # noqa: E501 @@ -157,8 +172,17 @@ class UserApi(object): >>> thread = api.create_users_with_array_input_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[User] body: List of user object (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -226,18 +250,21 @@ class UserApi(object): >>> thread = api.create_users_with_list_input(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[User] body: List of user object (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.create_users_with_list_input_with_http_info(body, **kwargs) # noqa: E501 - else: - (data) = self.create_users_with_list_input_with_http_info(body, **kwargs) # noqa: E501 - return data + return self.create_users_with_list_input_with_http_info(body, **kwargs) # noqa: E501 def create_users_with_list_input_with_http_info(self, body, **kwargs): # noqa: E501 """Creates list of users with given input array # noqa: E501 @@ -247,8 +274,17 @@ class UserApi(object): >>> thread = api.create_users_with_list_input_with_http_info(body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[User] body: List of user object (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -317,18 +353,21 @@ class UserApi(object): >>> thread = api.delete_user(username, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The name that needs to be deleted (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.delete_user_with_http_info(username, **kwargs) # noqa: E501 - else: - (data) = self.delete_user_with_http_info(username, **kwargs) # noqa: E501 - return data + return self.delete_user_with_http_info(username, **kwargs) # noqa: E501 def delete_user_with_http_info(self, username, **kwargs): # noqa: E501 """Delete user # noqa: E501 @@ -339,8 +378,17 @@ class UserApi(object): >>> thread = api.delete_user_with_http_info(username, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The name that needs to be deleted (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -408,18 +456,21 @@ class UserApi(object): >>> thread = api.get_user_by_name(username, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The name that needs to be fetched. Use user1 for testing. (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: User If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.get_user_by_name_with_http_info(username, **kwargs) # noqa: E501 - else: - (data) = self.get_user_by_name_with_http_info(username, **kwargs) # noqa: E501 - return data + return self.get_user_by_name_with_http_info(username, **kwargs) # noqa: E501 def get_user_by_name_with_http_info(self, username, **kwargs): # noqa: E501 """Get user by user name # noqa: E501 @@ -429,9 +480,18 @@ class UserApi(object): >>> thread = api.get_user_by_name_with_http_info(username, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The name that needs to be fetched. Use user1 for testing. (required) - :return: User + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(User, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -502,19 +562,22 @@ class UserApi(object): >>> thread = api.login_user(username, password, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The user name for login (required) :param str password: The password for login in clear text (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: str If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.login_user_with_http_info(username, password, **kwargs) # noqa: E501 - else: - (data) = self.login_user_with_http_info(username, password, **kwargs) # noqa: E501 - return data + return self.login_user_with_http_info(username, password, **kwargs) # noqa: E501 def login_user_with_http_info(self, username, password, **kwargs): # noqa: E501 """Logs user into the system # noqa: E501 @@ -524,10 +587,19 @@ class UserApi(object): >>> thread = api.login_user_with_http_info(username, password, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The user name for login (required) :param str password: The password for login in clear text (required) - :return: str + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(str, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -604,17 +676,20 @@ class UserApi(object): >>> thread = api.logout_user(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.logout_user_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.logout_user_with_http_info(**kwargs) # noqa: E501 - return data + return self.logout_user_with_http_info(**kwargs) # noqa: E501 def logout_user_with_http_info(self, **kwargs): # noqa: E501 """Logs out current logged in user session # noqa: E501 @@ -624,7 +699,16 @@ class UserApi(object): >>> thread = api.logout_user_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -687,19 +771,22 @@ class UserApi(object): >>> thread = api.update_user(username, body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: name that need to be deleted (required) :param User body: Updated user object (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.update_user_with_http_info(username, body, **kwargs) # noqa: E501 - else: - (data) = self.update_user_with_http_info(username, body, **kwargs) # noqa: E501 - return data + return self.update_user_with_http_info(username, body, **kwargs) # noqa: E501 def update_user_with_http_info(self, username, body, **kwargs): # noqa: E501 """Updated user # noqa: E501 @@ -710,9 +797,18 @@ class UserApi(object): >>> thread = api.update_user_with_http_info(username, body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: name that need to be deleted (required) :param User body: Updated user object (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. diff --git a/samples/client/petstore/python/petstore_api/configuration.py b/samples/client/petstore/python/petstore_api/configuration.py index 53b08487f0..fa0c3f4d32 100644 --- a/samples/client/petstore/python/petstore_api/configuration.py +++ b/samples/client/petstore/python/petstore_api/configuration.py @@ -27,9 +27,9 @@ class TypeWithDefault(type): super(TypeWithDefault, cls).__init__(name, bases, dct) cls._default = None - def __call__(cls): + def __call__(cls, **kwargs): if cls._default is None: - cls._default = type.__call__(cls) + cls._default = type.__call__(cls, **kwargs) return copy.copy(cls._default) def set_default(cls, default): @@ -41,69 +41,100 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)): Ref: https://openapi-generator.tech Do not edit the class manually. + + :param host: Base url + :param api_key: Dict to store API key(s) + :param api_key_prefix: Dict to store API prefix (e.g. Bearer) + :param username: Username for HTTP basic authentication + :param password: Password for HTTP basic authentication """ - def __init__(self): - """Constructor""" - # Default Base url - self.host = "http://petstore.swagger.io:80/v2" - # Temp file folder for downloading files + def __init__(self, host="http://petstore.swagger.io:80/v2", + api_key={}, api_key_prefix={}, + username="", password=""): + """Constructor + """ + self.host = host + """Default Base url + """ self.temp_folder_path = None - + """Temp file folder for downloading files + """ # Authentication Settings - # dict to store API key(s) - self.api_key = {} - # dict to store API prefix (e.g. Bearer) - self.api_key_prefix = {} - # Username for HTTP basic authentication - self.username = "" - # Password for HTTP basic authentication - self.password = "" - # access token for OAuth/Bearer + self.api_key = api_key + """dict to store API key(s) + """ + self.api_key_prefix = api_key_prefix + """dict to store API prefix (e.g. Bearer) + """ + self.username = username + """Username for HTTP basic authentication + """ + self.password = password + """Password for HTTP basic authentication + """ self.access_token = "" - # Logging Settings + """access token for OAuth/Bearer + """ self.logger = {} + """Logging Settings + """ self.logger["package_logger"] = logging.getLogger("petstore_api") self.logger["urllib3_logger"] = logging.getLogger("urllib3") - # Log format self.logger_format = '%(asctime)s %(levelname)s %(message)s' - # Log stream handler + """Log format + """ self.logger_stream_handler = None - # Log file handler + """Log stream handler + """ self.logger_file_handler = None - # Debug file location + """Log file handler + """ self.logger_file = None - # Debug switch + """Debug file location + """ self.debug = False + """Debug switch + """ - # SSL/TLS verification - # Set this to false to skip verifying SSL certificate when calling API - # from https server. self.verify_ssl = True - # Set this to customize the certificate file to verify the peer. + """SSL/TLS verification + Set this to false to skip verifying SSL certificate when calling API + from https server. + """ self.ssl_ca_cert = None - # client certificate file + """Set this to customize the certificate file to verify the peer. + """ self.cert_file = None - # client key file + """client certificate file + """ self.key_file = None - # Set this to True/False to enable/disable SSL hostname verification. + """client key file + """ self.assert_hostname = None + """Set this to True/False to enable/disable SSL hostname verification. + """ - # urllib3 connection pool's maximum number of connections saved - # per pool. urllib3 uses 1 connection as default value, but this is - # not the best value when you are making a lot of possibly parallel - # requests to the same host, which is often the case here. - # cpu_count * 5 is used as default value to increase performance. self.connection_pool_maxsize = multiprocessing.cpu_count() * 5 + """urllib3 connection pool's maximum number of connections saved + per pool. urllib3 uses 1 connection as default value, but this is + not the best value when you are making a lot of possibly parallel + requests to the same host, which is often the case here. + cpu_count * 5 is used as default value to increase performance. + """ - # Proxy URL self.proxy = None - # Proxy headers + """Proxy URL + """ self.proxy_headers = None - # Safe chars for path_param + """Proxy headers + """ self.safe_chars_for_path_param = '' - # Adding retries to override urllib3 default value 3 + """Safe chars for path_param + """ self.retries = None + """Adding retries to override urllib3 default value 3 + """ @property def logger_file(self): diff --git a/samples/client/petstore/ruby/.openapi-generator/VERSION b/samples/client/petstore/ruby/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/ruby/.openapi-generator/VERSION +++ b/samples/client/petstore/ruby/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/ruby/lib/petstore.rb b/samples/client/petstore/ruby/lib/petstore.rb index 52e3ec8724..03b26609f5 100644 --- a/samples/client/petstore/ruby/lib/petstore.rb +++ b/samples/client/petstore/ruby/lib/petstore.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb index 928633620c..6a68b8cbe7 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb @@ -6,11 +6,16 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end require 'uri' +require 'cgi' module Petstore class AnotherFakeApi diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb index 662bc954c8..a42e303c18 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb @@ -6,11 +6,16 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end require 'uri' +require 'cgi' module Petstore class FakeApi diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb index af26f5ea8b..27990e622f 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb @@ -6,11 +6,16 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end require 'uri' +require 'cgi' module Petstore class FakeClassnameTags123Api diff --git a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb index 34c189d9d0..6e60c9408b 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb @@ -6,11 +6,16 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end require 'uri' +require 'cgi' module Petstore class PetApi @@ -103,7 +108,7 @@ module Petstore fail ArgumentError, "Missing the required parameter 'pet_id' when calling PetApi.delete_pet" end # resource path - local_var_path = '/pet/{petId}'.sub('{' + 'petId' + '}', pet_id.to_s) + local_var_path = '/pet/{petId}'.sub('{' + 'petId' + '}', CGI.escape(pet_id.to_s)) # query parameters query_params = opts[:query_params] || {} @@ -290,7 +295,7 @@ module Petstore fail ArgumentError, "Missing the required parameter 'pet_id' when calling PetApi.get_pet_by_id" end # resource path - local_var_path = '/pet/{petId}'.sub('{' + 'petId' + '}', pet_id.to_s) + local_var_path = '/pet/{petId}'.sub('{' + 'petId' + '}', CGI.escape(pet_id.to_s)) # query parameters query_params = opts[:query_params] || {} @@ -414,7 +419,7 @@ module Petstore fail ArgumentError, "Missing the required parameter 'pet_id' when calling PetApi.update_pet_with_form" end # resource path - local_var_path = '/pet/{petId}'.sub('{' + 'petId' + '}', pet_id.to_s) + local_var_path = '/pet/{petId}'.sub('{' + 'petId' + '}', CGI.escape(pet_id.to_s)) # query parameters query_params = opts[:query_params] || {} @@ -480,7 +485,7 @@ module Petstore fail ArgumentError, "Missing the required parameter 'pet_id' when calling PetApi.upload_file" end # resource path - local_var_path = '/pet/{petId}/uploadImage'.sub('{' + 'petId' + '}', pet_id.to_s) + local_var_path = '/pet/{petId}/uploadImage'.sub('{' + 'petId' + '}', CGI.escape(pet_id.to_s)) # query parameters query_params = opts[:query_params] || {} @@ -552,7 +557,7 @@ module Petstore fail ArgumentError, "Missing the required parameter 'required_file' when calling PetApi.upload_file_with_required_file" end # resource path - local_var_path = '/fake/{petId}/uploadImageWithRequiredFile'.sub('{' + 'petId' + '}', pet_id.to_s) + local_var_path = '/fake/{petId}/uploadImageWithRequiredFile'.sub('{' + 'petId' + '}', CGI.escape(pet_id.to_s)) # query parameters query_params = opts[:query_params] || {} diff --git a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb index 9d08b7a2b4..b3017541e7 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb @@ -6,11 +6,16 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end require 'uri' +require 'cgi' module Petstore class StoreApi @@ -43,7 +48,7 @@ module Petstore fail ArgumentError, "Missing the required parameter 'order_id' when calling StoreApi.delete_order" end # resource path - local_var_path = '/store/order/{order_id}'.sub('{' + 'order_id' + '}', order_id.to_s) + local_var_path = '/store/order/{order_id}'.sub('{' + 'order_id' + '}', CGI.escape(order_id.to_s)) # query parameters query_params = opts[:query_params] || {} @@ -167,7 +172,7 @@ module Petstore end # resource path - local_var_path = '/store/order/{order_id}'.sub('{' + 'order_id' + '}', order_id.to_s) + local_var_path = '/store/order/{order_id}'.sub('{' + 'order_id' + '}', CGI.escape(order_id.to_s)) # query parameters query_params = opts[:query_params] || {} diff --git a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb index 381e4c297a..48000a5130 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb @@ -6,11 +6,16 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end require 'uri' +require 'cgi' module Petstore class UserApi @@ -219,7 +224,7 @@ module Petstore fail ArgumentError, "Missing the required parameter 'username' when calling UserApi.delete_user" end # resource path - local_var_path = '/user/{username}'.sub('{' + 'username' + '}', username.to_s) + local_var_path = '/user/{username}'.sub('{' + 'username' + '}', CGI.escape(username.to_s)) # query parameters query_params = opts[:query_params] || {} @@ -277,7 +282,7 @@ module Petstore fail ArgumentError, "Missing the required parameter 'username' when calling UserApi.get_user_by_name" end # resource path - local_var_path = '/user/{username}'.sub('{' + 'username' + '}', username.to_s) + local_var_path = '/user/{username}'.sub('{' + 'username' + '}', CGI.escape(username.to_s)) # query parameters query_params = opts[:query_params] || {} @@ -465,7 +470,7 @@ module Petstore fail ArgumentError, "Missing the required parameter 'body' when calling UserApi.update_user" end # resource path - local_var_path = '/user/{username}'.sub('{' + 'username' + '}', username.to_s) + local_var_path = '/user/{username}'.sub('{' + 'username' + '}', CGI.escape(username.to_s)) # query parameters query_params = opts[:query_params] || {} diff --git a/samples/client/petstore/ruby/lib/petstore/api_client.rb b/samples/client/petstore/ruby/lib/petstore/api_client.rb index 21197e84b3..be77c47b3b 100644 --- a/samples/client/petstore/ruby/lib/petstore/api_client.rb +++ b/samples/client/petstore/ruby/lib/petstore/api_client.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/api_error.rb b/samples/client/petstore/ruby/lib/petstore/api_error.rb index 9eab46a89b..e382771ee2 100644 --- a/samples/client/petstore/ruby/lib/petstore/api_error.rb +++ b/samples/client/petstore/ruby/lib/petstore/api_error.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/configuration.rb b/samples/client/petstore/ruby/lib/petstore/configuration.rb index e74a2a38ff..857e831839 100644 --- a/samples/client/petstore/ruby/lib/petstore/configuration.rb +++ b/samples/client/petstore/ruby/lib/petstore/configuration.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_any_type.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_any_type.rb index d2af1ba5b3..58c1955e87 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_any_type.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_any_type.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_array.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_array.rb index 621e290e15..6895d7b080 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_array.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_array.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_boolean.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_boolean.rb index 787951bf68..7672c81014 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_boolean.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_boolean.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb index 27f9768fb8..f178be39d2 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_integer.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_integer.rb index 5ed4bd9381..ae612732d6 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_integer.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_integer.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_number.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_number.rb index 3499c090be..0a3d85bcd6 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_number.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_number.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_object.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_object.rb index fd957eb08f..e525cc8341 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_object.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_object.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_string.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_string.rb index ca5e538595..178b6d3170 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_string.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_string.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/animal.rb b/samples/client/petstore/ruby/lib/petstore/models/animal.rb index 396199ca41..6eb2bc0b3d 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/animal.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/animal.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/api_response.rb b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb index 998250d20a..60f0120e03 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/api_response.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb index 99aa9482fa..29774b89d8 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb index e7da1699d4..3765b7d4a5 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_test.rb b/samples/client/petstore/ruby/lib/petstore/models/array_test.rb index 121bff2f02..9821695c69 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_test.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb b/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb index 02567bdfd4..225e4f646e 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/cat.rb b/samples/client/petstore/ruby/lib/petstore/models/cat.rb index 51ab33355e..c2c86019bd 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/cat.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/cat.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb b/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb index a971e6f556..3f3802dd87 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/category.rb b/samples/client/petstore/ruby/lib/petstore/models/category.rb index 344ca69065..42ac5c8b31 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/category.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/category.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/class_model.rb b/samples/client/petstore/ruby/lib/petstore/models/class_model.rb index 01b2b965d6..118553a01e 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/class_model.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/class_model.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/client.rb b/samples/client/petstore/ruby/lib/petstore/models/client.rb index 830ab1d0f0..9903a3b000 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/client.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/client.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/dog.rb b/samples/client/petstore/ruby/lib/petstore/models/dog.rb index 07c31216bc..f6f5ef33ce 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/dog.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/dog.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb b/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb index 18cf619772..783e7c0754 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb index 1f12cb43b9..46294ae347 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb index 406b0dccc9..8ee977570d 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb index 0a2b987f34..db14424ccd 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/file.rb b/samples/client/petstore/ruby/lib/petstore/models/file.rb index 459e4deba8..da7179faed 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/file.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/file.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb b/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb index c01bb104a3..9d6d2b6e7d 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb index 4638d9f36e..93d70ef1f8 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb b/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb index 6d24ac174c..8cbc21dc8a 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/list.rb b/samples/client/petstore/ruby/lib/petstore/models/list.rb index ab8318101b..6b3bb37d18 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/list.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/list.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/map_test.rb b/samples/client/petstore/ruby/lib/petstore/models/map_test.rb index 68509874a7..61d2eca931 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/map_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/map_test.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb b/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb index f82bdde772..be2f222448 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb b/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb index d87939a4b8..8dad3cbc99 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb index 32b75d1f08..ec1867c040 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/name.rb b/samples/client/petstore/ruby/lib/petstore/models/name.rb index 665fc35276..6c6098da26 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/name.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/name.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/number_only.rb index 8b6da24af4..868b01f0e4 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/number_only.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/order.rb b/samples/client/petstore/ruby/lib/petstore/models/order.rb index bcfc925dbf..06a30ca375 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/order.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/order.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb index 1cfbf6659a..531535313d 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb index c7d622d970..b93f5dd6b5 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/pet.rb b/samples/client/petstore/ruby/lib/petstore/models/pet.rb index 20a476bbe9..f8787f3889 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/pet.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/pet.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb b/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb index 012f382be7..5329f653d7 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb index b2bc0dc84a..0eb75eb749 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/tag.rb b/samples/client/petstore/ruby/lib/petstore/models/tag.rb index 6d79193b09..8db4775582 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/tag.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/tag.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/type_holder_default.rb b/samples/client/petstore/ruby/lib/petstore/models/type_holder_default.rb index 362ceff7a8..bcbd1e70bf 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/type_holder_default.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/type_holder_default.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/type_holder_example.rb b/samples/client/petstore/ruby/lib/petstore/models/type_holder_example.rb index 63390983f3..4c3011ef4f 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/type_holder_example.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/type_holder_example.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/user.rb b/samples/client/petstore/ruby/lib/petstore/models/user.rb index 5b97445cc1..89afffa96b 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/user.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/user.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/xml_item.rb b/samples/client/petstore/ruby/lib/petstore/models/xml_item.rb index 9c26309da1..131d15a41f 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/xml_item.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/xml_item.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/lib/petstore/version.rb b/samples/client/petstore/ruby/lib/petstore/version.rb index 2964544583..04c6d8d3a5 100644 --- a/samples/client/petstore/ruby/lib/petstore/version.rb +++ b/samples/client/petstore/ruby/lib/petstore/version.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/petstore.gemspec b/samples/client/petstore/ruby/petstore.gemspec index 167ff9a753..40ae414770 100644 --- a/samples/client/petstore/ruby/petstore.gemspec +++ b/samples/client/petstore/ruby/petstore.gemspec @@ -8,7 +8,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/api/another_fake_api_spec.rb b/samples/client/petstore/ruby/spec/api/another_fake_api_spec.rb index 6e202fb43d..30c6531c02 100644 --- a/samples/client/petstore/ruby/spec/api/another_fake_api_spec.rb +++ b/samples/client/petstore/ruby/spec/api/another_fake_api_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/api/fake_api_spec.rb b/samples/client/petstore/ruby/spec/api/fake_api_spec.rb index ac6be349ff..f329eb08a8 100644 --- a/samples/client/petstore/ruby/spec/api/fake_api_spec.rb +++ b/samples/client/petstore/ruby/spec/api/fake_api_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb b/samples/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb index 7080b34d9f..37b84134ab 100644 --- a/samples/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb +++ b/samples/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/api/pet_api_spec.rb b/samples/client/petstore/ruby/spec/api/pet_api_spec.rb index efd0fc640e..bc05dd8af2 100644 --- a/samples/client/petstore/ruby/spec/api/pet_api_spec.rb +++ b/samples/client/petstore/ruby/spec/api/pet_api_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/api/store_api_spec.rb b/samples/client/petstore/ruby/spec/api/store_api_spec.rb index 7dd515a5f3..723a138afb 100644 --- a/samples/client/petstore/ruby/spec/api/store_api_spec.rb +++ b/samples/client/petstore/ruby/spec/api/store_api_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/api/user_api_spec.rb b/samples/client/petstore/ruby/spec/api/user_api_spec.rb index eb3fc63625..b48a94e1a6 100644 --- a/samples/client/petstore/ruby/spec/api/user_api_spec.rb +++ b/samples/client/petstore/ruby/spec/api/user_api_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/api_client_spec.rb b/samples/client/petstore/ruby/spec/api_client_spec.rb index 274d78c14c..c4481e5171 100644 --- a/samples/client/petstore/ruby/spec/api_client_spec.rb +++ b/samples/client/petstore/ruby/spec/api_client_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/configuration_spec.rb b/samples/client/petstore/ruby/spec/configuration_spec.rb index 08263fa509..d10e4b23dd 100644 --- a/samples/client/petstore/ruby/spec/configuration_spec.rb +++ b/samples/client/petstore/ruby/spec/configuration_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_any_type_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_any_type_spec.rb index 846f3dec88..4c4dfc5a27 100644 --- a/samples/client/petstore/ruby/spec/models/additional_properties_any_type_spec.rb +++ b/samples/client/petstore/ruby/spec/models/additional_properties_any_type_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_array_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_array_spec.rb index ef280e7316..51abe4311f 100644 --- a/samples/client/petstore/ruby/spec/models/additional_properties_array_spec.rb +++ b/samples/client/petstore/ruby/spec/models/additional_properties_array_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_boolean_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_boolean_spec.rb index c56d64e418..e844f40385 100644 --- a/samples/client/petstore/ruby/spec/models/additional_properties_boolean_spec.rb +++ b/samples/client/petstore/ruby/spec/models/additional_properties_boolean_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_class_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_class_spec.rb index 864bf2d883..5d9ab89da3 100644 --- a/samples/client/petstore/ruby/spec/models/additional_properties_class_spec.rb +++ b/samples/client/petstore/ruby/spec/models/additional_properties_class_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_integer_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_integer_spec.rb index 78868109a6..232e5cb19c 100644 --- a/samples/client/petstore/ruby/spec/models/additional_properties_integer_spec.rb +++ b/samples/client/petstore/ruby/spec/models/additional_properties_integer_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_number_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_number_spec.rb index 9a33ded47a..5950177647 100644 --- a/samples/client/petstore/ruby/spec/models/additional_properties_number_spec.rb +++ b/samples/client/petstore/ruby/spec/models/additional_properties_number_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_object_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_object_spec.rb index c9182ce664..c6ed9d5fc0 100644 --- a/samples/client/petstore/ruby/spec/models/additional_properties_object_spec.rb +++ b/samples/client/petstore/ruby/spec/models/additional_properties_object_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/additional_properties_string_spec.rb b/samples/client/petstore/ruby/spec/models/additional_properties_string_spec.rb index b2c5288ec4..a186b81dbe 100644 --- a/samples/client/petstore/ruby/spec/models/additional_properties_string_spec.rb +++ b/samples/client/petstore/ruby/spec/models/additional_properties_string_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/animal_spec.rb b/samples/client/petstore/ruby/spec/models/animal_spec.rb index 08155ef394..6444e48f8e 100644 --- a/samples/client/petstore/ruby/spec/models/animal_spec.rb +++ b/samples/client/petstore/ruby/spec/models/animal_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/api_response_spec.rb b/samples/client/petstore/ruby/spec/models/api_response_spec.rb index 991bb81df7..b8d7f8db8c 100644 --- a/samples/client/petstore/ruby/spec/models/api_response_spec.rb +++ b/samples/client/petstore/ruby/spec/models/api_response_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb b/samples/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb index 372539c55c..af3da82656 100644 --- a/samples/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb +++ b/samples/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/array_of_number_only_spec.rb b/samples/client/petstore/ruby/spec/models/array_of_number_only_spec.rb index 759a272f68..706c9e7731 100644 --- a/samples/client/petstore/ruby/spec/models/array_of_number_only_spec.rb +++ b/samples/client/petstore/ruby/spec/models/array_of_number_only_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/array_test_spec.rb b/samples/client/petstore/ruby/spec/models/array_test_spec.rb index c3819c9a9f..c5cf5d30a0 100644 --- a/samples/client/petstore/ruby/spec/models/array_test_spec.rb +++ b/samples/client/petstore/ruby/spec/models/array_test_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/capitalization_spec.rb b/samples/client/petstore/ruby/spec/models/capitalization_spec.rb index 9805991853..d454b7b63e 100644 --- a/samples/client/petstore/ruby/spec/models/capitalization_spec.rb +++ b/samples/client/petstore/ruby/spec/models/capitalization_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/cat_all_of_spec.rb b/samples/client/petstore/ruby/spec/models/cat_all_of_spec.rb index 49859a0524..479a933e21 100644 --- a/samples/client/petstore/ruby/spec/models/cat_all_of_spec.rb +++ b/samples/client/petstore/ruby/spec/models/cat_all_of_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/cat_spec.rb b/samples/client/petstore/ruby/spec/models/cat_spec.rb index 0ee7d2a7f6..a5785a1697 100644 --- a/samples/client/petstore/ruby/spec/models/cat_spec.rb +++ b/samples/client/petstore/ruby/spec/models/cat_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/category_spec.rb b/samples/client/petstore/ruby/spec/models/category_spec.rb index 1f9f8897fd..2ed0bec7c6 100644 --- a/samples/client/petstore/ruby/spec/models/category_spec.rb +++ b/samples/client/petstore/ruby/spec/models/category_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/class_model_spec.rb b/samples/client/petstore/ruby/spec/models/class_model_spec.rb index 589f3d1f12..61d29ad31c 100644 --- a/samples/client/petstore/ruby/spec/models/class_model_spec.rb +++ b/samples/client/petstore/ruby/spec/models/class_model_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/client_spec.rb b/samples/client/petstore/ruby/spec/models/client_spec.rb index b246962e2b..e031f0a336 100644 --- a/samples/client/petstore/ruby/spec/models/client_spec.rb +++ b/samples/client/petstore/ruby/spec/models/client_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/dog_all_of_spec.rb b/samples/client/petstore/ruby/spec/models/dog_all_of_spec.rb index 6cba24ecd9..200a7d0a7e 100644 --- a/samples/client/petstore/ruby/spec/models/dog_all_of_spec.rb +++ b/samples/client/petstore/ruby/spec/models/dog_all_of_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/dog_spec.rb b/samples/client/petstore/ruby/spec/models/dog_spec.rb index d13a686449..97ccdb0e86 100644 --- a/samples/client/petstore/ruby/spec/models/dog_spec.rb +++ b/samples/client/petstore/ruby/spec/models/dog_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/enum_arrays_spec.rb b/samples/client/petstore/ruby/spec/models/enum_arrays_spec.rb index 993d8f3a3e..f74ff0251e 100644 --- a/samples/client/petstore/ruby/spec/models/enum_arrays_spec.rb +++ b/samples/client/petstore/ruby/spec/models/enum_arrays_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/enum_class_spec.rb b/samples/client/petstore/ruby/spec/models/enum_class_spec.rb index 50c56e53df..94551ecd23 100644 --- a/samples/client/petstore/ruby/spec/models/enum_class_spec.rb +++ b/samples/client/petstore/ruby/spec/models/enum_class_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/enum_test_spec.rb b/samples/client/petstore/ruby/spec/models/enum_test_spec.rb index b66e5d730f..ac5226130f 100644 --- a/samples/client/petstore/ruby/spec/models/enum_test_spec.rb +++ b/samples/client/petstore/ruby/spec/models/enum_test_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb b/samples/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb index c59870f674..ff922dc1c5 100644 --- a/samples/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb +++ b/samples/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/file_spec.rb b/samples/client/petstore/ruby/spec/models/file_spec.rb index 38513a9593..7cb23a664e 100644 --- a/samples/client/petstore/ruby/spec/models/file_spec.rb +++ b/samples/client/petstore/ruby/spec/models/file_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/format_test_spec.rb b/samples/client/petstore/ruby/spec/models/format_test_spec.rb index 3ce512bc78..e1f8b7976a 100644 --- a/samples/client/petstore/ruby/spec/models/format_test_spec.rb +++ b/samples/client/petstore/ruby/spec/models/format_test_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/has_only_read_only_spec.rb b/samples/client/petstore/ruby/spec/models/has_only_read_only_spec.rb index f1e7908be1..01e6d0df6d 100644 --- a/samples/client/petstore/ruby/spec/models/has_only_read_only_spec.rb +++ b/samples/client/petstore/ruby/spec/models/has_only_read_only_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/list_spec.rb b/samples/client/petstore/ruby/spec/models/list_spec.rb index 305f503079..c89a90864d 100644 --- a/samples/client/petstore/ruby/spec/models/list_spec.rb +++ b/samples/client/petstore/ruby/spec/models/list_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/map_test_spec.rb b/samples/client/petstore/ruby/spec/models/map_test_spec.rb index 6be8c3aff5..5da2ca13d0 100644 --- a/samples/client/petstore/ruby/spec/models/map_test_spec.rb +++ b/samples/client/petstore/ruby/spec/models/map_test_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb b/samples/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb index d9070acf51..52992adccb 100644 --- a/samples/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb +++ b/samples/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/model200_response_spec.rb b/samples/client/petstore/ruby/spec/models/model200_response_spec.rb index 6502d960cb..f42829bd56 100644 --- a/samples/client/petstore/ruby/spec/models/model200_response_spec.rb +++ b/samples/client/petstore/ruby/spec/models/model200_response_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/model_return_spec.rb b/samples/client/petstore/ruby/spec/models/model_return_spec.rb index e4fc442810..8fee9ad96b 100644 --- a/samples/client/petstore/ruby/spec/models/model_return_spec.rb +++ b/samples/client/petstore/ruby/spec/models/model_return_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/name_spec.rb b/samples/client/petstore/ruby/spec/models/name_spec.rb index 362d499d12..b0354944cd 100644 --- a/samples/client/petstore/ruby/spec/models/name_spec.rb +++ b/samples/client/petstore/ruby/spec/models/name_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/number_only_spec.rb b/samples/client/petstore/ruby/spec/models/number_only_spec.rb index 440a2d377d..df54f816c3 100644 --- a/samples/client/petstore/ruby/spec/models/number_only_spec.rb +++ b/samples/client/petstore/ruby/spec/models/number_only_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/order_spec.rb b/samples/client/petstore/ruby/spec/models/order_spec.rb index 45788b835a..31f3548f23 100644 --- a/samples/client/petstore/ruby/spec/models/order_spec.rb +++ b/samples/client/petstore/ruby/spec/models/order_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/outer_composite_spec.rb b/samples/client/petstore/ruby/spec/models/outer_composite_spec.rb index a7c25a114c..e06f75b542 100644 --- a/samples/client/petstore/ruby/spec/models/outer_composite_spec.rb +++ b/samples/client/petstore/ruby/spec/models/outer_composite_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/outer_enum_spec.rb b/samples/client/petstore/ruby/spec/models/outer_enum_spec.rb index f6de5c8991..9971665923 100644 --- a/samples/client/petstore/ruby/spec/models/outer_enum_spec.rb +++ b/samples/client/petstore/ruby/spec/models/outer_enum_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/pet_spec.rb b/samples/client/petstore/ruby/spec/models/pet_spec.rb index b0c7076815..868fcdd497 100644 --- a/samples/client/petstore/ruby/spec/models/pet_spec.rb +++ b/samples/client/petstore/ruby/spec/models/pet_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/read_only_first_spec.rb b/samples/client/petstore/ruby/spec/models/read_only_first_spec.rb index d8a4230276..f3fdb19569 100644 --- a/samples/client/petstore/ruby/spec/models/read_only_first_spec.rb +++ b/samples/client/petstore/ruby/spec/models/read_only_first_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb b/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb index 43eb2ec61e..0aad11f566 100644 --- a/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb +++ b/samples/client/petstore/ruby/spec/models/special_model_name_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/tag_spec.rb b/samples/client/petstore/ruby/spec/models/tag_spec.rb index abb8380ff3..04038aa3e7 100644 --- a/samples/client/petstore/ruby/spec/models/tag_spec.rb +++ b/samples/client/petstore/ruby/spec/models/tag_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/type_holder_default_spec.rb b/samples/client/petstore/ruby/spec/models/type_holder_default_spec.rb index 3cee11d7ba..4e3233bdf9 100644 --- a/samples/client/petstore/ruby/spec/models/type_holder_default_spec.rb +++ b/samples/client/petstore/ruby/spec/models/type_holder_default_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/type_holder_example_spec.rb b/samples/client/petstore/ruby/spec/models/type_holder_example_spec.rb index 0edc334dd6..4bbdaa4d5a 100644 --- a/samples/client/petstore/ruby/spec/models/type_holder_example_spec.rb +++ b/samples/client/petstore/ruby/spec/models/type_holder_example_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/user_spec.rb b/samples/client/petstore/ruby/spec/models/user_spec.rb index d313a360bb..580a180eae 100644 --- a/samples/client/petstore/ruby/spec/models/user_spec.rb +++ b/samples/client/petstore/ruby/spec/models/user_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/models/xml_item_spec.rb b/samples/client/petstore/ruby/spec/models/xml_item_spec.rb index c7d06a3580..f59bd3986c 100644 --- a/samples/client/petstore/ruby/spec/models/xml_item_spec.rb +++ b/samples/client/petstore/ruby/spec/models/xml_item_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/ruby/spec/spec_helper.rb b/samples/client/petstore/ruby/spec/spec_helper.rb index dc8611b437..4dfb22a9d2 100644 --- a/samples/client/petstore/ruby/spec/spec_helper.rb +++ b/samples/client/petstore/ruby/spec/spec_helper.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/client/petstore/scala-httpclient/.openapi-generator/VERSION b/samples/client/petstore/scala-httpclient/.openapi-generator/VERSION index 94ae9ee1fa..06b5019af3 100644 --- a/samples/client/petstore/scala-httpclient/.openapi-generator/VERSION +++ b/samples/client/petstore/scala-httpclient/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/scala-httpclient/build.sbt b/samples/client/petstore/scala-httpclient/build.sbt index 95c39ce856..990c87596d 100644 --- a/samples/client/petstore/scala-httpclient/build.sbt +++ b/samples/client/petstore/scala-httpclient/build.sbt @@ -4,8 +4,8 @@ organization := "org.openapitools" scalaVersion := "2.11.12" libraryDependencies ++= Seq( - "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.9.2", - "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.2", + "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.9.9", + "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.9", "com.sun.jersey" % "jersey-core" % "1.19.4", "com.sun.jersey" % "jersey-client" % "1.19.4", "com.sun.jersey.contribs" % "jersey-multipart" % "1.19.4", diff --git a/samples/client/petstore/scala-httpclient/pom.xml b/samples/client/petstore/scala-httpclient/pom.xml index 995f7c78e1..d7b73e5d3f 100644 --- a/samples/client/petstore/scala-httpclient/pom.xml +++ b/samples/client/petstore/scala-httpclient/pom.xml @@ -242,7 +242,7 @@ 1.5.18 1.0.5 1.0.0 - 2.9.2 + 2.9.9 4.12 3.1.5 diff --git a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/ApiInvoker.scala b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/ApiInvoker.scala index 885c71199d..0b17519c6f 100644 --- a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/ApiInvoker.scala +++ b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/ApiInvoker.scala @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/PetApi.scala b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/PetApi.scala index 25b5fff03a..768cb5c0b5 100644 --- a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/PetApi.scala +++ b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/PetApi.scala @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/StoreApi.scala b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/StoreApi.scala index 9eeaea664d..4328080db9 100644 --- a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/StoreApi.scala +++ b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/StoreApi.scala @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/UserApi.scala b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/UserApi.scala index 048a7d10d6..efd7f1ef97 100644 --- a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/UserApi.scala +++ b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/api/UserApi.scala @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/ApiResponse.scala b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/ApiResponse.scala index 090cbaddd4..be74123132 100644 --- a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/ApiResponse.scala +++ b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/ApiResponse.scala @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Category.scala b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Category.scala index 5040e0cb96..be3307b8f8 100644 --- a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Category.scala +++ b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Category.scala @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Order.scala b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Order.scala index 72f09d7a74..d0ca63b509 100644 --- a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Order.scala +++ b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Order.scala @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Pet.scala b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Pet.scala index 1f060b10c7..2de76ae358 100644 --- a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Pet.scala +++ b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Pet.scala @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Tag.scala b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Tag.scala index da3cd4acd4..6fbabf7ed6 100644 --- a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Tag.scala +++ b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/Tag.scala @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/User.scala b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/User.scala index cd4c1c9b67..fc24b101e8 100644 --- a/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/User.scala +++ b/samples/client/petstore/scala-httpclient/src/main/scala/org/openapitools/client/model/User.scala @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/spring-cloud/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/spring-cloud/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java index 43e52b7af0..b0678ab0c9 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java index 033f7a02ac..1c3d7ef46e 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java index 6d29de21e7..ab41488462 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-stubs/.openapi-generator/VERSION b/samples/client/petstore/spring-stubs/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/spring-stubs/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-stubs/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java index fcd4c94370..59313544d5 100644 --- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java index 1137beea30..b0716cc5ec 100644 --- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java index 011a76a943..89f29af86f 100644 --- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/typescript-angular-v2/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v2/default/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-angular-v2/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v2/default/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-angular-v2/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v2/npm/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-angular-v2/npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v2/npm/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v2/with-interfaces/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-angular-v2/with-interfaces/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v4.3/npm/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-angular-v4.3/npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v4.3/npm/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-angular-v4/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v4/npm/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-angular-v4/npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v4/npm/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-angularjs/.openapi-generator/VERSION b/samples/client/petstore/typescript-angularjs/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-angularjs/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angularjs/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-axios/builds/default/api.ts b/samples/client/petstore/typescript-axios/builds/default/api.ts index 70cb76993f..c746467d27 100644 --- a/samples/client/petstore/typescript-axios/builds/default/api.ts +++ b/samples/client/petstore/typescript-axios/builds/default/api.ts @@ -13,7 +13,7 @@ */ -import * as url from 'url'; +import * as globalImportUrl from 'url'; import { Configuration } from './configuration'; import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from './base'; @@ -264,7 +264,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling addPet.'); } const localVarPath = `/pet`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -293,7 +293,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -312,7 +312,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/pet/{petId}` .replace(`{${"petId"}}`, encodeURIComponent(String(petId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -341,7 +341,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -358,7 +358,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('status','Required parameter status was null or undefined when calling findPetsByStatus.'); } const localVarPath = `/pet/findByStatus`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -387,7 +387,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -404,7 +404,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('tags','Required parameter tags was null or undefined when calling findPetsByTags.'); } const localVarPath = `/pet/findByTags`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -433,7 +433,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -451,7 +451,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/pet/{petId}` .replace(`{${"petId"}}`, encodeURIComponent(String(petId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -475,7 +475,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -492,7 +492,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling updatePet.'); } const localVarPath = `/pet`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -521,7 +521,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -541,7 +541,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/pet/{petId}` .replace(`{${"petId"}}`, encodeURIComponent(String(petId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -577,7 +577,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = localVarFormParams.toString(); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -597,7 +597,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/pet/{petId}/uploadImage` .replace(`{${"petId"}}`, encodeURIComponent(String(petId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -633,7 +633,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = localVarFormParams; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -991,7 +991,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration } const localVarPath = `/store/order/{orderId}` .replace(`{${"orderId"}}`, encodeURIComponent(String(orderId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1007,7 +1007,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1019,7 +1019,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration */ getInventory(options: any = {}): RequestArgs { const localVarPath = `/store/inventory`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1043,7 +1043,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1061,7 +1061,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration } const localVarPath = `/store/order/{orderId}` .replace(`{${"orderId"}}`, encodeURIComponent(String(orderId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1077,7 +1077,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1094,7 +1094,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration throw new RequiredError('body','Required parameter body was null or undefined when calling placeOrder.'); } const localVarPath = `/store/order`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1114,7 +1114,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1309,7 +1309,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling createUser.'); } const localVarPath = `/user`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1329,7 +1329,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1346,7 +1346,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } const localVarPath = `/user/createWithArray`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1366,7 +1366,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1383,7 +1383,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling createUsersWithListInput.'); } const localVarPath = `/user/createWithList`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1403,7 +1403,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1421,7 +1421,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/user/{username}` .replace(`{${"username"}}`, encodeURIComponent(String(username))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1437,7 +1437,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1455,7 +1455,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/user/{username}` .replace(`{${"username"}}`, encodeURIComponent(String(username))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1471,7 +1471,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1493,7 +1493,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('password','Required parameter password was null or undefined when calling loginUser.'); } const localVarPath = `/user/login`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1517,7 +1517,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1529,7 +1529,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) */ logoutUser(options: any = {}): RequestArgs { const localVarPath = `/user/logout`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1545,7 +1545,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1568,7 +1568,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/user/{username}` .replace(`{${"username"}}`, encodeURIComponent(String(username))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1588,7 +1588,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/api.ts b/samples/client/petstore/typescript-axios/builds/es6-target/api.ts index 70cb76993f..c746467d27 100644 --- a/samples/client/petstore/typescript-axios/builds/es6-target/api.ts +++ b/samples/client/petstore/typescript-axios/builds/es6-target/api.ts @@ -13,7 +13,7 @@ */ -import * as url from 'url'; +import * as globalImportUrl from 'url'; import { Configuration } from './configuration'; import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from './base'; @@ -264,7 +264,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling addPet.'); } const localVarPath = `/pet`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -293,7 +293,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -312,7 +312,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/pet/{petId}` .replace(`{${"petId"}}`, encodeURIComponent(String(petId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -341,7 +341,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -358,7 +358,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('status','Required parameter status was null or undefined when calling findPetsByStatus.'); } const localVarPath = `/pet/findByStatus`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -387,7 +387,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -404,7 +404,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('tags','Required parameter tags was null or undefined when calling findPetsByTags.'); } const localVarPath = `/pet/findByTags`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -433,7 +433,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -451,7 +451,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/pet/{petId}` .replace(`{${"petId"}}`, encodeURIComponent(String(petId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -475,7 +475,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -492,7 +492,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling updatePet.'); } const localVarPath = `/pet`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -521,7 +521,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -541,7 +541,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/pet/{petId}` .replace(`{${"petId"}}`, encodeURIComponent(String(petId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -577,7 +577,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = localVarFormParams.toString(); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -597,7 +597,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/pet/{petId}/uploadImage` .replace(`{${"petId"}}`, encodeURIComponent(String(petId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -633,7 +633,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = localVarFormParams; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -991,7 +991,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration } const localVarPath = `/store/order/{orderId}` .replace(`{${"orderId"}}`, encodeURIComponent(String(orderId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1007,7 +1007,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1019,7 +1019,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration */ getInventory(options: any = {}): RequestArgs { const localVarPath = `/store/inventory`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1043,7 +1043,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1061,7 +1061,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration } const localVarPath = `/store/order/{orderId}` .replace(`{${"orderId"}}`, encodeURIComponent(String(orderId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1077,7 +1077,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1094,7 +1094,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration throw new RequiredError('body','Required parameter body was null or undefined when calling placeOrder.'); } const localVarPath = `/store/order`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1114,7 +1114,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1309,7 +1309,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling createUser.'); } const localVarPath = `/user`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1329,7 +1329,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1346,7 +1346,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } const localVarPath = `/user/createWithArray`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1366,7 +1366,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1383,7 +1383,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling createUsersWithListInput.'); } const localVarPath = `/user/createWithList`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1403,7 +1403,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1421,7 +1421,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/user/{username}` .replace(`{${"username"}}`, encodeURIComponent(String(username))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1437,7 +1437,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1455,7 +1455,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/user/{username}` .replace(`{${"username"}}`, encodeURIComponent(String(username))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1471,7 +1471,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1493,7 +1493,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('password','Required parameter password was null or undefined when calling loginUser.'); } const localVarPath = `/user/login`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1517,7 +1517,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1529,7 +1529,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) */ logoutUser(options: any = {}): RequestArgs { const localVarPath = `/user/logout`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1545,7 +1545,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1568,7 +1568,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/user/{username}` .replace(`{${"username"}}`, encodeURIComponent(String(username))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1588,7 +1588,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts index c4a48b1268..8b55c34845 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts @@ -13,7 +13,7 @@ */ -import * as url from 'url'; +import * as globalImportUrl from 'url'; import { Configuration } from './configuration'; import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from './base'; @@ -264,7 +264,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling addPet.'); } const localVarPath = `/pet`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -293,7 +293,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -312,7 +312,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/pet/{petId}` .replace(`{${"petId"}}`, encodeURIComponent(String(petId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -341,7 +341,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -358,7 +358,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('status','Required parameter status was null or undefined when calling findPetsByStatus.'); } const localVarPath = `/pet/findByStatus`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -387,7 +387,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -404,7 +404,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('tags','Required parameter tags was null or undefined when calling findPetsByTags.'); } const localVarPath = `/pet/findByTags`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -433,7 +433,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -451,7 +451,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/pet/{petId}` .replace(`{${"petId"}}`, encodeURIComponent(String(petId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -475,7 +475,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -492,7 +492,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling updatePet.'); } const localVarPath = `/pet`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -521,7 +521,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -541,7 +541,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/pet/{petId}` .replace(`{${"petId"}}`, encodeURIComponent(String(petId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -577,7 +577,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = localVarFormParams.toString(); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -597,7 +597,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/pet/{petId}/uploadImage` .replace(`{${"petId"}}`, encodeURIComponent(String(petId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -633,7 +633,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = localVarFormParams; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1084,7 +1084,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration } const localVarPath = `/store/order/{orderId}` .replace(`{${"orderId"}}`, encodeURIComponent(String(orderId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1100,7 +1100,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1112,7 +1112,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration */ getInventory(options: any = {}): RequestArgs { const localVarPath = `/store/inventory`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1136,7 +1136,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1154,7 +1154,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration } const localVarPath = `/store/order/{orderId}` .replace(`{${"orderId"}}`, encodeURIComponent(String(orderId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1170,7 +1170,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1187,7 +1187,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration throw new RequiredError('body','Required parameter body was null or undefined when calling placeOrder.'); } const localVarPath = `/store/order`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1207,7 +1207,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1449,7 +1449,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling createUser.'); } const localVarPath = `/user`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1469,7 +1469,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1486,7 +1486,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } const localVarPath = `/user/createWithArray`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1506,7 +1506,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1523,7 +1523,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling createUsersWithListInput.'); } const localVarPath = `/user/createWithList`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1543,7 +1543,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1561,7 +1561,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/user/{username}` .replace(`{${"username"}}`, encodeURIComponent(String(username))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1577,7 +1577,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1595,7 +1595,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/user/{username}` .replace(`{${"username"}}`, encodeURIComponent(String(username))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1611,7 +1611,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1633,7 +1633,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('password','Required parameter password was null or undefined when calling loginUser.'); } const localVarPath = `/user/login`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1657,7 +1657,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1669,7 +1669,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) */ logoutUser(options: any = {}): RequestArgs { const localVarPath = `/user/logout`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1685,7 +1685,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1708,7 +1708,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/user/{username}` .replace(`{${"username"}}`, encodeURIComponent(String(username))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1728,7 +1728,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts index 5ca36ad93e..99b968d028 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts @@ -13,7 +13,7 @@ */ -import * as url from 'url'; +import * as globalImportUrl from 'url'; import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; import { Configuration } from '../../../configuration'; import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../../../base'; @@ -39,7 +39,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling addPet.'); } const localVarPath = `/pet`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -68,7 +68,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -87,7 +87,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/pet/{petId}` .replace(`{${"petId"}}`, encodeURIComponent(String(petId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -116,7 +116,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -133,7 +133,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('status','Required parameter status was null or undefined when calling findPetsByStatus.'); } const localVarPath = `/pet/findByStatus`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -162,7 +162,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -179,7 +179,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('tags','Required parameter tags was null or undefined when calling findPetsByTags.'); } const localVarPath = `/pet/findByTags`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -208,7 +208,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -226,7 +226,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/pet/{petId}` .replace(`{${"petId"}}`, encodeURIComponent(String(petId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -250,7 +250,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -267,7 +267,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling updatePet.'); } const localVarPath = `/pet`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -296,7 +296,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -316,7 +316,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/pet/{petId}` .replace(`{${"petId"}}`, encodeURIComponent(String(petId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -352,7 +352,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = localVarFormParams.toString(); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -372,7 +372,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/pet/{petId}/uploadImage` .replace(`{${"petId"}}`, encodeURIComponent(String(petId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -408,7 +408,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = localVarFormParams; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/store-api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/store-api.ts index f91ee7e38e..b8c0ea2f6a 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/store-api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/store-api.ts @@ -13,7 +13,7 @@ */ -import * as url from 'url'; +import * as globalImportUrl from 'url'; import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; import { Configuration } from '../../../configuration'; import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../../../base'; @@ -39,7 +39,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration } const localVarPath = `/store/order/{orderId}` .replace(`{${"orderId"}}`, encodeURIComponent(String(orderId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -55,7 +55,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -67,7 +67,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration */ getInventory(options: any = {}): RequestArgs { const localVarPath = `/store/inventory`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -91,7 +91,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -109,7 +109,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration } const localVarPath = `/store/order/{orderId}` .replace(`{${"orderId"}}`, encodeURIComponent(String(orderId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -125,7 +125,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -142,7 +142,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration throw new RequiredError('body','Required parameter body was null or undefined when calling placeOrder.'); } const localVarPath = `/store/order`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -162,7 +162,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/user-api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/user-api.ts index 2025f7dafd..fdf8f18d09 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/user-api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/user-api.ts @@ -13,7 +13,7 @@ */ -import * as url from 'url'; +import * as globalImportUrl from 'url'; import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; import { Configuration } from '../../../configuration'; import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../../../base'; @@ -38,7 +38,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling createUser.'); } const localVarPath = `/user`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -58,7 +58,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -75,7 +75,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } const localVarPath = `/user/createWithArray`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -95,7 +95,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -112,7 +112,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling createUsersWithListInput.'); } const localVarPath = `/user/createWithList`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -132,7 +132,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -150,7 +150,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/user/{username}` .replace(`{${"username"}}`, encodeURIComponent(String(username))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -166,7 +166,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -184,7 +184,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/user/{username}` .replace(`{${"username"}}`, encodeURIComponent(String(username))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -200,7 +200,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -222,7 +222,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('password','Required parameter password was null or undefined when calling loginUser.'); } const localVarPath = `/user/login`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -246,7 +246,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -258,7 +258,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) */ logoutUser(options: any = {}): RequestArgs { const localVarPath = `/user/logout`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -274,7 +274,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -297,7 +297,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/user/{username}` .replace(`{${"username"}}`, encodeURIComponent(String(username))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -317,7 +317,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts index 70cb76993f..c746467d27 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts @@ -13,7 +13,7 @@ */ -import * as url from 'url'; +import * as globalImportUrl from 'url'; import { Configuration } from './configuration'; import globalAxios, { AxiosPromise, AxiosInstance } from 'axios'; import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from './base'; @@ -264,7 +264,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling addPet.'); } const localVarPath = `/pet`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -293,7 +293,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -312,7 +312,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/pet/{petId}` .replace(`{${"petId"}}`, encodeURIComponent(String(petId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -341,7 +341,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -358,7 +358,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('status','Required parameter status was null or undefined when calling findPetsByStatus.'); } const localVarPath = `/pet/findByStatus`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -387,7 +387,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -404,7 +404,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('tags','Required parameter tags was null or undefined when calling findPetsByTags.'); } const localVarPath = `/pet/findByTags`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -433,7 +433,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -451,7 +451,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/pet/{petId}` .replace(`{${"petId"}}`, encodeURIComponent(String(petId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -475,7 +475,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -492,7 +492,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling updatePet.'); } const localVarPath = `/pet`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -521,7 +521,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -541,7 +541,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/pet/{petId}` .replace(`{${"petId"}}`, encodeURIComponent(String(petId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -577,7 +577,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = localVarFormParams.toString(); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -597,7 +597,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/pet/{petId}/uploadImage` .replace(`{${"petId"}}`, encodeURIComponent(String(petId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -633,7 +633,7 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = localVarFormParams; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -991,7 +991,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration } const localVarPath = `/store/order/{orderId}` .replace(`{${"orderId"}}`, encodeURIComponent(String(orderId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1007,7 +1007,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1019,7 +1019,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration */ getInventory(options: any = {}): RequestArgs { const localVarPath = `/store/inventory`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1043,7 +1043,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1061,7 +1061,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration } const localVarPath = `/store/order/{orderId}` .replace(`{${"orderId"}}`, encodeURIComponent(String(orderId))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1077,7 +1077,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1094,7 +1094,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration throw new RequiredError('body','Required parameter body was null or undefined when calling placeOrder.'); } const localVarPath = `/store/order`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1114,7 +1114,7 @@ export const StoreApiAxiosParamCreator = function (configuration?: Configuration localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1309,7 +1309,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling createUser.'); } const localVarPath = `/user`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1329,7 +1329,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1346,7 +1346,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling createUsersWithArrayInput.'); } const localVarPath = `/user/createWithArray`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1366,7 +1366,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1383,7 +1383,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('body','Required parameter body was null or undefined when calling createUsersWithListInput.'); } const localVarPath = `/user/createWithList`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1403,7 +1403,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1421,7 +1421,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/user/{username}` .replace(`{${"username"}}`, encodeURIComponent(String(username))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1437,7 +1437,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1455,7 +1455,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/user/{username}` .replace(`{${"username"}}`, encodeURIComponent(String(username))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1471,7 +1471,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1493,7 +1493,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) throw new RequiredError('password','Required parameter password was null or undefined when calling loginUser.'); } const localVarPath = `/user/login`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1517,7 +1517,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1529,7 +1529,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) */ logoutUser(options: any = {}): RequestArgs { const localVarPath = `/user/logout`; - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1545,7 +1545,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers}; return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, @@ -1568,7 +1568,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) } const localVarPath = `/user/{username}` .replace(`{${"username"}}`, encodeURIComponent(String(username))); - const localVarUrlObj = url.parse(localVarPath, true); + const localVarUrlObj = globalImportUrl.parse(localVarPath, true); let baseOptions; if (configuration) { baseOptions = configuration.baseOptions; @@ -1588,7 +1588,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); return { - url: url.format(localVarUrlObj), + url: globalImportUrl.format(localVarUrlObj), options: localVarRequestOptions, }; }, diff --git a/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/InlineObject.ts b/samples/client/petstore/typescript-fetch/builds/default/models/InlineObject.ts new file mode 100644 index 0000000000..2998b1463c --- /dev/null +++ b/samples/client/petstore/typescript-fetch/builds/default/models/InlineObject.ts @@ -0,0 +1,52 @@ +// tslint:disable +/** + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +import { exists, mapValues } from '../runtime'; +/** + * + * @export + * @interface InlineObject + */ +export interface InlineObject { + /** + * Updated name of the pet + * @type {string} + * @memberof InlineObject + */ + name?: string; + /** + * Updated status of the pet + * @type {string} + * @memberof InlineObject + */ + status?: string; +} + +export function InlineObjectFromJSON(json: any): InlineObject { + return { + 'name': !exists(json, 'name') ? undefined : json['name'], + 'status': !exists(json, 'status') ? undefined : json['status'], + }; +} + +export function InlineObjectToJSON(value?: InlineObject): any { + if (value === undefined) { + return undefined; + } + return { + 'name': value.name, + 'status': value.status, + }; +} + + diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/InlineObject1.ts b/samples/client/petstore/typescript-fetch/builds/default/models/InlineObject1.ts new file mode 100644 index 0000000000..4cd90b1379 --- /dev/null +++ b/samples/client/petstore/typescript-fetch/builds/default/models/InlineObject1.ts @@ -0,0 +1,52 @@ +// tslint:disable +/** + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +import { exists, mapValues } from '../runtime'; +/** + * + * @export + * @interface InlineObject1 + */ +export interface InlineObject1 { + /** + * Additional data to pass to server + * @type {string} + * @memberof InlineObject1 + */ + additionalMetadata?: string; + /** + * file to upload + * @type {Blob} + * @memberof InlineObject1 + */ + file?: Blob; +} + +export function InlineObject1FromJSON(json: any): InlineObject1 { + return { + 'additionalMetadata': !exists(json, 'additionalMetadata') ? undefined : json['additionalMetadata'], + 'file': !exists(json, 'file') ? undefined : json['file'], + }; +} + +export function InlineObject1ToJSON(value?: InlineObject1): any { + if (value === undefined) { + return undefined; + } + return { + 'additionalMetadata': value.additionalMetadata, + 'file': value.file, + }; +} + + diff --git a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts index 67a45b169f..5b07f81118 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts @@ -14,6 +14,8 @@ export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); +const isBlob = (value: any) => typeof Blob !== 'undefined' && value instanceof Blob; + /** * This is the base class for all generated API classes. */ @@ -58,7 +60,9 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = context.body instanceof FormData ? context.body : JSON.stringify(context.body); + const body = (context.body instanceof FormData || isBlob(context.body)) + ? context.body + : JSON.stringify(context.body); const init = { method: context.method, headers: context.headers, diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/InlineObject.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/InlineObject.ts new file mode 100644 index 0000000000..2998b1463c --- /dev/null +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/InlineObject.ts @@ -0,0 +1,52 @@ +// tslint:disable +/** + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +import { exists, mapValues } from '../runtime'; +/** + * + * @export + * @interface InlineObject + */ +export interface InlineObject { + /** + * Updated name of the pet + * @type {string} + * @memberof InlineObject + */ + name?: string; + /** + * Updated status of the pet + * @type {string} + * @memberof InlineObject + */ + status?: string; +} + +export function InlineObjectFromJSON(json: any): InlineObject { + return { + 'name': !exists(json, 'name') ? undefined : json['name'], + 'status': !exists(json, 'status') ? undefined : json['status'], + }; +} + +export function InlineObjectToJSON(value?: InlineObject): any { + if (value === undefined) { + return undefined; + } + return { + 'name': value.name, + 'status': value.status, + }; +} + + diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/InlineObject1.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/InlineObject1.ts new file mode 100644 index 0000000000..4cd90b1379 --- /dev/null +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/InlineObject1.ts @@ -0,0 +1,52 @@ +// tslint:disable +/** + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +import { exists, mapValues } from '../runtime'; +/** + * + * @export + * @interface InlineObject1 + */ +export interface InlineObject1 { + /** + * Additional data to pass to server + * @type {string} + * @memberof InlineObject1 + */ + additionalMetadata?: string; + /** + * file to upload + * @type {Blob} + * @memberof InlineObject1 + */ + file?: Blob; +} + +export function InlineObject1FromJSON(json: any): InlineObject1 { + return { + 'additionalMetadata': !exists(json, 'additionalMetadata') ? undefined : json['additionalMetadata'], + 'file': !exists(json, 'file') ? undefined : json['file'], + }; +} + +export function InlineObject1ToJSON(value?: InlineObject1): any { + if (value === undefined) { + return undefined; + } + return { + 'additionalMetadata': value.additionalMetadata, + 'file': value.file, + }; +} + + diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts index 67a45b169f..5b07f81118 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts @@ -14,6 +14,8 @@ export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); +const isBlob = (value: any) => typeof Blob !== 'undefined' && value instanceof Blob; + /** * This is the base class for all generated API classes. */ @@ -58,7 +60,9 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = context.body instanceof FormData ? context.body : JSON.stringify(context.body); + const body = (context.body instanceof FormData || isBlob(context.body)) + ? context.body + : JSON.stringify(context.body); const init = { method: context.method, headers: context.headers, diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/InlineObject.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/InlineObject.ts new file mode 100644 index 0000000000..2998b1463c --- /dev/null +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/InlineObject.ts @@ -0,0 +1,52 @@ +// tslint:disable +/** + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +import { exists, mapValues } from '../runtime'; +/** + * + * @export + * @interface InlineObject + */ +export interface InlineObject { + /** + * Updated name of the pet + * @type {string} + * @memberof InlineObject + */ + name?: string; + /** + * Updated status of the pet + * @type {string} + * @memberof InlineObject + */ + status?: string; +} + +export function InlineObjectFromJSON(json: any): InlineObject { + return { + 'name': !exists(json, 'name') ? undefined : json['name'], + 'status': !exists(json, 'status') ? undefined : json['status'], + }; +} + +export function InlineObjectToJSON(value?: InlineObject): any { + if (value === undefined) { + return undefined; + } + return { + 'name': value.name, + 'status': value.status, + }; +} + + diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/InlineObject1.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/InlineObject1.ts new file mode 100644 index 0000000000..4cd90b1379 --- /dev/null +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/InlineObject1.ts @@ -0,0 +1,52 @@ +// tslint:disable +/** + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +import { exists, mapValues } from '../runtime'; +/** + * + * @export + * @interface InlineObject1 + */ +export interface InlineObject1 { + /** + * Additional data to pass to server + * @type {string} + * @memberof InlineObject1 + */ + additionalMetadata?: string; + /** + * file to upload + * @type {Blob} + * @memberof InlineObject1 + */ + file?: Blob; +} + +export function InlineObject1FromJSON(json: any): InlineObject1 { + return { + 'additionalMetadata': !exists(json, 'additionalMetadata') ? undefined : json['additionalMetadata'], + 'file': !exists(json, 'file') ? undefined : json['file'], + }; +} + +export function InlineObject1ToJSON(value?: InlineObject1): any { + if (value === undefined) { + return undefined; + } + return { + 'additionalMetadata': value.additionalMetadata, + 'file': value.file, + }; +} + + diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts index 67a45b169f..5b07f81118 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts @@ -14,6 +14,8 @@ export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); +const isBlob = (value: any) => typeof Blob !== 'undefined' && value instanceof Blob; + /** * This is the base class for all generated API classes. */ @@ -58,7 +60,9 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = context.body instanceof FormData ? context.body : JSON.stringify(context.body); + const body = (context.body instanceof FormData || isBlob(context.body)) + ? context.body + : JSON.stringify(context.body); const init = { method: context.method, headers: context.headers, diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/InlineObject.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/InlineObject.ts new file mode 100644 index 0000000000..2998b1463c --- /dev/null +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/InlineObject.ts @@ -0,0 +1,52 @@ +// tslint:disable +/** + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +import { exists, mapValues } from '../runtime'; +/** + * + * @export + * @interface InlineObject + */ +export interface InlineObject { + /** + * Updated name of the pet + * @type {string} + * @memberof InlineObject + */ + name?: string; + /** + * Updated status of the pet + * @type {string} + * @memberof InlineObject + */ + status?: string; +} + +export function InlineObjectFromJSON(json: any): InlineObject { + return { + 'name': !exists(json, 'name') ? undefined : json['name'], + 'status': !exists(json, 'status') ? undefined : json['status'], + }; +} + +export function InlineObjectToJSON(value?: InlineObject): any { + if (value === undefined) { + return undefined; + } + return { + 'name': value.name, + 'status': value.status, + }; +} + + diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/InlineObject1.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/InlineObject1.ts new file mode 100644 index 0000000000..4cd90b1379 --- /dev/null +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/InlineObject1.ts @@ -0,0 +1,52 @@ +// tslint:disable +/** + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +import { exists, mapValues } from '../runtime'; +/** + * + * @export + * @interface InlineObject1 + */ +export interface InlineObject1 { + /** + * Additional data to pass to server + * @type {string} + * @memberof InlineObject1 + */ + additionalMetadata?: string; + /** + * file to upload + * @type {Blob} + * @memberof InlineObject1 + */ + file?: Blob; +} + +export function InlineObject1FromJSON(json: any): InlineObject1 { + return { + 'additionalMetadata': !exists(json, 'additionalMetadata') ? undefined : json['additionalMetadata'], + 'file': !exists(json, 'file') ? undefined : json['file'], + }; +} + +export function InlineObject1ToJSON(value?: InlineObject1): any { + if (value === undefined) { + return undefined; + } + return { + 'additionalMetadata': value.additionalMetadata, + 'file': value.file, + }; +} + + diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts index 67a45b169f..5b07f81118 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts @@ -14,6 +14,8 @@ export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); +const isBlob = (value: any) => typeof Blob !== 'undefined' && value instanceof Blob; + /** * This is the base class for all generated API classes. */ @@ -58,7 +60,9 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = context.body instanceof FormData ? context.body : JSON.stringify(context.body); + const body = (context.body instanceof FormData || isBlob(context.body)) + ? context.body + : JSON.stringify(context.body); const init = { method: context.method, headers: context.headers, diff --git a/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION b/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-inversify/HttpClient.ts b/samples/client/petstore/typescript-inversify/HttpClient.ts index 64fe12a304..391f485297 100644 --- a/samples/client/petstore/typescript-inversify/HttpClient.ts +++ b/samples/client/petstore/typescript-inversify/HttpClient.ts @@ -1,28 +1,34 @@ import IHttpClient from "./IHttpClient"; + import { Observable } from "rxjs/Observable"; + import "whatwg-fetch"; import HttpResponse from "./HttpResponse"; import {injectable} from "inversify"; -import "rxjs/add/observable/fromPromise"; import { Headers } from "./Headers"; @injectable() class HttpClient implements IHttpClient { get(url:string, headers?: Headers):Observable { - return this.performNetworkCall(url, "get", undefined, headers); + return this.performNetworkCall(url, "GET", undefined, headers); } post(url: string, body: {}|FormData, headers?: Headers): Observable { - return this.performNetworkCall(url, "post", this.getJsonBody(body), this.addJsonHeaders(headers)); + return this.performNetworkCall(url, "POST", this.getJsonBody(body), this.addJsonHeaders(headers)); } put(url: string, body: {}, headers?: Headers): Observable { - return this.performNetworkCall(url, "put", this.getJsonBody(body), this.addJsonHeaders(headers)); + return this.performNetworkCall(url, "PUT", this.getJsonBody(body), this.addJsonHeaders(headers)); } + patch(url: string, body: {}, headers?: Headers): Observable { + return this.performNetworkCall(url, "PATCH", this.getJsonBody(body), this.addJsonHeaders(headers)); + } + + delete(url: string, headers?: Headers): Observable { - return this.performNetworkCall(url, "delete", undefined, headers); + return this.performNetworkCall(url, "DELETE", undefined, headers); } private getJsonBody(body: {}|FormData) { @@ -56,7 +62,8 @@ class HttpClient implements IHttpClient { return httpResponse; }); }); - return Observable.fromPromise(promise); + + return Observable.fromPromise(promise); } } diff --git a/samples/client/petstore/typescript-inversify/IHttpClient.ts b/samples/client/petstore/typescript-inversify/IHttpClient.ts index 22d9e07c90..09f8fff96d 100644 --- a/samples/client/petstore/typescript-inversify/IHttpClient.ts +++ b/samples/client/petstore/typescript-inversify/IHttpClient.ts @@ -6,6 +6,7 @@ interface IHttpClient { get(url:string, headers?: Headers):Observable post(url:string, body:{}|FormData, headers?: Headers):Observable put(url:string, body:{}, headers?: Headers):Observable + patch(url:string, body:{}, headers?: Headers):Observable delete(url:string, headers?: Headers):Observable } diff --git a/samples/client/petstore/typescript-inversify/api/pet.service.ts b/samples/client/petstore/typescript-inversify/api/pet.service.ts index a2fba71e70..06dbd62cdf 100644 --- a/samples/client/petstore/typescript-inversify/api/pet.service.ts +++ b/samples/client/petstore/typescript-inversify/api/pet.service.ts @@ -12,18 +12,18 @@ /* tslint:disable:no-unused-variable member-ordering */ import { Observable } from "rxjs/Observable"; -import 'rxjs/add/operator/map'; -import 'rxjs/add/operator/toPromise'; + +import { map } from "rxjs/operators"; import IHttpClient from "../IHttpClient"; import { inject, injectable } from "inversify"; import { IAPIConfiguration } from "../IAPIConfiguration"; import { Headers } from "../Headers"; import HttpResponse from "../HttpResponse"; -import { ApiResponse } from '../model/apiResponse'; -import { Pet } from '../model/pet'; +import { ApiResponse } from "../model/apiResponse"; +import { Pet } from "../model/pet"; -import { COLLECTION_FORMATS } from '../variables'; +import { COLLECTION_FORMATS } from "../variables"; @@ -62,7 +62,9 @@ export class PetService { const response: Observable> = this.httpClient.post(`${this.basePath}/pet`, body , headers); if (observe == 'body') { - return response.map(httpResponse => (httpResponse.response)); + return response.pipe( + map(httpResponse => (httpResponse.response)) + ); } return response; } @@ -97,7 +99,9 @@ export class PetService { const response: Observable> = this.httpClient.delete(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, headers); if (observe == 'body') { - return response.map(httpResponse => (httpResponse.response)); + return response.pipe( + map(httpResponse => (httpResponse.response)) + ); } return response; } @@ -132,7 +136,9 @@ export class PetService { const response: Observable>> = this.httpClient.get(`${this.basePath}/pet/findByStatus?${queryParameters.join('&')}`, headers); if (observe == 'body') { - return response.map(httpResponse => >(httpResponse.response)); + return response.pipe( + map(httpResponse => >(httpResponse.response)) + ); } return response; } @@ -167,7 +173,9 @@ export class PetService { const response: Observable>> = this.httpClient.get(`${this.basePath}/pet/findByTags?${queryParameters.join('&')}`, headers); if (observe == 'body') { - return response.map(httpResponse => >(httpResponse.response)); + return response.pipe( + map(httpResponse => >(httpResponse.response)) + ); } return response; } @@ -194,7 +202,9 @@ export class PetService { const response: Observable> = this.httpClient.get(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, headers); if (observe == 'body') { - return response.map(httpResponse => (httpResponse.response)); + return response.pipe( + map(httpResponse => (httpResponse.response)) + ); } return response; } @@ -225,7 +235,9 @@ export class PetService { const response: Observable> = this.httpClient.put(`${this.basePath}/pet`, body , headers); if (observe == 'body') { - return response.map(httpResponse => (httpResponse.response)); + return response.pipe( + map(httpResponse => (httpResponse.response)) + ); } return response; } @@ -266,7 +278,9 @@ export class PetService { const response: Observable> = this.httpClient.post(`${this.basePath}/pet/${encodeURIComponent(String(petId))}`, body, headers); if (observe == 'body') { - return response.map(httpResponse => (httpResponse.response)); + return response.pipe( + map(httpResponse => (httpResponse.response)) + ); } return response; } @@ -307,7 +321,9 @@ export class PetService { const response: Observable> = this.httpClient.post(`${this.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, body, headers); if (observe == 'body') { - return response.map(httpResponse => (httpResponse.response)); + return response.pipe( + map(httpResponse => (httpResponse.response)) + ); } return response; } diff --git a/samples/client/petstore/typescript-inversify/api/store.service.ts b/samples/client/petstore/typescript-inversify/api/store.service.ts index 7cfd29fd90..778e00e5c3 100644 --- a/samples/client/petstore/typescript-inversify/api/store.service.ts +++ b/samples/client/petstore/typescript-inversify/api/store.service.ts @@ -12,17 +12,17 @@ /* tslint:disable:no-unused-variable member-ordering */ import { Observable } from "rxjs/Observable"; -import 'rxjs/add/operator/map'; -import 'rxjs/add/operator/toPromise'; + +import { map } from "rxjs/operators"; import IHttpClient from "../IHttpClient"; import { inject, injectable } from "inversify"; import { IAPIConfiguration } from "../IAPIConfiguration"; import { Headers } from "../Headers"; import HttpResponse from "../HttpResponse"; -import { Order } from '../model/order'; +import { Order } from "../model/order"; -import { COLLECTION_FORMATS } from '../variables'; +import { COLLECTION_FORMATS } from "../variables"; @@ -53,7 +53,9 @@ export class StoreService { const response: Observable> = this.httpClient.delete(`${this.basePath}/store/order/${encodeURIComponent(String(orderId))}`, headers); if (observe == 'body') { - return response.map(httpResponse => (httpResponse.response)); + return response.pipe( + map(httpResponse => (httpResponse.response)) + ); } return response; } @@ -75,7 +77,9 @@ export class StoreService { const response: Observable> = this.httpClient.get(`${this.basePath}/store/inventory`, headers); if (observe == 'body') { - return response.map(httpResponse => <{ [key: string]: number; }>(httpResponse.response)); + return response.pipe( + map(httpResponse => <{ [key: string]: number; }>(httpResponse.response)) + ); } return response; } @@ -98,7 +102,9 @@ export class StoreService { const response: Observable> = this.httpClient.get(`${this.basePath}/store/order/${encodeURIComponent(String(orderId))}`, headers); if (observe == 'body') { - return response.map(httpResponse => (httpResponse.response)); + return response.pipe( + map(httpResponse => (httpResponse.response)) + ); } return response; } @@ -122,7 +128,9 @@ export class StoreService { const response: Observable> = this.httpClient.post(`${this.basePath}/store/order`, body , headers); if (observe == 'body') { - return response.map(httpResponse => (httpResponse.response)); + return response.pipe( + map(httpResponse => (httpResponse.response)) + ); } return response; } diff --git a/samples/client/petstore/typescript-inversify/api/user.service.ts b/samples/client/petstore/typescript-inversify/api/user.service.ts index 425177ed82..f2e8b83c4a 100644 --- a/samples/client/petstore/typescript-inversify/api/user.service.ts +++ b/samples/client/petstore/typescript-inversify/api/user.service.ts @@ -12,17 +12,17 @@ /* tslint:disable:no-unused-variable member-ordering */ import { Observable } from "rxjs/Observable"; -import 'rxjs/add/operator/map'; -import 'rxjs/add/operator/toPromise'; + +import { map } from "rxjs/operators"; import IHttpClient from "../IHttpClient"; import { inject, injectable } from "inversify"; import { IAPIConfiguration } from "../IAPIConfiguration"; import { Headers } from "../Headers"; import HttpResponse from "../HttpResponse"; -import { User } from '../model/user'; +import { User } from "../model/user"; -import { COLLECTION_FORMATS } from '../variables'; +import { COLLECTION_FORMATS } from "../variables"; @@ -54,7 +54,9 @@ export class UserService { const response: Observable> = this.httpClient.post(`${this.basePath}/user`, body , headers); if (observe == 'body') { - return response.map(httpResponse => (httpResponse.response)); + return response.pipe( + map(httpResponse => (httpResponse.response)) + ); } return response; } @@ -78,7 +80,9 @@ export class UserService { const response: Observable> = this.httpClient.post(`${this.basePath}/user/createWithArray`, body , headers); if (observe == 'body') { - return response.map(httpResponse => (httpResponse.response)); + return response.pipe( + map(httpResponse => (httpResponse.response)) + ); } return response; } @@ -102,7 +106,9 @@ export class UserService { const response: Observable> = this.httpClient.post(`${this.basePath}/user/createWithList`, body , headers); if (observe == 'body') { - return response.map(httpResponse => (httpResponse.response)); + return response.pipe( + map(httpResponse => (httpResponse.response)) + ); } return response; } @@ -125,7 +131,9 @@ export class UserService { const response: Observable> = this.httpClient.delete(`${this.basePath}/user/${encodeURIComponent(String(username))}`, headers); if (observe == 'body') { - return response.map(httpResponse => (httpResponse.response)); + return response.pipe( + map(httpResponse => (httpResponse.response)) + ); } return response; } @@ -148,7 +156,9 @@ export class UserService { const response: Observable> = this.httpClient.get(`${this.basePath}/user/${encodeURIComponent(String(username))}`, headers); if (observe == 'body') { - return response.map(httpResponse => (httpResponse.response)); + return response.pipe( + map(httpResponse => (httpResponse.response)) + ); } return response; } @@ -184,7 +194,9 @@ export class UserService { const response: Observable> = this.httpClient.get(`${this.basePath}/user/login?${queryParameters.join('&')}`, headers); if (observe == 'body') { - return response.map(httpResponse => (httpResponse.response)); + return response.pipe( + map(httpResponse => (httpResponse.response)) + ); } return response; } @@ -202,7 +214,9 @@ export class UserService { const response: Observable> = this.httpClient.get(`${this.basePath}/user/logout`, headers); if (observe == 'body') { - return response.map(httpResponse => (httpResponse.response)); + return response.pipe( + map(httpResponse => (httpResponse.response)) + ); } return response; } @@ -231,7 +245,9 @@ export class UserService { const response: Observable> = this.httpClient.put(`${this.basePath}/user/${encodeURIComponent(String(username))}`, body , headers); if (observe == 'body') { - return response.map(httpResponse => (httpResponse.response)); + return response.pipe( + map(httpResponse => (httpResponse.response)) + ); } return response; } diff --git a/samples/client/petstore/typescript-inversify/model/inlineObject.ts b/samples/client/petstore/typescript-inversify/model/inlineObject.ts new file mode 100644 index 0000000000..7ebc2ff491 --- /dev/null +++ b/samples/client/petstore/typescript-inversify/model/inlineObject.ts @@ -0,0 +1,23 @@ +/** + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +export interface InlineObject { + /** + * Updated name of the pet + */ + name?: string; + /** + * Updated status of the pet + */ + status?: string; +} diff --git a/samples/client/petstore/typescript-inversify/model/inlineObject1.ts b/samples/client/petstore/typescript-inversify/model/inlineObject1.ts new file mode 100644 index 0000000000..3f35ccedd9 --- /dev/null +++ b/samples/client/petstore/typescript-inversify/model/inlineObject1.ts @@ -0,0 +1,23 @@ +/** + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +export interface InlineObject1 { + /** + * Additional data to pass to server + */ + additionalMetadata?: string; + /** + * file to upload + */ + file?: Blob; +} diff --git a/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/meta-codegen/lib/pom.xml b/samples/meta-codegen/lib/pom.xml index a8b81bb111..f1a26529c8 100644 --- a/samples/meta-codegen/lib/pom.xml +++ b/samples/meta-codegen/lib/pom.xml @@ -121,7 +121,11 @@ UTF-8 +<<<<<<< HEAD 4.1.0-SNAPSHOT +======= + 4.0.2-SNAPSHOT +>>>>>>> origin/master 1.0.0 4.8.1 diff --git a/samples/meta-codegen/usage/.openapi-generator/VERSION b/samples/meta-codegen/usage/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/meta-codegen/usage/.openapi-generator/VERSION +++ b/samples/meta-codegen/usage/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION b/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php index 61aae7c8ca..6500fb4a3a 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php index e139ca407c..c356cb15f8 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php index 1fb7b41302..64390d70b1 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** @@ -2841,7 +2845,7 @@ class FakeApi */ public function testGroupParametersWithHttpInfo($associative_array) { - $request = $this->testGroupParametersRequest($associative_array['required_string_group'], $associative_array['required_boolean_group'], $associative_array['required_int64_group'], $associative_array['string_group'], $associative_array['boolean_group'], $associative_array['int64_group']); + $request = $this->testGroupParametersRequest($associative_array); try { $options = $this->createHttpClientOption(); diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php index 5debe2f84c..6f592e36a5 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php index 4e1d147a0c..118f2eb2f3 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php index 1814d63770..da42515478 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php index 61bd517389..f8889cdc32 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php index b8ec60f9e9..1af0b51146 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ApiException.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php index 752e5c3208..391eda01fb 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Configuration.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php index 4e4091726a..52c22ea059 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php index f3d1b3cace..6b7344d0d7 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php index b5b1b28055..43aba1da96 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php index d438ba4288..a07721ebd8 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php index 29186e6bb5..ef4cd4ca08 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php index aa47c6b47d..92ef71f42e 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php index 32d8792607..b46190f4c7 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php index 3529cefaa1..f6286db004 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php index bba97a6ca7..c50dc123ab 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php index ea9af0e3c3..48717ce58b 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php index 9bcb8e9cd8..ece76d6c6d 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php index 5792577511..5cad59a7f0 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php index 1eea5d0899..6640bbc6b1 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php index 227eb0aaf7..54fec011e1 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php index a70ae53fbc..938e1ea398 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php index 938c787b0e..91be99e0bc 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php index f14dc2bff3..181d7764d9 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php index 0352fc1d9f..fcea3495a2 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php index 85fc4184a0..60b41efb14 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/File.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php index fdad10d436..65c0e19fd3 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php index d139d6e641..ce1609278b 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php index 4cf542fdcf..b0d2565571 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php index ad8c4cac37..b0c83533b7 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php index 5bf520267a..2c56ce0fa1 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php index 1edeb0e020..8ac3aef5a8 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php index 98ef916298..5a13c282d9 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php index b7ec1d59db..9b3091f653 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php index 9a2f14f946..b73ff04fef 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php index ffbb883a0b..4d74b6bbd8 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php index efb8180e1e..2ae1122968 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php index 2eddfee777..288161f846 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php index e039e474d2..715e100063 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php index 624813bf0e..be0b0c47f1 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php index 04199bad53..be94b12329 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php index 68e093dc88..26611c645f 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php index b8925b7ecc..5256d38d74 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php index c20a8d23a2..524dd442b7 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php index 809c9c6243..d3b9cd22bb 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php index 32cc64c466..cf609bb0a1 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php index 79f96d52fd..cb41e21354 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php index 677ccb106f..2656b24ccf 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php index 657654ce9e..75c749625a 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php index f341400c11..0c1f605da4 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php index c5f35dd7fe..ea1d978148 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php index 3d43c34ad3..8f28b9ee4a 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php index 13e4530684..34d08d4d73 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php index b66ccee7cf..7e70821dcd 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php index 6925a9ef15..fbccef8f72 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php index 0ecfe2ff32..0fe44d66ed 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php index 79132e8b0c..30c12617d0 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php index 669360fee5..d811f1f281 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/User.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php index 1dfe2db9f6..a5e751952f 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php index 53ee52ccbc..6166b47a4e 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php index 1bbe5f6457..cdfea77a28 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php index 38d33da552..823c3aaaa7 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php index 3831b1e2df..15e330ba25 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php index bfdcc5d6e8..8549eecd01 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php index 4799a949fa..08cd08c38a 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php index 6c4ec889b2..1389e04ded 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php @@ -17,7 +17,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php index a7c9b44a88..9801359fc6 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php index c534223842..15830e6b1a 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php index 89656b032c..ef544551e8 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php index 1080f7a6b9..87145daa25 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php index 3aac20d534..fcac8540e8 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php index 56c06699e5..17bdbbd08b 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php index d72763b175..9fcb2dba7f 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php index 515164ea4b..1a2e5985c7 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php index 8eaba70e32..96b5187fe1 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php index 1f3c307205..33b1525195 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php index 6ff7e3b413..5a266dc4ab 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php index 86715c7394..111803dbd2 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php index c5d7e6b5a3..d7af86e0fa 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php index 0d504dbd2c..e418514270 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php index 092f5f2a3a..3fb1c3c30c 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php index c5e6c97735..8631e819b2 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php index 07c7239ec8..40c8d53e59 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php index 9224e29fdb..c10be01d4b 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php index ca5a839132..b366c65dc5 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php index a0d49bae6b..1fd49cbf9b 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php index 03dfc42c80..b34d6ac300 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php index 781e9ea05b..6f8cc6d45e 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php index 3568f79ee1..f9446634da 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject1Test.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject1Test.php index ac78be001e..780e2b8d8a 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject1Test.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject1Test.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject2Test.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject2Test.php index 191d616ecd..4f54c7cbbd 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject2Test.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject2Test.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject3Test.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject3Test.php index 8c2ca111f1..28b2e10332 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject3Test.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject3Test.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject4Test.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject4Test.php index 0363810624..868cd68ace 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject4Test.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject4Test.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject5Test.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject5Test.php index 602886f5a6..9fc77b185b 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject5Test.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject5Test.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObjectTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObjectTest.php index 329a88f46d..e1f968ff3e 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObjectTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObjectTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineResponseDefaultTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineResponseDefaultTest.php index bce3085de5..777f35547f 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineResponseDefaultTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineResponseDefaultTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php index 988f84325b..ee02e3c286 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php index e9c0be20db..46343472fe 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php index f1642dde44..b23e6adb91 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php index 09780d92b5..0094fc127c 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php index f434b7022f..594f007c87 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php index 4bb7896b08..7b6357a62d 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NullableClassTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NullableClassTest.php index d6c47a8d48..21afd76851 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NullableClassTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NullableClassTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php index 1dfde7afc1..b7cd833f99 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php index d75e55996a..b3e9359c47 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php index 13a8caae0c..d5c6612332 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php index 739033dc95..2132de9886 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php index 1cb9689868..8b7735f2f0 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php index 139ff211f5..3db3302134 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php index f4dc59e100..eca5ba854f 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php index a0a132187b..9e987a1d80 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php index 2af7be4caf..e0767c886e 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php index 6ecf877b9e..a2fef7b4b9 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php index 56eeb12d85..0134bc3542 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php index 8ba90d5289..c5720784e8 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php @@ -18,7 +18,11 @@ * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech +<<<<<<< HEAD * OpenAPI Generator version: 4.1.0-SNAPSHOT +======= + * OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master */ /** diff --git a/samples/openapi3/client/petstore/python/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/openapi3/client/petstore/python/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/python/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/openapi3/client/petstore/python/docs/AnotherFakeApi.md b/samples/openapi3/client/petstore/python/docs/AnotherFakeApi.md index 836c8c9cd6..754a0529e0 100644 --- a/samples/openapi3/client/petstore/python/docs/AnotherFakeApi.md +++ b/samples/openapi3/client/petstore/python/docs/AnotherFakeApi.md @@ -54,5 +54,10 @@ No authorization required - **Content-Type**: application/json - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/openapi3/client/petstore/python/docs/DefaultApi.md b/samples/openapi3/client/petstore/python/docs/DefaultApi.md index 0102690ac1..e1f8818b40 100644 --- a/samples/openapi3/client/petstore/python/docs/DefaultApi.md +++ b/samples/openapi3/client/petstore/python/docs/DefaultApi.md @@ -47,5 +47,10 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | response | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/openapi3/client/petstore/python/docs/FakeApi.md b/samples/openapi3/client/petstore/python/docs/FakeApi.md index 2a95b367e6..6c317500c8 100644 --- a/samples/openapi3/client/petstore/python/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/python/docs/FakeApi.md @@ -60,6 +60,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | The instance started successfully | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **fake_outer_boolean_serialize** @@ -108,6 +113,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output boolean | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **fake_outer_composite_serialize** @@ -156,6 +166,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output composite | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **fake_outer_number_serialize** @@ -204,6 +219,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output number | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **fake_outer_string_serialize** @@ -252,6 +272,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: */* +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Output string | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_body_with_file_schema** @@ -299,6 +324,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Success | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_body_with_query_params** @@ -346,6 +376,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Success | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_client_model** @@ -395,6 +430,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_endpoint_parameters** @@ -474,6 +514,12 @@ void (empty response body) - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid username supplied | - | +**404** | User not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_enum_parameters** @@ -536,6 +582,12 @@ No authorization required - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid request | - | +**404** | Not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_group_parameters** @@ -598,6 +650,11 @@ void (empty response body) - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Someting wrong | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_inline_additional_properties** @@ -644,6 +701,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **test_json_form_data** @@ -692,5 +754,10 @@ No authorization required - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/openapi3/client/petstore/python/docs/FakeClassnameTags123Api.md b/samples/openapi3/client/petstore/python/docs/FakeClassnameTags123Api.md index 946c438e85..bb9189d492 100644 --- a/samples/openapi3/client/petstore/python/docs/FakeClassnameTags123Api.md +++ b/samples/openapi3/client/petstore/python/docs/FakeClassnameTags123Api.md @@ -60,5 +60,10 @@ Name | Type | Description | Notes - **Content-Type**: application/json - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/openapi3/client/petstore/python/docs/PetApi.md b/samples/openapi3/client/petstore/python/docs/PetApi.md index a089aabc55..1f6f17ddb2 100644 --- a/samples/openapi3/client/petstore/python/docs/PetApi.md +++ b/samples/openapi3/client/petstore/python/docs/PetApi.md @@ -63,6 +63,11 @@ void (empty response body) - **Content-Type**: application/json, application/xml - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**405** | Invalid input | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **delete_pet** @@ -115,6 +120,11 @@ void (empty response body) - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid pet value | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **find_pets_by_status** @@ -168,6 +178,12 @@ Name | Type | Description | Notes - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid status value | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **find_pets_by_tags** @@ -221,6 +237,12 @@ Name | Type | Description | Notes - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid tag value | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **get_pet_by_id** @@ -276,6 +298,13 @@ Name | Type | Description | Notes - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid ID supplied | - | +**404** | Pet not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **update_pet** @@ -326,6 +355,13 @@ void (empty response body) - **Content-Type**: application/json, application/xml - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid ID supplied | - | +**404** | Pet not found | - | +**405** | Validation exception | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **update_pet_with_form** @@ -380,6 +416,11 @@ void (empty response body) - **Content-Type**: application/x-www-form-urlencoded - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**405** | Invalid input | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **upload_file** @@ -435,6 +476,11 @@ Name | Type | Description | Notes - **Content-Type**: multipart/form-data - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **upload_file_with_required_file** @@ -490,5 +536,10 @@ Name | Type | Description | Notes - **Content-Type**: multipart/form-data - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/openapi3/client/petstore/python/docs/StoreApi.md b/samples/openapi3/client/petstore/python/docs/StoreApi.md index f40a25a154..ee56106ba0 100644 --- a/samples/openapi3/client/petstore/python/docs/StoreApi.md +++ b/samples/openapi3/client/petstore/python/docs/StoreApi.md @@ -56,6 +56,12 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid ID supplied | - | +**404** | Order not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **get_inventory** @@ -107,6 +113,11 @@ This endpoint does not need any parameter. - **Content-Type**: Not defined - **Accept**: application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **get_order_by_id** @@ -156,6 +167,13 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid ID supplied | - | +**404** | Order not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **place_order** @@ -203,5 +221,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid Order | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/openapi3/client/petstore/python/docs/UserApi.md b/samples/openapi3/client/petstore/python/docs/UserApi.md index 3741dc40bc..f8a548bd65 100644 --- a/samples/openapi3/client/petstore/python/docs/UserApi.md +++ b/samples/openapi3/client/petstore/python/docs/UserApi.md @@ -60,6 +60,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **create_users_with_array_input** @@ -106,6 +111,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **create_users_with_list_input** @@ -152,6 +162,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **delete_user** @@ -200,6 +215,12 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid username supplied | - | +**404** | User not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **get_user_by_name** @@ -247,6 +268,13 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | +**400** | Invalid username supplied | - | +**404** | User not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **login_user** @@ -296,6 +324,12 @@ No authorization required - **Content-Type**: Not defined - **Accept**: application/xml, application/json +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | * X-Rate-Limit - calls per hour allowed by the user
* X-Expires-After - date in UTC when token expires
| +**400** | Invalid username/password supplied | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **logout_user** @@ -338,6 +372,11 @@ No authorization required - **Content-Type**: Not defined - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**0** | successful operation | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **update_user** @@ -388,5 +427,11 @@ No authorization required - **Content-Type**: application/json - **Accept**: Not defined +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**400** | Invalid user supplied | - | +**404** | User not found | - | + [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/another_fake_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/another_fake_api.py index 2978efbb95..07cf6defd8 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/api/another_fake_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/another_fake_api.py @@ -45,18 +45,21 @@ class AnotherFakeApi(object): >>> thread = api.call_123_test_special_tags(client, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client client: client model (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Client If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.call_123_test_special_tags_with_http_info(client, **kwargs) # noqa: E501 - else: - (data) = self.call_123_test_special_tags_with_http_info(client, **kwargs) # noqa: E501 - return data + return self.call_123_test_special_tags_with_http_info(client, **kwargs) # noqa: E501 def call_123_test_special_tags_with_http_info(self, client, **kwargs): # noqa: E501 """To test special tags # noqa: E501 @@ -67,9 +70,18 @@ class AnotherFakeApi(object): >>> thread = api.call_123_test_special_tags_with_http_info(client, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client client: client model (required) - :return: Client + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Client, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/default_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/default_api.py index 761b735ff1..8add874824 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/api/default_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/default_api.py @@ -44,17 +44,20 @@ class DefaultApi(object): >>> thread = api.foo_get(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: InlineResponseDefault If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.foo_get_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.foo_get_with_http_info(**kwargs) # noqa: E501 - return data + return self.foo_get_with_http_info(**kwargs) # noqa: E501 def foo_get_with_http_info(self, **kwargs): # noqa: E501 """foo_get # noqa: E501 @@ -64,8 +67,17 @@ class DefaultApi(object): >>> thread = api.foo_get_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool - :return: InlineResponseDefault + :param async_req bool: execute request asynchronously + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(InlineResponseDefault, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py index 61ebb8046f..3f95f76d34 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py @@ -44,17 +44,20 @@ class FakeApi(object): >>> thread = api.fake_health_get(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: HealthCheckResult If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.fake_health_get_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.fake_health_get_with_http_info(**kwargs) # noqa: E501 - return data + return self.fake_health_get_with_http_info(**kwargs) # noqa: E501 def fake_health_get_with_http_info(self, **kwargs): # noqa: E501 """Health check endpoint # noqa: E501 @@ -64,8 +67,17 @@ class FakeApi(object): >>> thread = api.fake_health_get_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool - :return: HealthCheckResult + :param async_req bool: execute request asynchronously + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(HealthCheckResult, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -131,18 +143,21 @@ class FakeApi(object): >>> thread = api.fake_outer_boolean_serialize(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param bool body: Input boolean as post body + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: bool If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.fake_outer_boolean_serialize_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.fake_outer_boolean_serialize_with_http_info(**kwargs) # noqa: E501 - return data + return self.fake_outer_boolean_serialize_with_http_info(**kwargs) # noqa: E501 def fake_outer_boolean_serialize_with_http_info(self, **kwargs): # noqa: E501 """fake_outer_boolean_serialize # noqa: E501 @@ -153,9 +168,18 @@ class FakeApi(object): >>> thread = api.fake_outer_boolean_serialize_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param bool body: Input boolean as post body - :return: bool + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(bool, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -227,18 +251,21 @@ class FakeApi(object): >>> thread = api.fake_outer_composite_serialize(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param OuterComposite outer_composite: Input composite as post body + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: OuterComposite If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.fake_outer_composite_serialize_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.fake_outer_composite_serialize_with_http_info(**kwargs) # noqa: E501 - return data + return self.fake_outer_composite_serialize_with_http_info(**kwargs) # noqa: E501 def fake_outer_composite_serialize_with_http_info(self, **kwargs): # noqa: E501 """fake_outer_composite_serialize # noqa: E501 @@ -249,9 +276,18 @@ class FakeApi(object): >>> thread = api.fake_outer_composite_serialize_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param OuterComposite outer_composite: Input composite as post body - :return: OuterComposite + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(OuterComposite, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -323,18 +359,21 @@ class FakeApi(object): >>> thread = api.fake_outer_number_serialize(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param float body: Input number as post body + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: float If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.fake_outer_number_serialize_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.fake_outer_number_serialize_with_http_info(**kwargs) # noqa: E501 - return data + return self.fake_outer_number_serialize_with_http_info(**kwargs) # noqa: E501 def fake_outer_number_serialize_with_http_info(self, **kwargs): # noqa: E501 """fake_outer_number_serialize # noqa: E501 @@ -345,9 +384,18 @@ class FakeApi(object): >>> thread = api.fake_outer_number_serialize_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param float body: Input number as post body - :return: float + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(float, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -419,18 +467,21 @@ class FakeApi(object): >>> thread = api.fake_outer_string_serialize(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str body: Input string as post body + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: str If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.fake_outer_string_serialize_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.fake_outer_string_serialize_with_http_info(**kwargs) # noqa: E501 - return data + return self.fake_outer_string_serialize_with_http_info(**kwargs) # noqa: E501 def fake_outer_string_serialize_with_http_info(self, **kwargs): # noqa: E501 """fake_outer_string_serialize # noqa: E501 @@ -441,9 +492,18 @@ class FakeApi(object): >>> thread = api.fake_outer_string_serialize_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str body: Input string as post body - :return: str + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(str, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -515,18 +575,21 @@ class FakeApi(object): >>> thread = api.test_body_with_file_schema(file_schema_test_class, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param FileSchemaTestClass file_schema_test_class: (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_body_with_file_schema_with_http_info(file_schema_test_class, **kwargs) # noqa: E501 - else: - (data) = self.test_body_with_file_schema_with_http_info(file_schema_test_class, **kwargs) # noqa: E501 - return data + return self.test_body_with_file_schema_with_http_info(file_schema_test_class, **kwargs) # noqa: E501 def test_body_with_file_schema_with_http_info(self, file_schema_test_class, **kwargs): # noqa: E501 """test_body_with_file_schema # noqa: E501 @@ -537,8 +600,17 @@ class FakeApi(object): >>> thread = api.test_body_with_file_schema_with_http_info(file_schema_test_class, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param FileSchemaTestClass file_schema_test_class: (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -610,19 +682,22 @@ class FakeApi(object): >>> thread = api.test_body_with_query_params(query, user, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str query: (required) :param User user: (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_body_with_query_params_with_http_info(query, user, **kwargs) # noqa: E501 - else: - (data) = self.test_body_with_query_params_with_http_info(query, user, **kwargs) # noqa: E501 - return data + return self.test_body_with_query_params_with_http_info(query, user, **kwargs) # noqa: E501 def test_body_with_query_params_with_http_info(self, query, user, **kwargs): # noqa: E501 """test_body_with_query_params # noqa: E501 @@ -632,9 +707,18 @@ class FakeApi(object): >>> thread = api.test_body_with_query_params_with_http_info(query, user, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str query: (required) :param User user: (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -713,18 +797,21 @@ class FakeApi(object): >>> thread = api.test_client_model(client, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client client: client model (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Client If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_client_model_with_http_info(client, **kwargs) # noqa: E501 - else: - (data) = self.test_client_model_with_http_info(client, **kwargs) # noqa: E501 - return data + return self.test_client_model_with_http_info(client, **kwargs) # noqa: E501 def test_client_model_with_http_info(self, client, **kwargs): # noqa: E501 """To test \"client\" model # noqa: E501 @@ -735,9 +822,18 @@ class FakeApi(object): >>> thread = api.test_client_model_with_http_info(client, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client client: client model (required) - :return: Client + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Client, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -813,7 +909,7 @@ class FakeApi(object): >>> thread = api.test_endpoint_parameters(number, double, pattern_without_delimiter, byte, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param float number: None (required) :param float double: None (required) :param str pattern_without_delimiter: None (required) @@ -828,16 +924,19 @@ class FakeApi(object): :param datetime date_time: None :param str password: None :param str param_callback: None + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, **kwargs) # noqa: E501 - else: - (data) = self.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, **kwargs) # noqa: E501 - return data + return self.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, **kwargs) # noqa: E501 def test_endpoint_parameters_with_http_info(self, number, double, pattern_without_delimiter, byte, **kwargs): # noqa: E501 """Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 # noqa: E501 @@ -848,7 +947,7 @@ class FakeApi(object): >>> thread = api.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param float number: None (required) :param float double: None (required) :param str pattern_without_delimiter: None (required) @@ -863,6 +962,15 @@ class FakeApi(object): :param datetime date_time: None :param str password: None :param str param_callback: None + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -1001,7 +1109,7 @@ class FakeApi(object): >>> thread = api.test_enum_parameters(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] enum_header_string_array: Header parameter enum test (string array) :param str enum_header_string: Header parameter enum test (string) :param list[str] enum_query_string_array: Query parameter enum test (string array) @@ -1010,16 +1118,19 @@ class FakeApi(object): :param float enum_query_double: Query parameter enum test (double) :param list[str] enum_form_string_array: Form parameter enum test (string array) :param str enum_form_string: Form parameter enum test (string) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_enum_parameters_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.test_enum_parameters_with_http_info(**kwargs) # noqa: E501 - return data + return self.test_enum_parameters_with_http_info(**kwargs) # noqa: E501 def test_enum_parameters_with_http_info(self, **kwargs): # noqa: E501 """To test enum parameters # noqa: E501 @@ -1030,7 +1141,7 @@ class FakeApi(object): >>> thread = api.test_enum_parameters_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] enum_header_string_array: Header parameter enum test (string array) :param str enum_header_string: Header parameter enum test (string) :param list[str] enum_query_string_array: Query parameter enum test (string array) @@ -1039,6 +1150,15 @@ class FakeApi(object): :param float enum_query_double: Query parameter enum test (double) :param list[str] enum_form_string_array: Form parameter enum test (string array) :param str enum_form_string: Form parameter enum test (string) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -1124,23 +1244,26 @@ class FakeApi(object): >>> thread = api.test_group_parameters(required_string_group, required_boolean_group, required_int64_group, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int required_string_group: Required String in group parameters (required) :param bool required_boolean_group: Required Boolean in group parameters (required) :param int required_int64_group: Required Integer in group parameters (required) :param int string_group: String in group parameters :param bool boolean_group: Boolean in group parameters :param int int64_group: Integer in group parameters + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, **kwargs) # noqa: E501 - else: - (data) = self.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, **kwargs) # noqa: E501 - return data + return self.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, **kwargs) # noqa: E501 def test_group_parameters_with_http_info(self, required_string_group, required_boolean_group, required_int64_group, **kwargs): # noqa: E501 """Fake endpoint to test group parameters (optional) # noqa: E501 @@ -1151,13 +1274,22 @@ class FakeApi(object): >>> thread = api.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int required_string_group: Required String in group parameters (required) :param bool required_boolean_group: Required Boolean in group parameters (required) :param int required_int64_group: Required Integer in group parameters (required) :param int string_group: String in group parameters :param bool boolean_group: Boolean in group parameters :param int int64_group: Integer in group parameters + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -1243,18 +1375,21 @@ class FakeApi(object): >>> thread = api.test_inline_additional_properties(request_body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param dict(str, str) request_body: request body (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_inline_additional_properties_with_http_info(request_body, **kwargs) # noqa: E501 - else: - (data) = self.test_inline_additional_properties_with_http_info(request_body, **kwargs) # noqa: E501 - return data + return self.test_inline_additional_properties_with_http_info(request_body, **kwargs) # noqa: E501 def test_inline_additional_properties_with_http_info(self, request_body, **kwargs): # noqa: E501 """test inline additionalProperties # noqa: E501 @@ -1264,8 +1399,17 @@ class FakeApi(object): >>> thread = api.test_inline_additional_properties_with_http_info(request_body, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param dict(str, str) request_body: request body (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -1337,19 +1481,22 @@ class FakeApi(object): >>> thread = api.test_json_form_data(param, param2, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str param: field1 (required) :param str param2: field2 (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_json_form_data_with_http_info(param, param2, **kwargs) # noqa: E501 - else: - (data) = self.test_json_form_data_with_http_info(param, param2, **kwargs) # noqa: E501 - return data + return self.test_json_form_data_with_http_info(param, param2, **kwargs) # noqa: E501 def test_json_form_data_with_http_info(self, param, param2, **kwargs): # noqa: E501 """test json serialization of form data # noqa: E501 @@ -1359,9 +1506,18 @@ class FakeApi(object): >>> thread = api.test_json_form_data_with_http_info(param, param2, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str param: field1 (required) :param str param2: field2 (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py index bbfe983ef5..8446a6d399 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py @@ -45,18 +45,21 @@ class FakeClassnameTags123Api(object): >>> thread = api.test_classname(client, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client client: client model (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Client If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.test_classname_with_http_info(client, **kwargs) # noqa: E501 - else: - (data) = self.test_classname_with_http_info(client, **kwargs) # noqa: E501 - return data + return self.test_classname_with_http_info(client, **kwargs) # noqa: E501 def test_classname_with_http_info(self, client, **kwargs): # noqa: E501 """To test class name in snake case # noqa: E501 @@ -67,9 +70,18 @@ class FakeClassnameTags123Api(object): >>> thread = api.test_classname_with_http_info(client, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Client client: client model (required) - :return: Client + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Client, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py index 77cc4dac86..60987d9715 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py @@ -44,18 +44,21 @@ class PetApi(object): >>> thread = api.add_pet(pet, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Pet pet: Pet object that needs to be added to the store (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.add_pet_with_http_info(pet, **kwargs) # noqa: E501 - else: - (data) = self.add_pet_with_http_info(pet, **kwargs) # noqa: E501 - return data + return self.add_pet_with_http_info(pet, **kwargs) # noqa: E501 def add_pet_with_http_info(self, pet, **kwargs): # noqa: E501 """Add a new pet to the store # noqa: E501 @@ -65,8 +68,17 @@ class PetApi(object): >>> thread = api.add_pet_with_http_info(pet, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Pet pet: Pet object that needs to be added to the store (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -145,19 +157,22 @@ class PetApi(object): >>> thread = api.delete_pet(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: Pet id to delete (required) :param str api_key: + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.delete_pet_with_http_info(pet_id, **kwargs) # noqa: E501 - else: - (data) = self.delete_pet_with_http_info(pet_id, **kwargs) # noqa: E501 - return data + return self.delete_pet_with_http_info(pet_id, **kwargs) # noqa: E501 def delete_pet_with_http_info(self, pet_id, **kwargs): # noqa: E501 """Deletes a pet # noqa: E501 @@ -167,9 +182,18 @@ class PetApi(object): >>> thread = api.delete_pet_with_http_info(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: Pet id to delete (required) :param str api_key: + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -240,18 +264,21 @@ class PetApi(object): >>> thread = api.find_pets_by_status(status, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] status: Status values that need to be considered for filter (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: list[Pet] If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.find_pets_by_status_with_http_info(status, **kwargs) # noqa: E501 - else: - (data) = self.find_pets_by_status_with_http_info(status, **kwargs) # noqa: E501 - return data + return self.find_pets_by_status_with_http_info(status, **kwargs) # noqa: E501 def find_pets_by_status_with_http_info(self, status, **kwargs): # noqa: E501 """Finds Pets by status # noqa: E501 @@ -262,9 +289,18 @@ class PetApi(object): >>> thread = api.find_pets_by_status_with_http_info(status, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] status: Status values that need to be considered for filter (required) - :return: list[Pet] + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -337,18 +373,21 @@ class PetApi(object): >>> thread = api.find_pets_by_tags(tags, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] tags: Tags to filter by (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: list[Pet] If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.find_pets_by_tags_with_http_info(tags, **kwargs) # noqa: E501 - else: - (data) = self.find_pets_by_tags_with_http_info(tags, **kwargs) # noqa: E501 - return data + return self.find_pets_by_tags_with_http_info(tags, **kwargs) # noqa: E501 def find_pets_by_tags_with_http_info(self, tags, **kwargs): # noqa: E501 """Finds Pets by tags # noqa: E501 @@ -359,9 +398,18 @@ class PetApi(object): >>> thread = api.find_pets_by_tags_with_http_info(tags, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[str] tags: Tags to filter by (required) - :return: list[Pet] + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -434,18 +482,21 @@ class PetApi(object): >>> thread = api.get_pet_by_id(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to return (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Pet If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.get_pet_by_id_with_http_info(pet_id, **kwargs) # noqa: E501 - else: - (data) = self.get_pet_by_id_with_http_info(pet_id, **kwargs) # noqa: E501 - return data + return self.get_pet_by_id_with_http_info(pet_id, **kwargs) # noqa: E501 def get_pet_by_id_with_http_info(self, pet_id, **kwargs): # noqa: E501 """Find pet by ID # noqa: E501 @@ -456,9 +507,18 @@ class PetApi(object): >>> thread = api.get_pet_by_id_with_http_info(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to return (required) - :return: Pet + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Pet, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -529,18 +589,21 @@ class PetApi(object): >>> thread = api.update_pet(pet, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Pet pet: Pet object that needs to be added to the store (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.update_pet_with_http_info(pet, **kwargs) # noqa: E501 - else: - (data) = self.update_pet_with_http_info(pet, **kwargs) # noqa: E501 - return data + return self.update_pet_with_http_info(pet, **kwargs) # noqa: E501 def update_pet_with_http_info(self, pet, **kwargs): # noqa: E501 """Update an existing pet # noqa: E501 @@ -550,8 +613,17 @@ class PetApi(object): >>> thread = api.update_pet_with_http_info(pet, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Pet pet: Pet object that needs to be added to the store (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -630,20 +702,23 @@ class PetApi(object): >>> thread = api.update_pet_with_form(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet that needs to be updated (required) :param str name: Updated name of the pet :param str status: Updated status of the pet + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.update_pet_with_form_with_http_info(pet_id, **kwargs) # noqa: E501 - else: - (data) = self.update_pet_with_form_with_http_info(pet_id, **kwargs) # noqa: E501 - return data + return self.update_pet_with_form_with_http_info(pet_id, **kwargs) # noqa: E501 def update_pet_with_form_with_http_info(self, pet_id, **kwargs): # noqa: E501 """Updates a pet in the store with form data # noqa: E501 @@ -653,10 +728,19 @@ class PetApi(object): >>> thread = api.update_pet_with_form_with_http_info(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet that needs to be updated (required) :param str name: Updated name of the pet :param str status: Updated status of the pet + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -732,20 +816,23 @@ class PetApi(object): >>> thread = api.upload_file(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to update (required) :param str additional_metadata: Additional data to pass to server :param file file: file to upload + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: ApiResponse If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.upload_file_with_http_info(pet_id, **kwargs) # noqa: E501 - else: - (data) = self.upload_file_with_http_info(pet_id, **kwargs) # noqa: E501 - return data + return self.upload_file_with_http_info(pet_id, **kwargs) # noqa: E501 def upload_file_with_http_info(self, pet_id, **kwargs): # noqa: E501 """uploads an image # noqa: E501 @@ -755,11 +842,20 @@ class PetApi(object): >>> thread = api.upload_file_with_http_info(pet_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to update (required) :param str additional_metadata: Additional data to pass to server :param file file: file to upload - :return: ApiResponse + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -838,20 +934,23 @@ class PetApi(object): >>> thread = api.upload_file_with_required_file(pet_id, required_file, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to update (required) :param file required_file: file to upload (required) :param str additional_metadata: Additional data to pass to server + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: ApiResponse If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.upload_file_with_required_file_with_http_info(pet_id, required_file, **kwargs) # noqa: E501 - else: - (data) = self.upload_file_with_required_file_with_http_info(pet_id, required_file, **kwargs) # noqa: E501 - return data + return self.upload_file_with_required_file_with_http_info(pet_id, required_file, **kwargs) # noqa: E501 def upload_file_with_required_file_with_http_info(self, pet_id, required_file, **kwargs): # noqa: E501 """uploads an image (required) # noqa: E501 @@ -861,11 +960,20 @@ class PetApi(object): >>> thread = api.upload_file_with_required_file_with_http_info(pet_id, required_file, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int pet_id: ID of pet to update (required) :param file required_file: file to upload (required) :param str additional_metadata: Additional data to pass to server - :return: ApiResponse + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/store_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/store_api.py index 8df1ff4745..944ea66190 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/api/store_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/store_api.py @@ -45,18 +45,21 @@ class StoreApi(object): >>> thread = api.delete_order(order_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str order_id: ID of the order that needs to be deleted (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.delete_order_with_http_info(order_id, **kwargs) # noqa: E501 - else: - (data) = self.delete_order_with_http_info(order_id, **kwargs) # noqa: E501 - return data + return self.delete_order_with_http_info(order_id, **kwargs) # noqa: E501 def delete_order_with_http_info(self, order_id, **kwargs): # noqa: E501 """Delete purchase order by ID # noqa: E501 @@ -67,8 +70,17 @@ class StoreApi(object): >>> thread = api.delete_order_with_http_info(order_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str order_id: ID of the order that needs to be deleted (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -137,17 +149,20 @@ class StoreApi(object): >>> thread = api.get_inventory(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: dict(str, int) If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.get_inventory_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.get_inventory_with_http_info(**kwargs) # noqa: E501 - return data + return self.get_inventory_with_http_info(**kwargs) # noqa: E501 def get_inventory_with_http_info(self, **kwargs): # noqa: E501 """Returns pet inventories by status # noqa: E501 @@ -158,8 +173,17 @@ class StoreApi(object): >>> thread = api.get_inventory_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool - :return: dict(str, int) + :param async_req bool: execute request asynchronously + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(dict(str, int), status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -225,18 +249,21 @@ class StoreApi(object): >>> thread = api.get_order_by_id(order_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int order_id: ID of pet that needs to be fetched (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Order If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.get_order_by_id_with_http_info(order_id, **kwargs) # noqa: E501 - else: - (data) = self.get_order_by_id_with_http_info(order_id, **kwargs) # noqa: E501 - return data + return self.get_order_by_id_with_http_info(order_id, **kwargs) # noqa: E501 def get_order_by_id_with_http_info(self, order_id, **kwargs): # noqa: E501 """Find purchase order by ID # noqa: E501 @@ -247,9 +274,18 @@ class StoreApi(object): >>> thread = api.get_order_by_id_with_http_info(order_id, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param int order_id: ID of pet that needs to be fetched (required) - :return: Order + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Order, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -324,18 +360,21 @@ class StoreApi(object): >>> thread = api.place_order(order, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Order order: order placed for purchasing the pet (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: Order If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.place_order_with_http_info(order, **kwargs) # noqa: E501 - else: - (data) = self.place_order_with_http_info(order, **kwargs) # noqa: E501 - return data + return self.place_order_with_http_info(order, **kwargs) # noqa: E501 def place_order_with_http_info(self, order, **kwargs): # noqa: E501 """Place an order for a pet # noqa: E501 @@ -345,9 +384,18 @@ class StoreApi(object): >>> thread = api.place_order_with_http_info(order, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param Order order: order placed for purchasing the pet (required) - :return: Order + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(Order, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/user_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/user_api.py index daa4166b61..5e8125477f 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/api/user_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/user_api.py @@ -45,18 +45,21 @@ class UserApi(object): >>> thread = api.create_user(user, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param User user: Created user object (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.create_user_with_http_info(user, **kwargs) # noqa: E501 - else: - (data) = self.create_user_with_http_info(user, **kwargs) # noqa: E501 - return data + return self.create_user_with_http_info(user, **kwargs) # noqa: E501 def create_user_with_http_info(self, user, **kwargs): # noqa: E501 """Create user # noqa: E501 @@ -67,8 +70,17 @@ class UserApi(object): >>> thread = api.create_user_with_http_info(user, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param User user: Created user object (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -140,18 +152,21 @@ class UserApi(object): >>> thread = api.create_users_with_array_input(user, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[User] user: List of user object (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.create_users_with_array_input_with_http_info(user, **kwargs) # noqa: E501 - else: - (data) = self.create_users_with_array_input_with_http_info(user, **kwargs) # noqa: E501 - return data + return self.create_users_with_array_input_with_http_info(user, **kwargs) # noqa: E501 def create_users_with_array_input_with_http_info(self, user, **kwargs): # noqa: E501 """Creates list of users with given input array # noqa: E501 @@ -161,8 +176,17 @@ class UserApi(object): >>> thread = api.create_users_with_array_input_with_http_info(user, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[User] user: List of user object (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -234,18 +258,21 @@ class UserApi(object): >>> thread = api.create_users_with_list_input(user, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[User] user: List of user object (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.create_users_with_list_input_with_http_info(user, **kwargs) # noqa: E501 - else: - (data) = self.create_users_with_list_input_with_http_info(user, **kwargs) # noqa: E501 - return data + return self.create_users_with_list_input_with_http_info(user, **kwargs) # noqa: E501 def create_users_with_list_input_with_http_info(self, user, **kwargs): # noqa: E501 """Creates list of users with given input array # noqa: E501 @@ -255,8 +282,17 @@ class UserApi(object): >>> thread = api.create_users_with_list_input_with_http_info(user, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param list[User] user: List of user object (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -329,18 +365,21 @@ class UserApi(object): >>> thread = api.delete_user(username, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The name that needs to be deleted (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.delete_user_with_http_info(username, **kwargs) # noqa: E501 - else: - (data) = self.delete_user_with_http_info(username, **kwargs) # noqa: E501 - return data + return self.delete_user_with_http_info(username, **kwargs) # noqa: E501 def delete_user_with_http_info(self, username, **kwargs): # noqa: E501 """Delete user # noqa: E501 @@ -351,8 +390,17 @@ class UserApi(object): >>> thread = api.delete_user_with_http_info(username, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The name that needs to be deleted (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -420,18 +468,21 @@ class UserApi(object): >>> thread = api.get_user_by_name(username, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The name that needs to be fetched. Use user1 for testing. (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: User If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.get_user_by_name_with_http_info(username, **kwargs) # noqa: E501 - else: - (data) = self.get_user_by_name_with_http_info(username, **kwargs) # noqa: E501 - return data + return self.get_user_by_name_with_http_info(username, **kwargs) # noqa: E501 def get_user_by_name_with_http_info(self, username, **kwargs): # noqa: E501 """Get user by user name # noqa: E501 @@ -441,9 +492,18 @@ class UserApi(object): >>> thread = api.get_user_by_name_with_http_info(username, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The name that needs to be fetched. Use user1 for testing. (required) - :return: User + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(User, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -514,19 +574,22 @@ class UserApi(object): >>> thread = api.login_user(username, password, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The user name for login (required) :param str password: The password for login in clear text (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: str If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.login_user_with_http_info(username, password, **kwargs) # noqa: E501 - else: - (data) = self.login_user_with_http_info(username, password, **kwargs) # noqa: E501 - return data + return self.login_user_with_http_info(username, password, **kwargs) # noqa: E501 def login_user_with_http_info(self, username, password, **kwargs): # noqa: E501 """Logs user into the system # noqa: E501 @@ -536,10 +599,19 @@ class UserApi(object): >>> thread = api.login_user_with_http_info(username, password, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: The user name for login (required) :param str password: The password for login in clear text (required) - :return: str + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. + :return: tuple(str, status_code(int), headers(HTTPHeaderDict)) If the method is called asynchronously, returns the request thread. """ @@ -616,17 +688,20 @@ class UserApi(object): >>> thread = api.logout_user(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.logout_user_with_http_info(**kwargs) # noqa: E501 - else: - (data) = self.logout_user_with_http_info(**kwargs) # noqa: E501 - return data + return self.logout_user_with_http_info(**kwargs) # noqa: E501 def logout_user_with_http_info(self, **kwargs): # noqa: E501 """Logs out current logged in user session # noqa: E501 @@ -636,7 +711,16 @@ class UserApi(object): >>> thread = api.logout_user_with_http_info(async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. @@ -699,19 +783,22 @@ class UserApi(object): >>> thread = api.update_user(username, user, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: name that need to be deleted (required) :param User user: Updated user object (required) + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True - if kwargs.get('async_req'): - return self.update_user_with_http_info(username, user, **kwargs) # noqa: E501 - else: - (data) = self.update_user_with_http_info(username, user, **kwargs) # noqa: E501 - return data + return self.update_user_with_http_info(username, user, **kwargs) # noqa: E501 def update_user_with_http_info(self, username, user, **kwargs): # noqa: E501 """Updated user # noqa: E501 @@ -722,9 +809,18 @@ class UserApi(object): >>> thread = api.update_user_with_http_info(username, user, async_req=True) >>> result = thread.get() - :param async_req bool + :param async_req bool: execute request asynchronously :param str username: name that need to be deleted (required) :param User user: Updated user object (required) + :param _return_http_data_only: response data without head status code + and headers + :param _preload_content: if False, the urllib3.HTTPResponse object will + be returned without reading/decoding response + data. Default is True. + :param _request_timeout: timeout setting for this request. If one + number provided, it will be total request + timeout. It can also be a pair (tuple) of + (connection, read) timeouts. :return: None If the method is called asynchronously, returns the request thread. diff --git a/samples/openapi3/client/petstore/python/petstore_api/configuration.py b/samples/openapi3/client/petstore/python/petstore_api/configuration.py index cac2cebb5b..e4395af66d 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/configuration.py +++ b/samples/openapi3/client/petstore/python/petstore_api/configuration.py @@ -27,9 +27,9 @@ class TypeWithDefault(type): super(TypeWithDefault, cls).__init__(name, bases, dct) cls._default = None - def __call__(cls): + def __call__(cls, **kwargs): if cls._default is None: - cls._default = type.__call__(cls) + cls._default = type.__call__(cls, **kwargs) return copy.copy(cls._default) def set_default(cls, default): @@ -41,69 +41,100 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)): Ref: https://openapi-generator.tech Do not edit the class manually. + + :param host: Base url + :param api_key: Dict to store API key(s) + :param api_key_prefix: Dict to store API prefix (e.g. Bearer) + :param username: Username for HTTP basic authentication + :param password: Password for HTTP basic authentication """ - def __init__(self): - """Constructor""" - # Default Base url - self.host = "http://petstore.swagger.io:80/v2" - # Temp file folder for downloading files + def __init__(self, host="http://petstore.swagger.io:80/v2", + api_key={}, api_key_prefix={}, + username="", password=""): + """Constructor + """ + self.host = host + """Default Base url + """ self.temp_folder_path = None - + """Temp file folder for downloading files + """ # Authentication Settings - # dict to store API key(s) - self.api_key = {} - # dict to store API prefix (e.g. Bearer) - self.api_key_prefix = {} - # Username for HTTP basic authentication - self.username = "" - # Password for HTTP basic authentication - self.password = "" - # access token for OAuth/Bearer + self.api_key = api_key + """dict to store API key(s) + """ + self.api_key_prefix = api_key_prefix + """dict to store API prefix (e.g. Bearer) + """ + self.username = username + """Username for HTTP basic authentication + """ + self.password = password + """Password for HTTP basic authentication + """ self.access_token = "" - # Logging Settings + """access token for OAuth/Bearer + """ self.logger = {} + """Logging Settings + """ self.logger["package_logger"] = logging.getLogger("petstore_api") self.logger["urllib3_logger"] = logging.getLogger("urllib3") - # Log format self.logger_format = '%(asctime)s %(levelname)s %(message)s' - # Log stream handler + """Log format + """ self.logger_stream_handler = None - # Log file handler + """Log stream handler + """ self.logger_file_handler = None - # Debug file location + """Log file handler + """ self.logger_file = None - # Debug switch + """Debug file location + """ self.debug = False + """Debug switch + """ - # SSL/TLS verification - # Set this to false to skip verifying SSL certificate when calling API - # from https server. self.verify_ssl = True - # Set this to customize the certificate file to verify the peer. + """SSL/TLS verification + Set this to false to skip verifying SSL certificate when calling API + from https server. + """ self.ssl_ca_cert = None - # client certificate file + """Set this to customize the certificate file to verify the peer. + """ self.cert_file = None - # client key file + """client certificate file + """ self.key_file = None - # Set this to True/False to enable/disable SSL hostname verification. + """client key file + """ self.assert_hostname = None + """Set this to True/False to enable/disable SSL hostname verification. + """ - # urllib3 connection pool's maximum number of connections saved - # per pool. urllib3 uses 1 connection as default value, but this is - # not the best value when you are making a lot of possibly parallel - # requests to the same host, which is often the case here. - # cpu_count * 5 is used as default value to increase performance. self.connection_pool_maxsize = multiprocessing.cpu_count() * 5 + """urllib3 connection pool's maximum number of connections saved + per pool. urllib3 uses 1 connection as default value, but this is + not the best value when you are making a lot of possibly parallel + requests to the same host, which is often the case here. + cpu_count * 5 is used as default value to increase performance. + """ - # Proxy URL self.proxy = None - # Proxy headers + """Proxy URL + """ self.proxy_headers = None - # Safe chars for path_param + """Proxy headers + """ self.safe_chars_for_path_param = '' - # Adding retries to override urllib3 default value 3 + """Safe chars for path_param + """ self.retries = None + """Adding retries to override urllib3 default value 3 + """ @property def logger_file(self): diff --git a/samples/openapi3/client/petstore/ruby/.openapi-generator/VERSION b/samples/openapi3/client/petstore/ruby/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/openapi3/client/petstore/ruby/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/ruby/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore.rb b/samples/openapi3/client/petstore/ruby/lib/petstore.rb index 822ea45c06..63b5718e94 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api/another_fake_api.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api/another_fake_api.rb index 66be9a93e6..c8252e85a9 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/api/another_fake_api.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api/another_fake_api.rb @@ -6,11 +6,16 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end require 'uri' +require 'cgi' module Petstore class AnotherFakeApi diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api/default_api.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api/default_api.rb index f26bfd0d7b..7cdf46d722 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/api/default_api.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api/default_api.rb @@ -6,11 +6,16 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end require 'uri' +require 'cgi' module Petstore class DefaultApi diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb index e2466046ea..5d46de88b2 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_api.rb @@ -6,11 +6,16 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end require 'uri' +require 'cgi' module Petstore class FakeApi diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb index 5d33dae0ef..fc0bc98804 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb @@ -6,11 +6,16 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end require 'uri' +require 'cgi' module Petstore class FakeClassnameTags123Api diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api/pet_api.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api/pet_api.rb index fda5cbb75c..93fdbdfcb8 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/api/pet_api.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api/pet_api.rb @@ -6,11 +6,16 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end require 'uri' +require 'cgi' module Petstore class PetApi @@ -103,7 +108,7 @@ module Petstore fail ArgumentError, "Missing the required parameter 'pet_id' when calling PetApi.delete_pet" end # resource path - local_var_path = '/pet/{petId}'.sub('{' + 'petId' + '}', pet_id.to_s) + local_var_path = '/pet/{petId}'.sub('{' + 'petId' + '}', CGI.escape(pet_id.to_s)) # query parameters query_params = opts[:query_params] || {} @@ -290,7 +295,7 @@ module Petstore fail ArgumentError, "Missing the required parameter 'pet_id' when calling PetApi.get_pet_by_id" end # resource path - local_var_path = '/pet/{petId}'.sub('{' + 'petId' + '}', pet_id.to_s) + local_var_path = '/pet/{petId}'.sub('{' + 'petId' + '}', CGI.escape(pet_id.to_s)) # query parameters query_params = opts[:query_params] || {} @@ -414,7 +419,7 @@ module Petstore fail ArgumentError, "Missing the required parameter 'pet_id' when calling PetApi.update_pet_with_form" end # resource path - local_var_path = '/pet/{petId}'.sub('{' + 'petId' + '}', pet_id.to_s) + local_var_path = '/pet/{petId}'.sub('{' + 'petId' + '}', CGI.escape(pet_id.to_s)) # query parameters query_params = opts[:query_params] || {} @@ -480,7 +485,7 @@ module Petstore fail ArgumentError, "Missing the required parameter 'pet_id' when calling PetApi.upload_file" end # resource path - local_var_path = '/pet/{petId}/uploadImage'.sub('{' + 'petId' + '}', pet_id.to_s) + local_var_path = '/pet/{petId}/uploadImage'.sub('{' + 'petId' + '}', CGI.escape(pet_id.to_s)) # query parameters query_params = opts[:query_params] || {} @@ -552,7 +557,7 @@ module Petstore fail ArgumentError, "Missing the required parameter 'required_file' when calling PetApi.upload_file_with_required_file" end # resource path - local_var_path = '/fake/{petId}/uploadImageWithRequiredFile'.sub('{' + 'petId' + '}', pet_id.to_s) + local_var_path = '/fake/{petId}/uploadImageWithRequiredFile'.sub('{' + 'petId' + '}', CGI.escape(pet_id.to_s)) # query parameters query_params = opts[:query_params] || {} diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api/store_api.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api/store_api.rb index 4cfd89f819..c3d6c2a028 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/api/store_api.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api/store_api.rb @@ -6,11 +6,16 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end require 'uri' +require 'cgi' module Petstore class StoreApi @@ -43,7 +48,7 @@ module Petstore fail ArgumentError, "Missing the required parameter 'order_id' when calling StoreApi.delete_order" end # resource path - local_var_path = '/store/order/{order_id}'.sub('{' + 'order_id' + '}', order_id.to_s) + local_var_path = '/store/order/{order_id}'.sub('{' + 'order_id' + '}', CGI.escape(order_id.to_s)) # query parameters query_params = opts[:query_params] || {} @@ -167,7 +172,7 @@ module Petstore end # resource path - local_var_path = '/store/order/{order_id}'.sub('{' + 'order_id' + '}', order_id.to_s) + local_var_path = '/store/order/{order_id}'.sub('{' + 'order_id' + '}', CGI.escape(order_id.to_s)) # query parameters query_params = opts[:query_params] || {} diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api/user_api.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api/user_api.rb index 7a0a00a205..cecde15f0e 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/api/user_api.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api/user_api.rb @@ -6,11 +6,16 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end require 'uri' +require 'cgi' module Petstore class UserApi @@ -225,7 +230,7 @@ module Petstore fail ArgumentError, "Missing the required parameter 'username' when calling UserApi.delete_user" end # resource path - local_var_path = '/user/{username}'.sub('{' + 'username' + '}', username.to_s) + local_var_path = '/user/{username}'.sub('{' + 'username' + '}', CGI.escape(username.to_s)) # query parameters query_params = opts[:query_params] || {} @@ -283,7 +288,7 @@ module Petstore fail ArgumentError, "Missing the required parameter 'username' when calling UserApi.get_user_by_name" end # resource path - local_var_path = '/user/{username}'.sub('{' + 'username' + '}', username.to_s) + local_var_path = '/user/{username}'.sub('{' + 'username' + '}', CGI.escape(username.to_s)) # query parameters query_params = opts[:query_params] || {} @@ -471,7 +476,7 @@ module Petstore fail ArgumentError, "Missing the required parameter 'user' when calling UserApi.update_user" end # resource path - local_var_path = '/user/{username}'.sub('{' + 'username' + '}', username.to_s) + local_var_path = '/user/{username}'.sub('{' + 'username' + '}', CGI.escape(username.to_s)) # query parameters query_params = opts[:query_params] || {} diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api_client.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api_client.rb index 21197e84b3..be77c47b3b 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/api_client.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api_client.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/api_error.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/api_error.rb index 9eab46a89b..e382771ee2 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/api_error.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/api_error.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/configuration.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/configuration.rb index 0d9aad384b..27c3b7279a 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/configuration.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/configuration.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb index a4b791a17f..ab2417a443 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/animal.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/animal.rb index 396199ca41..6eb2bc0b3d 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/animal.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/animal.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/api_response.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/api_response.rb index 998250d20a..60f0120e03 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/api_response.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/api_response.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb index 99aa9482fa..29774b89d8 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb index e7da1699d4..3765b7d4a5 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_test.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_test.rb index 121bff2f02..9821695c69 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_test.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/array_test.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/capitalization.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/capitalization.rb index 02567bdfd4..225e4f646e 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/capitalization.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/capitalization.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat.rb index 51ab33355e..c2c86019bd 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat_all_of.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat_all_of.rb index a971e6f556..3f3802dd87 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat_all_of.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/cat_all_of.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/category.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/category.rb index 344ca69065..42ac5c8b31 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/category.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/category.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/class_model.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/class_model.rb index 01b2b965d6..118553a01e 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/class_model.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/class_model.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/client.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/client.rb index 830ab1d0f0..9903a3b000 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/client.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/client.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog.rb index 07c31216bc..f6f5ef33ce 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog_all_of.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog_all_of.rb index 18cf619772..783e7c0754 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog_all_of.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/dog_all_of.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_arrays.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_arrays.rb index 1f12cb43b9..46294ae347 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_arrays.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_arrays.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_class.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_class.rb index 406b0dccc9..8ee977570d 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_class.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_class.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_test.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_test.rb index 6db05c48aa..58bc59f459 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_test.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/enum_test.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/file.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/file.rb index 459e4deba8..da7179faed 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/file.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/file.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb index c01bb104a3..9d6d2b6e7d 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/foo.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/foo.rb index 0546ad9269..831b26219e 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/foo.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/foo.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/format_test.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/format_test.rb index 010a1d0efa..b4c8c091de 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/format_test.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/format_test.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb index 6d24ac174c..8cbc21dc8a 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/health_check_result.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/health_check_result.rb index 7d31c85a1d..41c348efa1 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/health_check_result.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/health_check_result.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_response_default.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_response_default.rb index fa811479dc..a537ed4f34 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_response_default.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/inline_response_default.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/list.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/list.rb index ab8318101b..6b3bb37d18 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/list.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/list.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/map_test.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/map_test.rb index 68509874a7..61d2eca931 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/map_test.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/map_test.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb index f82bdde772..be2f222448 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/model200_response.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/model200_response.rb index d87939a4b8..8dad3cbc99 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/model200_response.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/model200_response.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/model_return.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/model_return.rb index 32b75d1f08..ec1867c040 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/model_return.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/model_return.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/name.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/name.rb index 665fc35276..6c6098da26 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/name.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/name.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/nullable_class.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/nullable_class.rb index eab0edde20..3607b10e29 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/nullable_class.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/nullable_class.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/number_only.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/number_only.rb index 8b6da24af4..868b01f0e4 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/number_only.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/number_only.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/order.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/order.rb index bcfc925dbf..06a30ca375 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/order.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/order.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_composite.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_composite.rb index 1cfbf6659a..531535313d 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_composite.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_composite.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum.rb index c7d622d970..b93f5dd6b5 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb index 38e51df938..3964098774 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb index 70788d1e87..0b8205964e 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb index 0d074b8b9f..1a55588390 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/pet.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/pet.rb index 20a476bbe9..f8787f3889 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/pet.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/pet.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/read_only_first.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/read_only_first.rb index 012f382be7..5329f653d7 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/read_only_first.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/read_only_first.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/special_model_name.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/special_model_name.rb index b2bc0dc84a..0eb75eb749 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/special_model_name.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/special_model_name.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/tag.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/tag.rb index 6d79193b09..8db4775582 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/tag.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/tag.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/user.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/user.rb index 5b97445cc1..89afffa96b 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/models/user.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/user.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/version.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/version.rb index 2964544583..04c6d8d3a5 100644 --- a/samples/openapi3/client/petstore/ruby/lib/petstore/version.rb +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/version.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/petstore.gemspec b/samples/openapi3/client/petstore/ruby/petstore.gemspec index 167ff9a753..40ae414770 100644 --- a/samples/openapi3/client/petstore/ruby/petstore.gemspec +++ b/samples/openapi3/client/petstore/ruby/petstore.gemspec @@ -8,7 +8,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/api/another_fake_api_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api/another_fake_api_spec.rb index 7fc8ef59bd..77233a7f44 100644 --- a/samples/openapi3/client/petstore/ruby/spec/api/another_fake_api_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/api/another_fake_api_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/api/default_api_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api/default_api_spec.rb index 132532dde1..ee55c964d6 100644 --- a/samples/openapi3/client/petstore/ruby/spec/api/default_api_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/api/default_api_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/api/fake_api_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api/fake_api_spec.rb index f0d6a13636..e3917cfced 100644 --- a/samples/openapi3/client/petstore/ruby/spec/api/fake_api_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/api/fake_api_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb index 12c2278ca2..e765df6181 100644 --- a/samples/openapi3/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/api/pet_api_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api/pet_api_spec.rb index a202df8241..cf54f2cb25 100644 --- a/samples/openapi3/client/petstore/ruby/spec/api/pet_api_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/api/pet_api_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/api/store_api_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api/store_api_spec.rb index 61b633b408..a7f4dcd50f 100644 --- a/samples/openapi3/client/petstore/ruby/spec/api/store_api_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/api/store_api_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/api/user_api_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api/user_api_spec.rb index 248006835e..ae1ea5e722 100644 --- a/samples/openapi3/client/petstore/ruby/spec/api/user_api_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/api/user_api_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/api_client_spec.rb b/samples/openapi3/client/petstore/ruby/spec/api_client_spec.rb index 274d78c14c..c4481e5171 100644 --- a/samples/openapi3/client/petstore/ruby/spec/api_client_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/api_client_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/configuration_spec.rb b/samples/openapi3/client/petstore/ruby/spec/configuration_spec.rb index 08263fa509..d10e4b23dd 100644 --- a/samples/openapi3/client/petstore/ruby/spec/configuration_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/configuration_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/additional_properties_class_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/additional_properties_class_spec.rb index a6885692f6..c2bf696fce 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/additional_properties_class_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/additional_properties_class_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/animal_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/animal_spec.rb index 08155ef394..6444e48f8e 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/animal_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/animal_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/api_response_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/api_response_spec.rb index 991bb81df7..b8d7f8db8c 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/api_response_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/api_response_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb index 372539c55c..af3da82656 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/array_of_number_only_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/array_of_number_only_spec.rb index 759a272f68..706c9e7731 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/array_of_number_only_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/array_of_number_only_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/array_test_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/array_test_spec.rb index c3819c9a9f..c5cf5d30a0 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/array_test_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/array_test_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/capitalization_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/capitalization_spec.rb index 9805991853..d454b7b63e 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/capitalization_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/capitalization_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/cat_all_of_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/cat_all_of_spec.rb index 49859a0524..479a933e21 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/cat_all_of_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/cat_all_of_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/cat_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/cat_spec.rb index 0ee7d2a7f6..a5785a1697 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/cat_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/cat_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/category_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/category_spec.rb index 1f9f8897fd..2ed0bec7c6 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/category_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/category_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/class_model_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/class_model_spec.rb index 589f3d1f12..61d29ad31c 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/class_model_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/class_model_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/client_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/client_spec.rb index b246962e2b..e031f0a336 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/client_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/client_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/dog_all_of_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/dog_all_of_spec.rb index 6cba24ecd9..200a7d0a7e 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/dog_all_of_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/dog_all_of_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/dog_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/dog_spec.rb index d13a686449..97ccdb0e86 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/dog_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/dog_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/enum_arrays_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/enum_arrays_spec.rb index 993d8f3a3e..f74ff0251e 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/enum_arrays_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/enum_arrays_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/enum_class_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/enum_class_spec.rb index 50c56e53df..94551ecd23 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/enum_class_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/enum_class_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/enum_test_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/enum_test_spec.rb index 903b7f9c9e..b81f4c6b04 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/enum_test_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/enum_test_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb index c59870f674..ff922dc1c5 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/file_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/file_spec.rb index 38513a9593..7cb23a664e 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/file_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/file_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/foo_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/foo_spec.rb index 829f18ac0d..d673375c02 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/foo_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/foo_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/format_test_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/format_test_spec.rb index 3b01581670..1e234866da 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/format_test_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/format_test_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/has_only_read_only_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/has_only_read_only_spec.rb index f1e7908be1..01e6d0df6d 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/has_only_read_only_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/has_only_read_only_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/health_check_result_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/health_check_result_spec.rb index d94dfae3e1..5659f9a035 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/health_check_result_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/health_check_result_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/inline_response_default_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/inline_response_default_spec.rb index 859051fae2..84c2ce6eac 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/inline_response_default_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/inline_response_default_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/list_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/list_spec.rb index 305f503079..c89a90864d 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/list_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/list_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/map_test_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/map_test_spec.rb index 6be8c3aff5..5da2ca13d0 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/map_test_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/map_test_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb index d9070acf51..52992adccb 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/model200_response_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/model200_response_spec.rb index 6502d960cb..f42829bd56 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/model200_response_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/model200_response_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/model_return_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/model_return_spec.rb index e4fc442810..8fee9ad96b 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/model_return_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/model_return_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/name_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/name_spec.rb index 362d499d12..b0354944cd 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/name_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/name_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/nullable_class_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/nullable_class_spec.rb index b7a8c99c1b..3635b0c6ee 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/nullable_class_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/nullable_class_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/number_only_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/number_only_spec.rb index 440a2d377d..df54f816c3 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/number_only_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/number_only_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/order_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/order_spec.rb index 45788b835a..31f3548f23 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/order_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/order_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/outer_composite_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/outer_composite_spec.rb index a7c25a114c..e06f75b542 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/outer_composite_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/outer_composite_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_default_value_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_default_value_spec.rb index 80c852db9f..45f192233e 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_default_value_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_default_value_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_default_value_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_default_value_spec.rb index 0be262b5df..453a373157 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_default_value_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_default_value_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_spec.rb index 9696979e03..ed04851687 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_spec.rb index f6de5c8991..9971665923 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/pet_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/pet_spec.rb index b0c7076815..868fcdd497 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/pet_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/pet_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/read_only_first_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/read_only_first_spec.rb index d8a4230276..f3fdb19569 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/read_only_first_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/read_only_first_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/special_model_name_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/special_model_name_spec.rb index 43eb2ec61e..0aad11f566 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/special_model_name_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/special_model_name_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/tag_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/tag_spec.rb index abb8380ff3..04038aa3e7 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/tag_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/tag_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/user_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/user_spec.rb index d313a360bb..580a180eae 100644 --- a/samples/openapi3/client/petstore/ruby/spec/models/user_spec.rb +++ b/samples/openapi3/client/petstore/ruby/spec/models/user_spec.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/openapi3/client/petstore/ruby/spec/spec_helper.rb b/samples/openapi3/client/petstore/ruby/spec/spec_helper.rb index dc8611b437..4dfb22a9d2 100644 --- a/samples/openapi3/client/petstore/ruby/spec/spec_helper.rb +++ b/samples/openapi3/client/petstore/ruby/spec/spec_helper.rb @@ -6,7 +6,11 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech +<<<<<<< HEAD OpenAPI Generator version: 4.1.0-SNAPSHOT +======= +OpenAPI Generator version: 4.0.2-SNAPSHOT +>>>>>>> origin/master =end diff --git a/samples/schema/petstore/mysql/.openapi-generator/VERSION b/samples/schema/petstore/mysql/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/schema/petstore/mysql/.openapi-generator/VERSION +++ b/samples/schema/petstore/mysql/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/openapi3/petstore/python-flask-python2/.openapi-generator/VERSION b/samples/server/openapi3/petstore/python-flask-python2/.openapi-generator/VERSION index afa6365606..0c89fc927e 100644 --- a/samples/server/openapi3/petstore/python-flask-python2/.openapi-generator/VERSION +++ b/samples/server/openapi3/petstore/python-flask-python2/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.0 \ No newline at end of file diff --git a/samples/server/openapi3/petstore/python-flask-python2/openapi_server/openapi/openapi.yaml b/samples/server/openapi3/petstore/python-flask-python2/openapi_server/openapi/openapi.yaml index f11d309f8d..851fb5fb81 100644 --- a/samples/server/openapi3/petstore/python-flask-python2/openapi_server/openapi/openapi.yaml +++ b/samples/server/openapi3/petstore/python-flask-python2/openapi_server/openapi/openapi.yaml @@ -1,6 +1,7 @@ openapi: 3.0.0 info: - description: This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + description: This is a sample server Petstore server. For this sample, you can use + the api key `special-key` to test the authorization filters. license: name: Apache-2.0 url: http://www.apache.org/licenses/LICENSE-2.0.html @@ -92,7 +93,6 @@ paths: description: Invalid status value security: - petstore_auth: - - write:pets - read:pets summary: Finds Pets by status tags: @@ -101,7 +101,8 @@ paths: /pet/findByTags: get: deprecated: true - description: Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + description: Multiple tags can be provided with comma separated strings. Use + tag1, tag2, tag3 for testing. operationId: find_pets_by_tags parameters: - description: Tags to filter by @@ -141,7 +142,6 @@ paths: description: Invalid tag value security: - petstore_auth: - - write:pets - read:pets summary: Finds Pets by tags tags: @@ -337,7 +337,8 @@ paths: x-openapi-router-controller: openapi_server.controllers.store_controller /store/order/{orderId}: delete: - description: For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + description: For valid response try integer IDs with value < 1000. Anything + above 1000 or nonintegers will generate API errors operationId: delete_order parameters: - description: ID of the order that needs to be deleted @@ -358,7 +359,8 @@ paths: - store x-openapi-router-controller: openapi_server.controllers.store_controller get: - description: For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + description: For valid response try integer IDs with value <= 5 or > 10. Other + values will generated exceptions operationId: get_order_by_id parameters: - description: ID of pet that needs to be fetched @@ -471,7 +473,8 @@ paths: description: successful operation headers: Set-Cookie: - description: Cookie authentication key for use with the `auth_cookie` apiKey authentication. + description: Cookie authentication key for use with the `auth_cookie` + apiKey authentication. explode: false schema: example: AUTH_KEY=abcde12345; Path=/; HttpOnly diff --git a/samples/server/openapi3/petstore/python-flask-python2/openapi_server/typing_utils.py b/samples/server/openapi3/petstore/python-flask-python2/openapi_server/typing_utils.py new file mode 100644 index 0000000000..0563f81fd5 --- /dev/null +++ b/samples/server/openapi3/petstore/python-flask-python2/openapi_server/typing_utils.py @@ -0,0 +1,32 @@ +# coding: utf-8 + +import sys + +if sys.version_info < (3, 7): + import typing + + def is_generic(klass): + """ Determine whether klass is a generic class """ + return type(klass) == typing.GenericMeta + + def is_dict(klass): + """ Determine whether klass is a Dict """ + return klass.__extra__ == dict + + def is_list(klass): + """ Determine whether klass is a List """ + return klass.__extra__ == list + +else: + + def is_generic(klass): + """ Determine whether klass is a generic class """ + return hasattr(klass, '__origin__') + + def is_dict(klass): + """ Determine whether klass is a Dict """ + return klass.__origin__ == dict + + def is_list(klass): + """ Determine whether klass is a List """ + return klass.__origin__ == list diff --git a/samples/server/openapi3/petstore/python-flask-python2/openapi_server/util.py b/samples/server/openapi3/petstore/python-flask-python2/openapi_server/util.py index c7340cd000..4b0188652b 100644 --- a/samples/server/openapi3/petstore/python-flask-python2/openapi_server/util.py +++ b/samples/server/openapi3/petstore/python-flask-python2/openapi_server/util.py @@ -2,6 +2,7 @@ import datetime import six import typing +from openapi_server import typing_utils def _deserialize(data, klass): @@ -23,10 +24,10 @@ def _deserialize(data, klass): return deserialize_date(data) elif klass == datetime.datetime: return deserialize_datetime(data) - elif type(klass) == typing.GenericMeta: - if klass.__extra__ == list: + elif typing_utils.is_generic(klass): + if typing_utils.is_list(klass): return _deserialize_list(data, klass.__args__[0]) - if klass.__extra__ == dict: + if typing_utils.is_dict(klass): return _deserialize_dict(data, klass.__args__[1]) else: return deserialize_model(data, klass) diff --git a/samples/server/openapi3/petstore/python-flask/.openapi-generator/VERSION b/samples/server/openapi3/petstore/python-flask/.openapi-generator/VERSION index afa6365606..0c89fc927e 100644 --- a/samples/server/openapi3/petstore/python-flask/.openapi-generator/VERSION +++ b/samples/server/openapi3/petstore/python-flask/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.0 \ No newline at end of file diff --git a/samples/server/openapi3/petstore/python-flask/openapi_server/openapi/openapi.yaml b/samples/server/openapi3/petstore/python-flask/openapi_server/openapi/openapi.yaml index f11d309f8d..851fb5fb81 100644 --- a/samples/server/openapi3/petstore/python-flask/openapi_server/openapi/openapi.yaml +++ b/samples/server/openapi3/petstore/python-flask/openapi_server/openapi/openapi.yaml @@ -1,6 +1,7 @@ openapi: 3.0.0 info: - description: This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + description: This is a sample server Petstore server. For this sample, you can use + the api key `special-key` to test the authorization filters. license: name: Apache-2.0 url: http://www.apache.org/licenses/LICENSE-2.0.html @@ -92,7 +93,6 @@ paths: description: Invalid status value security: - petstore_auth: - - write:pets - read:pets summary: Finds Pets by status tags: @@ -101,7 +101,8 @@ paths: /pet/findByTags: get: deprecated: true - description: Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + description: Multiple tags can be provided with comma separated strings. Use + tag1, tag2, tag3 for testing. operationId: find_pets_by_tags parameters: - description: Tags to filter by @@ -141,7 +142,6 @@ paths: description: Invalid tag value security: - petstore_auth: - - write:pets - read:pets summary: Finds Pets by tags tags: @@ -337,7 +337,8 @@ paths: x-openapi-router-controller: openapi_server.controllers.store_controller /store/order/{orderId}: delete: - description: For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + description: For valid response try integer IDs with value < 1000. Anything + above 1000 or nonintegers will generate API errors operationId: delete_order parameters: - description: ID of the order that needs to be deleted @@ -358,7 +359,8 @@ paths: - store x-openapi-router-controller: openapi_server.controllers.store_controller get: - description: For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + description: For valid response try integer IDs with value <= 5 or > 10. Other + values will generated exceptions operationId: get_order_by_id parameters: - description: ID of pet that needs to be fetched @@ -471,7 +473,8 @@ paths: description: successful operation headers: Set-Cookie: - description: Cookie authentication key for use with the `auth_cookie` apiKey authentication. + description: Cookie authentication key for use with the `auth_cookie` + apiKey authentication. explode: false schema: example: AUTH_KEY=abcde12345; Path=/; HttpOnly diff --git a/samples/server/openapi3/petstore/python-flask/openapi_server/typing_utils.py b/samples/server/openapi3/petstore/python-flask/openapi_server/typing_utils.py new file mode 100644 index 0000000000..0563f81fd5 --- /dev/null +++ b/samples/server/openapi3/petstore/python-flask/openapi_server/typing_utils.py @@ -0,0 +1,32 @@ +# coding: utf-8 + +import sys + +if sys.version_info < (3, 7): + import typing + + def is_generic(klass): + """ Determine whether klass is a generic class """ + return type(klass) == typing.GenericMeta + + def is_dict(klass): + """ Determine whether klass is a Dict """ + return klass.__extra__ == dict + + def is_list(klass): + """ Determine whether klass is a List """ + return klass.__extra__ == list + +else: + + def is_generic(klass): + """ Determine whether klass is a generic class """ + return hasattr(klass, '__origin__') + + def is_dict(klass): + """ Determine whether klass is a Dict """ + return klass.__origin__ == dict + + def is_list(klass): + """ Determine whether klass is a List """ + return klass.__origin__ == list diff --git a/samples/server/openapi3/petstore/python-flask/openapi_server/util.py b/samples/server/openapi3/petstore/python-flask/openapi_server/util.py index c7340cd000..4b0188652b 100644 --- a/samples/server/openapi3/petstore/python-flask/openapi_server/util.py +++ b/samples/server/openapi3/petstore/python-flask/openapi_server/util.py @@ -2,6 +2,7 @@ import datetime import six import typing +from openapi_server import typing_utils def _deserialize(data, klass): @@ -23,10 +24,10 @@ def _deserialize(data, klass): return deserialize_date(data) elif klass == datetime.datetime: return deserialize_datetime(data) - elif type(klass) == typing.GenericMeta: - if klass.__extra__ == list: + elif typing_utils.is_generic(klass): + if typing_utils.is_list(klass): return _deserialize_list(data, klass.__args__[0]) - if klass.__extra__ == dict: + if typing_utils.is_dict(klass): return _deserialize_dict(data, klass.__args__[1]) else: return deserialize_model(data, klass) diff --git a/samples/server/petstore/aspnetcore/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore/.openapi-generator/VERSION index afa6365606..06b5019af3 100644 --- a/samples/server/petstore/aspnetcore/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/PetApi.cs index d4f1c50554..a945134b8a 100644 --- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -3,7 +3,7 @@ * * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech */ diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/StoreApi.cs index 6ed7b79c84..1e981d697a 100644 --- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/StoreApi.cs +++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/StoreApi.cs @@ -3,7 +3,7 @@ * * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech */ diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/UserApi.cs index 99a13ef744..7c455f25a5 100644 --- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/UserApi.cs +++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/UserApi.cs @@ -3,7 +3,7 @@ * * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech */ diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/ApiResponse.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/ApiResponse.cs index 363087cfd9..a1e0948c3b 100644 --- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/ApiResponse.cs +++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/ApiResponse.cs @@ -3,7 +3,7 @@ * * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech */ diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Category.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Category.cs index aafdde5db7..820baff912 100644 --- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Category.cs +++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Category.cs @@ -3,7 +3,7 @@ * * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech */ diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Order.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Order.cs index 8abf9f9c49..5312b28df3 100644 --- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Order.cs +++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Order.cs @@ -3,7 +3,7 @@ * * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech */ @@ -160,7 +160,7 @@ namespace Org.OpenAPITools.Models ) && ( Status == other.Status || - Status != null && + Status.Equals(other.Status) ) && ( @@ -188,7 +188,7 @@ namespace Org.OpenAPITools.Models hashCode = hashCode * 59 + Quantity.GetHashCode(); if (ShipDate != null) hashCode = hashCode * 59 + ShipDate.GetHashCode(); - if (Status != null) + hashCode = hashCode * 59 + Status.GetHashCode(); if (Complete != null) hashCode = hashCode * 59 + Complete.GetHashCode(); diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Pet.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Pet.cs index 302b17551d..5ed8a481e9 100644 --- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Pet.cs +++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Pet.cs @@ -3,7 +3,7 @@ * * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech */ @@ -169,7 +169,7 @@ namespace Org.OpenAPITools.Models ) && ( Status == other.Status || - Status != null && + Status.Equals(other.Status) ); } @@ -194,7 +194,7 @@ namespace Org.OpenAPITools.Models hashCode = hashCode * 59 + PhotoUrls.GetHashCode(); if (Tags != null) hashCode = hashCode * 59 + Tags.GetHashCode(); - if (Status != null) + hashCode = hashCode * 59 + Status.GetHashCode(); return hashCode; } diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Tag.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Tag.cs index 9750103a89..8811f8caa9 100644 --- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Tag.cs +++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Tag.cs @@ -3,7 +3,7 @@ * * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech */ diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/User.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/User.cs index 6e5c3f7ca7..f36f2e6a5c 100644 --- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/User.cs +++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/User.cs @@ -3,7 +3,7 @@ * * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech */ diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Startup.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Startup.cs index c8341daef2..ece2c98eca 100644 --- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Startup.cs +++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Startup.cs @@ -3,7 +3,7 @@ * * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * Generated by: https://openapi-generator.tech */ diff --git a/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION b/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION index afa6365606..06b5019af3 100644 --- a/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION +++ b/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/README.MD b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/README.MD index 6ebec4f3ee..5225ebb24f 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/README.MD +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/README.MD @@ -49,6 +49,17 @@ To run the server ./build/src/cpp-qt5-qhttpengine-server & ``` +To override the default port via the command line, provide the parameters `port` and `address` like below + +```shell +cpp-qt5-qhttpengine-server --port 9080 --address 127.17.0.1 +``` +or + +```shell +cpp-qt5-qhttpengine-server -p 9080 -a 127.17.0.1 +``` + #### Invoke an API ```shell diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIApiRouter.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIApiRouter.cpp index d4668ccadc..0ea833a0ed 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIApiRouter.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIApiRouter.cpp @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIApiRouter.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIApiRouter.h index 320badff8e..ee1893cd59 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIApiRouter.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIApiRouter.h @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.cpp index 2bc9f9fa83..ed0535ee0f 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.cpp @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h index 230cd7ee7e..1b1c50de6e 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIPetApiHandler.h @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIStoreApiHandler.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIStoreApiHandler.cpp index db77c6489e..e439109af8 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIStoreApiHandler.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIStoreApiHandler.cpp @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIStoreApiHandler.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIStoreApiHandler.h index dfd063a4d6..9a549eb001 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIStoreApiHandler.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIStoreApiHandler.h @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIUserApiHandler.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIUserApiHandler.cpp index 2a592e4eeb..7480499945 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIUserApiHandler.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIUserApiHandler.cpp @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIUserApiHandler.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIUserApiHandler.h index fd84928962..48c217dc63 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIUserApiHandler.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/handlers/OAIUserApiHandler.h @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/main.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/main.cpp index e442d094fe..d6b3af798d 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/main.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/main.cpp @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.cpp index e1a0a3539a..9d4dd1eb81 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.cpp @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -37,13 +37,16 @@ OAIApiResponse::~OAIApiResponse() { void OAIApiResponse::init() { + m_code_isSet = false; m_code_isValid = false; + m_type_isSet = false; m_type_isValid = false; + m_message_isSet = false; m_message_isValid = false; -} + } void OAIApiResponse::fromJson(QString jsonString) { @@ -55,12 +58,16 @@ OAIApiResponse::fromJson(QString jsonString) { void OAIApiResponse::fromJsonObject(QJsonObject json) { + m_code_isValid = ::OpenAPI::fromJsonValue(code, json[QString("code")]); + m_type_isValid = ::OpenAPI::fromJsonValue(type, json[QString("type")]); + m_message_isValid = ::OpenAPI::fromJsonValue(message, json[QString("message")]); + } QString @@ -86,6 +93,7 @@ OAIApiResponse::asJsonObject() const { return obj; } + qint32 OAIApiResponse::getCode() const { return code; @@ -96,6 +104,7 @@ OAIApiResponse::setCode(const qint32 &code) { this->m_code_isSet = true; } + QString OAIApiResponse::getType() const { return type; @@ -106,6 +115,7 @@ OAIApiResponse::setType(const QString &type) { this->m_type_isSet = true; } + QString OAIApiResponse::getMessage() const { return message; diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.h index cf75b3988c..b28590dd38 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIApiResponse.h @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,6 +25,7 @@ #include #include "OAIObject.h" +#include "OAIEnum.h" namespace OpenAPI { @@ -39,30 +40,39 @@ public: void fromJsonObject(QJsonObject json) override; void fromJson(QString jsonString) override; + qint32 getCode() const; void setCode(const qint32 &code); + QString getType() const; void setType(const QString &type); + QString getMessage() const; void setMessage(const QString &message); + + virtual bool isSet() const override; virtual bool isValid() const override; private: void init(); + qint32 code; bool m_code_isSet; bool m_code_isValid; + QString type; bool m_type_isSet; bool m_type_isValid; + QString message; bool m_message_isSet; bool m_message_isValid; -}; + + }; } diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.cpp index b4695e383a..752f6bdbba 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.cpp @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -37,11 +37,13 @@ OAICategory::~OAICategory() { void OAICategory::init() { + m_id_isSet = false; m_id_isValid = false; + m_name_isSet = false; m_name_isValid = false; -} + } void OAICategory::fromJson(QString jsonString) { @@ -53,10 +55,13 @@ OAICategory::fromJson(QString jsonString) { void OAICategory::fromJsonObject(QJsonObject json) { + m_id_isValid = ::OpenAPI::fromJsonValue(id, json[QString("id")]); + m_name_isValid = ::OpenAPI::fromJsonValue(name, json[QString("name")]); + } QString @@ -79,6 +84,7 @@ OAICategory::asJsonObject() const { return obj; } + qint64 OAICategory::getId() const { return id; @@ -89,6 +95,7 @@ OAICategory::setId(const qint64 &id) { this->m_id_isSet = true; } + QString OAICategory::getName() const { return name; diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.h index 2d72ebfbd8..0586cb3d4e 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAICategory.h @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,6 +25,7 @@ #include #include "OAIObject.h" +#include "OAIEnum.h" namespace OpenAPI { @@ -39,24 +40,31 @@ public: void fromJsonObject(QJsonObject json) override; void fromJson(QString jsonString) override; + qint64 getId() const; void setId(const qint64 &id); + QString getName() const; void setName(const QString &name); + + virtual bool isSet() const override; virtual bool isValid() const override; private: void init(); + qint64 id; bool m_id_isSet; bool m_id_isValid; + QString name; bool m_name_isSet; bool m_name_isValid; -}; + + }; } diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIEnum.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIEnum.h new file mode 100644 index 0000000000..42daef17ac --- /dev/null +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIEnum.h @@ -0,0 +1,64 @@ +/** + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +#ifndef OAI_ENUM_H +#define OAI_ENUM_H + +#include +#include + +namespace OpenAPI { + +class OAIEnum { + public: + OAIEnum() { + + } + + OAIEnum(QString jsonString) { + fromJson(jsonString); + } + + virtual ~OAIEnum(){ + + } + + virtual QJsonValue asJsonValue() const { + return QJsonValue(jstr); + } + + virtual QString asJson() const { + return jstr; + } + + virtual void fromJson(QString jsonString) { + jstr = jsonString; + } + + virtual void fromJsonValue(QJsonValue jval) { + jstr = jval.toString(); + } + + virtual bool isSet() const { + return false; + } + + virtual bool isValid() const { + return true; + } +private : + QString jstr; +}; + +} + +#endif // OAI_ENUM_H diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.cpp index 753308f7ad..bbe372ea85 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.cpp @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -12,7 +12,7 @@ #include #include "OAIHelpers.h" -#include "OAIObject.h" + namespace OpenAPI { @@ -64,6 +64,11 @@ toStringValue(const double &value){ return QString::number(value); } +QString +toStringValue(const OAIEnum &value){ + return value.asJson(); +} + QJsonValue toJsonValue(const QString &value){ return QJsonValue(value); @@ -114,6 +119,11 @@ toJsonValue(const OAIObject &value){ return value.asJsonObject(); } +QJsonValue +toJsonValue(const OAIEnum &value){ + return value.asJsonValue(); +} + bool fromStringValue(const QString &inStr, QString &value){ value.clear(); @@ -202,6 +212,12 @@ fromStringValue(const QString &inStr, double &value){ return ok; } +bool +fromStringValue(const QString &inStr, OAIEnum &value){ + value.fromJson(inStr); + return true; +} + bool fromJsonValue(QString &value, const QJsonValue &jval){ bool ok = true; @@ -324,4 +340,10 @@ fromJsonValue(OAIObject &value, const QJsonValue &jval){ return ok; } +bool +fromJsonValue(OAIEnum &value, const QJsonValue &jval){ + value.fromJsonValue(jval); + return true; +} + } diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.h index 143e3591b1..ce7cec3fc7 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIHelpers.h @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -23,6 +23,7 @@ #include #include #include "OAIObject.h" +#include "OAIEnum.h" namespace OpenAPI { @@ -35,6 +36,7 @@ namespace OpenAPI { QString toStringValue(const bool &value); QString toStringValue(const float &value); QString toStringValue(const double &value); + QString toStringValue(const OAIEnum &value); template QString toStringValue(const QList &val) { @@ -58,6 +60,7 @@ namespace OpenAPI { QJsonValue toJsonValue(const float &value); QJsonValue toJsonValue(const double &value); QJsonValue toJsonValue(const OAIObject &value); + QJsonValue toJsonValue(const OAIEnum &value); template QJsonValue toJsonValue(const QList &val) { @@ -86,6 +89,7 @@ namespace OpenAPI { bool fromStringValue(const QString &inStr, bool &value); bool fromStringValue(const QString &inStr, float &value); bool fromStringValue(const QString &inStr, double &value); + bool fromStringValue(const QString &inStr, OAIEnum &value); template bool fromStringValue(const QList &inStr, QList &val) { @@ -119,6 +123,7 @@ namespace OpenAPI { bool fromJsonValue(float &value, const QJsonValue &jval); bool fromJsonValue(double &value, const QJsonValue &jval); bool fromJsonValue(OAIObject &value, const QJsonValue &jval); + bool fromJsonValue(OAIEnum &value, const QJsonValue &jval); template bool fromJsonValue(QList &val, const QJsonValue &jval) { diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIObject.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIObject.h index ce51fbf049..9cc379894c 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIObject.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIObject.h @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.cpp index 6776ca2a3e..1ea3fba155 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.cpp @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -37,19 +37,25 @@ OAIOrder::~OAIOrder() { void OAIOrder::init() { + m_id_isSet = false; m_id_isValid = false; + m_pet_id_isSet = false; m_pet_id_isValid = false; + m_quantity_isSet = false; m_quantity_isValid = false; + m_ship_date_isSet = false; m_ship_date_isValid = false; + m_status_isSet = false; m_status_isValid = false; + m_complete_isSet = false; m_complete_isValid = false; -} + } void OAIOrder::fromJson(QString jsonString) { @@ -61,18 +67,25 @@ OAIOrder::fromJson(QString jsonString) { void OAIOrder::fromJsonObject(QJsonObject json) { + m_id_isValid = ::OpenAPI::fromJsonValue(id, json[QString("id")]); + m_pet_id_isValid = ::OpenAPI::fromJsonValue(pet_id, json[QString("petId")]); + m_quantity_isValid = ::OpenAPI::fromJsonValue(quantity, json[QString("quantity")]); + m_ship_date_isValid = ::OpenAPI::fromJsonValue(ship_date, json[QString("shipDate")]); + m_status_isValid = ::OpenAPI::fromJsonValue(status, json[QString("status")]); + m_complete_isValid = ::OpenAPI::fromJsonValue(complete, json[QString("complete")]); + } QString @@ -107,6 +120,7 @@ OAIOrder::asJsonObject() const { return obj; } + qint64 OAIOrder::getId() const { return id; @@ -117,6 +131,7 @@ OAIOrder::setId(const qint64 &id) { this->m_id_isSet = true; } + qint64 OAIOrder::getPetId() const { return pet_id; @@ -127,6 +142,7 @@ OAIOrder::setPetId(const qint64 &pet_id) { this->m_pet_id_isSet = true; } + qint32 OAIOrder::getQuantity() const { return quantity; @@ -137,6 +153,7 @@ OAIOrder::setQuantity(const qint32 &quantity) { this->m_quantity_isSet = true; } + QDateTime OAIOrder::getShipDate() const { return ship_date; @@ -147,6 +164,7 @@ OAIOrder::setShipDate(const QDateTime &ship_date) { this->m_ship_date_isSet = true; } + QString OAIOrder::getStatus() const { return status; @@ -157,6 +175,7 @@ OAIOrder::setStatus(const QString &status) { this->m_status_isSet = true; } + bool OAIOrder::isComplete() const { return complete; diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.h index c9550fb1df..eb9edd329e 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIOrder.h @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -26,6 +26,7 @@ #include #include "OAIObject.h" +#include "OAIEnum.h" namespace OpenAPI { @@ -40,48 +41,63 @@ public: void fromJsonObject(QJsonObject json) override; void fromJson(QString jsonString) override; + qint64 getId() const; void setId(const qint64 &id); + qint64 getPetId() const; void setPetId(const qint64 &pet_id); + qint32 getQuantity() const; void setQuantity(const qint32 &quantity); + QDateTime getShipDate() const; void setShipDate(const QDateTime &ship_date); + QString getStatus() const; void setStatus(const QString &status); + bool isComplete() const; void setComplete(const bool &complete); + + virtual bool isSet() const override; virtual bool isValid() const override; private: void init(); + qint64 id; bool m_id_isSet; bool m_id_isValid; + qint64 pet_id; bool m_pet_id_isSet; bool m_pet_id_isValid; + qint32 quantity; bool m_quantity_isSet; bool m_quantity_isValid; + QDateTime ship_date; bool m_ship_date_isSet; bool m_ship_date_isValid; + QString status; bool m_status_isSet; bool m_status_isValid; + bool complete; bool m_complete_isSet; bool m_complete_isValid; -}; + + }; } diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.cpp index 94af12c736..c611d2d82a 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.cpp @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -37,19 +37,25 @@ OAIPet::~OAIPet() { void OAIPet::init() { + m_id_isSet = false; m_id_isValid = false; + m_category_isSet = false; m_category_isValid = false; + m_name_isSet = false; m_name_isValid = false; + m_photo_urls_isSet = false; m_photo_urls_isValid = false; + m_tags_isSet = false; m_tags_isValid = false; + m_status_isSet = false; m_status_isValid = false; -} + } void OAIPet::fromJson(QString jsonString) { @@ -61,18 +67,25 @@ OAIPet::fromJson(QString jsonString) { void OAIPet::fromJsonObject(QJsonObject json) { + m_id_isValid = ::OpenAPI::fromJsonValue(id, json[QString("id")]); + m_category_isValid = ::OpenAPI::fromJsonValue(category, json[QString("category")]); + m_name_isValid = ::OpenAPI::fromJsonValue(name, json[QString("name")]); + m_photo_urls_isValid = ::OpenAPI::fromJsonValue(photo_urls, json[QString("photoUrls")]); + m_tags_isValid = ::OpenAPI::fromJsonValue(tags, json[QString("tags")]); + m_status_isValid = ::OpenAPI::fromJsonValue(status, json[QString("status")]); + } QString @@ -109,6 +122,7 @@ OAIPet::asJsonObject() const { return obj; } + qint64 OAIPet::getId() const { return id; @@ -119,6 +133,7 @@ OAIPet::setId(const qint64 &id) { this->m_id_isSet = true; } + OAICategory OAIPet::getCategory() const { return category; @@ -129,6 +144,7 @@ OAIPet::setCategory(const OAICategory &category) { this->m_category_isSet = true; } + QString OAIPet::getName() const { return name; @@ -139,6 +155,7 @@ OAIPet::setName(const QString &name) { this->m_name_isSet = true; } + QList OAIPet::getPhotoUrls() const { return photo_urls; @@ -149,6 +166,7 @@ OAIPet::setPhotoUrls(const QList &photo_urls) { this->m_photo_urls_isSet = true; } + QList OAIPet::getTags() const { return tags; @@ -159,6 +177,7 @@ OAIPet::setTags(const QList &tags) { this->m_tags_isSet = true; } + QString OAIPet::getStatus() const { return status; diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.h index 2ca79919a7..ffeb4ba5ad 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIPet.h @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -28,6 +28,7 @@ #include #include "OAIObject.h" +#include "OAIEnum.h" namespace OpenAPI { @@ -42,48 +43,63 @@ public: void fromJsonObject(QJsonObject json) override; void fromJson(QString jsonString) override; + qint64 getId() const; void setId(const qint64 &id); + OAICategory getCategory() const; void setCategory(const OAICategory &category); + QString getName() const; void setName(const QString &name); + QList getPhotoUrls() const; void setPhotoUrls(const QList &photo_urls); + QList getTags() const; void setTags(const QList &tags); + QString getStatus() const; void setStatus(const QString &status); + + virtual bool isSet() const override; virtual bool isValid() const override; private: void init(); + qint64 id; bool m_id_isSet; bool m_id_isValid; + OAICategory category; bool m_category_isSet; bool m_category_isValid; + QString name; bool m_name_isSet; bool m_name_isValid; + QList photo_urls; bool m_photo_urls_isSet; bool m_photo_urls_isValid; + QList tags; bool m_tags_isSet; bool m_tags_isValid; + QString status; bool m_status_isSet; bool m_status_isValid; -}; + + }; } diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.cpp index 19ab5832d6..4cf8d349b4 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.cpp @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -37,11 +37,13 @@ OAITag::~OAITag() { void OAITag::init() { + m_id_isSet = false; m_id_isValid = false; + m_name_isSet = false; m_name_isValid = false; -} + } void OAITag::fromJson(QString jsonString) { @@ -53,10 +55,13 @@ OAITag::fromJson(QString jsonString) { void OAITag::fromJsonObject(QJsonObject json) { + m_id_isValid = ::OpenAPI::fromJsonValue(id, json[QString("id")]); + m_name_isValid = ::OpenAPI::fromJsonValue(name, json[QString("name")]); + } QString @@ -79,6 +84,7 @@ OAITag::asJsonObject() const { return obj; } + qint64 OAITag::getId() const { return id; @@ -89,6 +95,7 @@ OAITag::setId(const qint64 &id) { this->m_id_isSet = true; } + QString OAITag::getName() const { return name; diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.h index 27f033928c..2a497cf1bd 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAITag.h @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,6 +25,7 @@ #include #include "OAIObject.h" +#include "OAIEnum.h" namespace OpenAPI { @@ -39,24 +40,31 @@ public: void fromJsonObject(QJsonObject json) override; void fromJson(QString jsonString) override; + qint64 getId() const; void setId(const qint64 &id); + QString getName() const; void setName(const QString &name); + + virtual bool isSet() const override; virtual bool isValid() const override; private: void init(); + qint64 id; bool m_id_isSet; bool m_id_isValid; + QString name; bool m_name_isSet; bool m_name_isValid; -}; + + }; } diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.cpp index 2cf358ae84..52431c0367 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.cpp @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -37,23 +37,31 @@ OAIUser::~OAIUser() { void OAIUser::init() { + m_id_isSet = false; m_id_isValid = false; + m_username_isSet = false; m_username_isValid = false; + m_first_name_isSet = false; m_first_name_isValid = false; + m_last_name_isSet = false; m_last_name_isValid = false; + m_email_isSet = false; m_email_isValid = false; + m_password_isSet = false; m_password_isValid = false; + m_phone_isSet = false; m_phone_isValid = false; + m_user_status_isSet = false; m_user_status_isValid = false; -} + } void OAIUser::fromJson(QString jsonString) { @@ -65,22 +73,31 @@ OAIUser::fromJson(QString jsonString) { void OAIUser::fromJsonObject(QJsonObject json) { + m_id_isValid = ::OpenAPI::fromJsonValue(id, json[QString("id")]); + m_username_isValid = ::OpenAPI::fromJsonValue(username, json[QString("username")]); + m_first_name_isValid = ::OpenAPI::fromJsonValue(first_name, json[QString("firstName")]); + m_last_name_isValid = ::OpenAPI::fromJsonValue(last_name, json[QString("lastName")]); + m_email_isValid = ::OpenAPI::fromJsonValue(email, json[QString("email")]); + m_password_isValid = ::OpenAPI::fromJsonValue(password, json[QString("password")]); + m_phone_isValid = ::OpenAPI::fromJsonValue(phone, json[QString("phone")]); + m_user_status_isValid = ::OpenAPI::fromJsonValue(user_status, json[QString("userStatus")]); + } QString @@ -121,6 +138,7 @@ OAIUser::asJsonObject() const { return obj; } + qint64 OAIUser::getId() const { return id; @@ -131,6 +149,7 @@ OAIUser::setId(const qint64 &id) { this->m_id_isSet = true; } + QString OAIUser::getUsername() const { return username; @@ -141,6 +160,7 @@ OAIUser::setUsername(const QString &username) { this->m_username_isSet = true; } + QString OAIUser::getFirstName() const { return first_name; @@ -151,6 +171,7 @@ OAIUser::setFirstName(const QString &first_name) { this->m_first_name_isSet = true; } + QString OAIUser::getLastName() const { return last_name; @@ -161,6 +182,7 @@ OAIUser::setLastName(const QString &last_name) { this->m_last_name_isSet = true; } + QString OAIUser::getEmail() const { return email; @@ -171,6 +193,7 @@ OAIUser::setEmail(const QString &email) { this->m_email_isSet = true; } + QString OAIUser::getPassword() const { return password; @@ -181,6 +204,7 @@ OAIUser::setPassword(const QString &password) { this->m_password_isSet = true; } + QString OAIUser::getPhone() const { return phone; @@ -191,6 +215,7 @@ OAIUser::setPhone(const QString &phone) { this->m_phone_isSet = true; } + qint32 OAIUser::getUserStatus() const { return user_status; diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.h index 275376c2de..d388f62a29 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/models/OAIUser.h @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -25,6 +25,7 @@ #include #include "OAIObject.h" +#include "OAIEnum.h" namespace OpenAPI { @@ -39,60 +40,79 @@ public: void fromJsonObject(QJsonObject json) override; void fromJson(QString jsonString) override; + qint64 getId() const; void setId(const qint64 &id); + QString getUsername() const; void setUsername(const QString &username); + QString getFirstName() const; void setFirstName(const QString &first_name); + QString getLastName() const; void setLastName(const QString &last_name); + QString getEmail() const; void setEmail(const QString &email); + QString getPassword() const; void setPassword(const QString &password); + QString getPhone() const; void setPhone(const QString &phone); + qint32 getUserStatus() const; void setUserStatus(const qint32 &user_status); + + virtual bool isSet() const override; virtual bool isValid() const override; private: void init(); + qint64 id; bool m_id_isSet; bool m_id_isValid; + QString username; bool m_username_isSet; bool m_username_isValid; + QString first_name; bool m_first_name_isSet; bool m_first_name_isValid; + QString last_name; bool m_last_name_isSet; bool m_last_name_isValid; + QString email; bool m_email_isSet; bool m_email_isValid; + QString password; bool m_password_isSet; bool m_password_isValid; + QString phone; bool m_phone_isSet; bool m_phone_isValid; + qint32 user_status; bool m_user_status_isSet; bool m_user_status_isValid; -}; + + }; } diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.cpp index 7131fce7e2..1d4fcfa163 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.cpp @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h index 83ce2d2813..ad53bb80e7 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIPetApiRequest.h @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.cpp index fdef383832..24ed609d79 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.cpp @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.h index 9f5dc23e54..7f6a604dfd 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIStoreApiRequest.h @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.cpp b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.cpp index 588056010e..e91d7a06d8 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.cpp +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.cpp @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.h b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.h index ec3b08d52b..01785063ef 100644 --- a/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.h +++ b/samples/server/petstore/cpp-qt5-qhttpengine-server/server/src/requests/OAIUserApiRequest.h @@ -2,7 +2,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/server/petstore/cpp-restbed/.openapi-generator/VERSION b/samples/server/petstore/cpp-restbed/.openapi-generator/VERSION index f4cb97d56c..06b5019af3 100644 --- a/samples/server/petstore/cpp-restbed/.openapi-generator/VERSION +++ b/samples/server/petstore/cpp-restbed/.openapi-generator/VERSION @@ -1 +1 @@ -3.3.1-SNAPSHOT \ No newline at end of file +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/cpp-restbed/api/PetApi.cpp b/samples/server/petstore/cpp-restbed/api/PetApi.cpp index 0922b3890a..fb5612d1fc 100644 --- a/samples/server/petstore/cpp-restbed/api/PetApi.cpp +++ b/samples/server/petstore/cpp-restbed/api/PetApi.cpp @@ -2,10 +2,10 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 4.0.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ @@ -72,6 +72,20 @@ PetApiPetResource::~PetApiPetResource() { } +void PetApiPetResource::set_handler_POST( + std::function( + std::shared_ptr const & + )> handler) { + handler_POST_ = std::move(handler); +} + +void PetApiPetResource::set_handler_PUT( + std::function( + std::shared_ptr const & + )> handler) { + handler_PUT_ = std::move(handler); +} + void PetApiPetResource::POST_method_handler(const std::shared_ptr session) { const auto request = session->get_request(); @@ -82,23 +96,27 @@ void PetApiPetResource::POST_method_handler(const std::shared_ptrget_request(); - std::string requestBody = restbed::String::format("%.*s\n", ( int ) body.size( ), body.data( )); + std::string file = restbed::String::format("%.*s\n", ( int ) body.size( ), body.data( )); /** - * Get body params or form params here from the requestBody string + * Get body params or form params here from the file string */ - - - + + + // Change the value of this variable to the appropriate response before sending the response int status_code = 200; - - /** - * Process the received information here - */ - + std::string result = "successful operation"; + + if (handler_POST_) + { + std::tie(status_code, result) = handler_POST_( + body + ); + } + if (status_code == 405) { - session->close(405, "Invalid input", { {"Connection", "close"} }); + session->close(405, result.empty() ? "Invalid input" : std::move(result), { {"Connection", "close"} }); return; } @@ -115,28 +133,32 @@ void PetApiPetResource::PUT_method_handler(const std::shared_ptrget_request(); - std::string requestBody = restbed::String::format("%.*s\n", ( int ) body.size( ), body.data( )); + std::string file = restbed::String::format("%.*s\n", ( int ) body.size( ), body.data( )); + + - - // Change the value of this variable to the appropriate response before sending the response int status_code = 200; - - /** - * Process the received information here - */ - + std::string result = "successful operation"; + + if (handler_PUT_) + { + std::tie(status_code, result) = handler_PUT_( + body + ); + } + if (status_code == 400) { - session->close(400, "Invalid ID supplied", { {"Connection", "close"} }); + session->close(400, result.empty() ? "Invalid ID supplied" : std::move(result), { {"Connection", "close"} }); return; } if (status_code == 404) { - session->close(404, "Pet not found", { {"Connection", "close"} }); + session->close(404, result.empty() ? "Pet not found" : std::move(result), { {"Connection", "close"} }); return; } if (status_code == 405) { - session->close(405, "Validation exception", { {"Connection", "close"} }); + session->close(405, result.empty() ? "Validation exception" : std::move(result), { {"Connection", "close"} }); return; } @@ -162,26 +184,50 @@ PetApiPetPetIdResource::~PetApiPetPetIdResource() { } +void PetApiPetPetIdResource::set_handler_DELETE( + std::function( + int64_t const &, std::string const & + )> handler) { + handler_DELETE_ = std::move(handler); +} + +void PetApiPetPetIdResource::set_handler_GET( + std::function( + int64_t const & + )> handler) { + handler_GET_ = std::move(handler); +} +void PetApiPetPetIdResource::set_handler_POST( + std::function( + int64_t const &, std::string const &, std::string const & + )> handler) { + handler_POST_ = std::move(handler); +} + void PetApiPetPetIdResource::DELETE_method_handler(const std::shared_ptr session) { const auto request = session->get_request(); - + // Getting the path params const int64_t petId = request->get_path_parameter("petId", 0L); - + // Getting the headers const std::string apiKey = request->get_header("apiKey", ""); - + // Change the value of this variable to the appropriate response before sending the response int status_code = 200; - - /** - * Process the received information here - */ - + std::string result = "successful operation"; + + if (handler_DELETE_) + { + std::tie(status_code, result) = handler_DELETE_( + petId, apiKey + ); + } + if (status_code == 400) { - session->close(400, "Invalid pet value", { {"Connection", "close"} }); + session->close(400, result.empty() ? "Invalid pet value" : std::move(result), { {"Connection", "close"} }); return; } @@ -193,27 +239,31 @@ void PetApiPetPetIdResource::GET_method_handler(const std::shared_ptrget_path_parameter("petId", 0L); - - + + // Change the value of this variable to the appropriate response before sending the response int status_code = 200; - - /** - * Process the received information here - */ - + std::string result = "successful operation"; + + if (handler_GET_) + { + std::tie(status_code, result) = handler_GET_( + petId + ); + } + if (status_code == 200) { std::shared_ptr response = NULL; - session->close(200, "successful operation", { {"Connection", "close"} }); + session->close(200, result.empty() ? "successful operation" : std::move(result), { {"Connection", "close"} }); return; } if (status_code == 400) { - session->close(400, "Invalid ID supplied", { {"Connection", "close"} }); + session->close(400, result.empty() ? "Invalid ID supplied" : std::move(result), { {"Connection", "close"} }); return; } if (status_code == 404) { - session->close(404, "Pet not found", { {"Connection", "close"} }); + session->close(404, result.empty() ? "Pet not found" : std::move(result), { {"Connection", "close"} }); return; } @@ -224,18 +274,22 @@ void PetApiPetPetIdResource::POST_method_handler(const std::shared_ptrget_path_parameter("petId", 0L); - - + + // Change the value of this variable to the appropriate response before sending the response int status_code = 200; - - /** - * Process the received information here - */ - + std::string result = "successful operation"; + + if (handler_POST_) + { + std::tie(status_code, result) = handler_POST_( + petId, name, status + ); + } + if (status_code == 405) { - session->close(405, "Invalid input", { {"Connection", "close"} }); + session->close(405, result.empty() ? "Invalid input" : std::move(result), { {"Connection", "close"} }); return; } @@ -254,27 +308,39 @@ PetApiPetFindByStatusResource::~PetApiPetFindByStatusResource() { } +void PetApiPetFindByStatusResource::set_handler_GET( + std::function( + std::vector const & + )> handler) { + handler_GET_ = std::move(handler); +} + + void PetApiPetFindByStatusResource::GET_method_handler(const std::shared_ptr session) { const auto request = session->get_request(); - - + + // Getting the query params - + // Change the value of this variable to the appropriate response before sending the response int status_code = 200; - - /** - * Process the received information here - */ - + std::string result = "successful operation"; + + if (handler_GET_) + { + std::tie(status_code, result) = handler_GET_( + status + ); + } + if (status_code == 200) { - session->close(200, "successful operation", { {"Connection", "close"} }); + session->close(200, result.empty() ? "successful operation" : std::move(result), { {"Connection", "close"} }); return; } if (status_code == 400) { - session->close(400, "Invalid status value", { {"Connection", "close"} }); + session->close(400, result.empty() ? "Invalid status value" : std::move(result), { {"Connection", "close"} }); return; } @@ -294,27 +360,39 @@ PetApiPetFindByTagsResource::~PetApiPetFindByTagsResource() { } +void PetApiPetFindByTagsResource::set_handler_GET( + std::function( + std::vector const & + )> handler) { + handler_GET_ = std::move(handler); +} + + void PetApiPetFindByTagsResource::GET_method_handler(const std::shared_ptr session) { const auto request = session->get_request(); - - + + // Getting the query params - + // Change the value of this variable to the appropriate response before sending the response int status_code = 200; - - /** - * Process the received information here - */ - + std::string result = "successful operation"; + + if (handler_GET_) + { + std::tie(status_code, result) = handler_GET_( + tags + ); + } + if (status_code == 200) { - session->close(200, "successful operation", { {"Connection", "close"} }); + session->close(200, result.empty() ? "successful operation" : std::move(result), { {"Connection", "close"} }); return; } if (status_code == 400) { - session->close(400, "Invalid tag value", { {"Connection", "close"} }); + session->close(400, result.empty() ? "Invalid tag value" : std::move(result), { {"Connection", "close"} }); return; } @@ -334,24 +412,36 @@ PetApiPetPetIdUploadImageResource::~PetApiPetPetIdUploadImageResource() { } +void PetApiPetPetIdUploadImageResource::set_handler_POST( + std::function( + int64_t const &, std::string const &, std::string const & + )> handler) { + handler_POST_ = std::move(handler); +} + + void PetApiPetPetIdUploadImageResource::POST_method_handler(const std::shared_ptr session) { const auto request = session->get_request(); - + // Getting the path params const int64_t petId = request->get_path_parameter("petId", 0L); - - + + // Change the value of this variable to the appropriate response before sending the response int status_code = 200; - - /** - * Process the received information here - */ - + std::string result = "successful operation"; + + if (handler_POST_) + { + std::tie(status_code, result) = handler_POST_( + petId, additionalMetadata, file + ); + } + if (status_code == 200) { - session->close(200, "successful operation", { {"Connection", "close"} }); + session->close(200, result.empty() ? "successful operation" : std::move(result), { {"Connection", "close"} }); return; } diff --git a/samples/server/petstore/cpp-restbed/api/PetApi.h b/samples/server/petstore/cpp-restbed/api/PetApi.h index e9b654e735..c51b0b8728 100644 --- a/samples/server/petstore/cpp-restbed/api/PetApi.h +++ b/samples/server/petstore/cpp-restbed/api/PetApi.h @@ -2,10 +2,10 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 4.0.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ @@ -21,6 +21,8 @@ #include +#include + #include #include #include @@ -59,6 +61,27 @@ public: virtual ~PetApiPetResource(); void POST_method_handler(const std::shared_ptr session); void PUT_method_handler(const std::shared_ptr session); + + void set_handler_POST( + std::function( + std::shared_ptr const & + )> handler + ); + + void set_handler_PUT( + std::function( + std::shared_ptr const & + )> handler + ); + +private: + std::function( + std::shared_ptr const & + )> handler_POST_; + + std::function( + std::shared_ptr const & + )> handler_PUT_; }; /// @@ -75,6 +98,35 @@ public: void DELETE_method_handler(const std::shared_ptr session); void GET_method_handler(const std::shared_ptr session); void POST_method_handler(const std::shared_ptr session); + + void set_handler_DELETE( + std::function( + int64_t const &, std::string const & + )> handler + ); + + void set_handler_GET( + std::function( + int64_t const & + )> handler + ); + void set_handler_POST( + std::function( + int64_t const &, std::string const &, std::string const & + )> handler + ); + +private: + std::function( + int64_t const &, std::string const & + )> handler_DELETE_; + + std::function( + int64_t const & + )> handler_GET_; + std::function( + int64_t const &, std::string const &, std::string const & + )> handler_POST_; }; /// @@ -89,6 +141,19 @@ public: PetApiPetFindByStatusResource(); virtual ~PetApiPetFindByStatusResource(); void GET_method_handler(const std::shared_ptr session); + + void set_handler_GET( + std::function( + std::vector const & + )> handler + ); + + +private: + std::function( + std::vector const & + )> handler_GET_; + }; /// @@ -103,6 +168,19 @@ public: PetApiPetFindByTagsResource(); virtual ~PetApiPetFindByTagsResource(); void GET_method_handler(const std::shared_ptr session); + + void set_handler_GET( + std::function( + std::vector const & + )> handler + ); + + +private: + std::function( + std::vector const & + )> handler_GET_; + }; /// @@ -117,6 +195,19 @@ public: PetApiPetPetIdUploadImageResource(); virtual ~PetApiPetPetIdUploadImageResource(); void POST_method_handler(const std::shared_ptr session); + + void set_handler_POST( + std::function( + int64_t const &, std::string const &, std::string const & + )> handler + ); + + +private: + std::function( + int64_t const &, std::string const &, std::string const & + )> handler_POST_; + }; diff --git a/samples/server/petstore/cpp-restbed/api/StoreApi.cpp b/samples/server/petstore/cpp-restbed/api/StoreApi.cpp index 12c5974f3c..8d381eab26 100644 --- a/samples/server/petstore/cpp-restbed/api/StoreApi.cpp +++ b/samples/server/petstore/cpp-restbed/api/StoreApi.cpp @@ -2,10 +2,10 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 4.0.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ @@ -66,28 +66,46 @@ StoreApiStoreOrderOrderIdResource::~StoreApiStoreOrderOrderIdResource() { } +void StoreApiStoreOrderOrderIdResource::set_handler_DELETE( + std::function( + std::string const & + )> handler) { + handler_DELETE_ = std::move(handler); +} + +void StoreApiStoreOrderOrderIdResource::set_handler_GET( + std::function( + int64_t const & + )> handler) { + handler_GET_ = std::move(handler); +} + void StoreApiStoreOrderOrderIdResource::DELETE_method_handler(const std::shared_ptr session) { const auto request = session->get_request(); - + // Getting the path params const std::string orderId = request->get_path_parameter("orderId", ""); - - + + // Change the value of this variable to the appropriate response before sending the response int status_code = 200; - - /** - * Process the received information here - */ - + std::string result = "successful operation"; + + if (handler_DELETE_) + { + std::tie(status_code, result) = handler_DELETE_( + orderId + ); + } + if (status_code == 400) { - session->close(400, "Invalid ID supplied", { {"Connection", "close"} }); + session->close(400, result.empty() ? "Invalid ID supplied" : std::move(result), { {"Connection", "close"} }); return; } if (status_code == 404) { - session->close(404, "Order not found", { {"Connection", "close"} }); + session->close(404, result.empty() ? "Order not found" : std::move(result), { {"Connection", "close"} }); return; } @@ -99,27 +117,31 @@ void StoreApiStoreOrderOrderIdResource::GET_method_handler(const std::shared_ptr // Getting the path params const int64_t orderId = request->get_path_parameter("orderId", 0L); - - + + // Change the value of this variable to the appropriate response before sending the response int status_code = 200; - - /** - * Process the received information here - */ - + std::string result = "successful operation"; + + if (handler_GET_) + { + std::tie(status_code, result) = handler_GET_( + orderId + ); + } + if (status_code == 200) { std::shared_ptr response = NULL; - session->close(200, "successful operation", { {"Connection", "close"} }); + session->close(200, result.empty() ? "successful operation" : std::move(result), { {"Connection", "close"} }); return; } if (status_code == 400) { - session->close(400, "Invalid ID supplied", { {"Connection", "close"} }); + session->close(400, result.empty() ? "Invalid ID supplied" : std::move(result), { {"Connection", "close"} }); return; } if (status_code == 404) { - session->close(404, "Order not found", { {"Connection", "close"} }); + session->close(404, result.empty() ? "Order not found" : std::move(result), { {"Connection", "close"} }); return; } @@ -138,22 +160,34 @@ StoreApiStoreInventoryResource::~StoreApiStoreInventoryResource() { } +void StoreApiStoreInventoryResource::set_handler_GET( + std::function( + + )> handler) { + handler_GET_ = std::move(handler); +} + + void StoreApiStoreInventoryResource::GET_method_handler(const std::shared_ptr session) { const auto request = session->get_request(); - - - + + + // Change the value of this variable to the appropriate response before sending the response int status_code = 200; - - /** - * Process the received information here - */ - + std::string result = "successful operation"; + + if (handler_GET_) + { + std::tie(status_code, result) = handler_GET_( + + ); + } + if (status_code == 200) { - session->close(200, "successful operation", { {"Connection", "close"} }); + session->close(200, result.empty() ? "successful operation" : std::move(result), { {"Connection", "close"} }); return; } @@ -173,6 +207,14 @@ StoreApiStoreOrderResource::~StoreApiStoreOrderResource() { } +void StoreApiStoreOrderResource::set_handler_POST( + std::function( + std::shared_ptr const & + )> handler) { + handler_POST_ = std::move(handler); +} + + void StoreApiStoreOrderResource::POST_method_handler(const std::shared_ptr session) { const auto request = session->get_request(); @@ -183,27 +225,31 @@ void StoreApiStoreOrderResource::POST_method_handler(const std::shared_ptrget_request(); - std::string requestBody = restbed::String::format("%.*s\n", ( int ) body.size( ), body.data( )); + std::string file = restbed::String::format("%.*s\n", ( int ) body.size( ), body.data( )); /** - * Get body params or form params here from the requestBody string + * Get body params or form params here from the file string */ - - - + + + // Change the value of this variable to the appropriate response before sending the response int status_code = 200; - - /** - * Process the received information here - */ - + std::string result = "successful operation"; + + if (handler_POST_) + { + std::tie(status_code, result) = handler_POST_( + body + ); + } + if (status_code == 200) { - session->close(200, "successful operation", { {"Connection", "close"} }); + session->close(200, result.empty() ? "successful operation" : std::move(result), { {"Connection", "close"} }); return; } if (status_code == 400) { - session->close(400, "Invalid Order", { {"Connection", "close"} }); + session->close(400, result.empty() ? "Invalid Order" : std::move(result), { {"Connection", "close"} }); return; } diff --git a/samples/server/petstore/cpp-restbed/api/StoreApi.h b/samples/server/petstore/cpp-restbed/api/StoreApi.h index 469b04643a..a5c1817138 100644 --- a/samples/server/petstore/cpp-restbed/api/StoreApi.h +++ b/samples/server/petstore/cpp-restbed/api/StoreApi.h @@ -2,10 +2,10 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 4.0.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ @@ -21,6 +21,8 @@ #include +#include + #include #include #include @@ -59,6 +61,27 @@ public: virtual ~StoreApiStoreOrderOrderIdResource(); void DELETE_method_handler(const std::shared_ptr session); void GET_method_handler(const std::shared_ptr session); + + void set_handler_DELETE( + std::function( + std::string const & + )> handler + ); + + void set_handler_GET( + std::function( + int64_t const & + )> handler + ); + +private: + std::function( + std::string const & + )> handler_DELETE_; + + std::function( + int64_t const & + )> handler_GET_; }; /// @@ -73,6 +96,19 @@ public: StoreApiStoreInventoryResource(); virtual ~StoreApiStoreInventoryResource(); void GET_method_handler(const std::shared_ptr session); + + void set_handler_GET( + std::function( + + )> handler + ); + + +private: + std::function( + + )> handler_GET_; + }; /// @@ -87,6 +123,19 @@ public: StoreApiStoreOrderResource(); virtual ~StoreApiStoreOrderResource(); void POST_method_handler(const std::shared_ptr session); + + void set_handler_POST( + std::function( + std::shared_ptr const & + )> handler + ); + + +private: + std::function( + std::shared_ptr const & + )> handler_POST_; + }; diff --git a/samples/server/petstore/cpp-restbed/api/UserApi.cpp b/samples/server/petstore/cpp-restbed/api/UserApi.cpp index 6b0d309571..7501ca20bd 100644 --- a/samples/server/petstore/cpp-restbed/api/UserApi.cpp +++ b/samples/server/petstore/cpp-restbed/api/UserApi.cpp @@ -2,10 +2,10 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 4.0.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ @@ -72,6 +72,14 @@ UserApiUserResource::~UserApiUserResource() { } +void UserApiUserResource::set_handler_POST( + std::function( + std::shared_ptr const & + )> handler) { + handler_POST_ = std::move(handler); +} + + void UserApiUserResource::POST_method_handler(const std::shared_ptr session) { const auto request = session->get_request(); @@ -82,23 +90,27 @@ void UserApiUserResource::POST_method_handler(const std::shared_ptrget_request(); - std::string requestBody = restbed::String::format("%.*s\n", ( int ) body.size( ), body.data( )); + std::string file = restbed::String::format("%.*s\n", ( int ) body.size( ), body.data( )); /** - * Get body params or form params here from the requestBody string + * Get body params or form params here from the file string */ - - - + + + // Change the value of this variable to the appropriate response before sending the response int status_code = 200; - - /** - * Process the received information here - */ - + std::string result = "successful operation"; + + if (handler_POST_) + { + std::tie(status_code, result) = handler_POST_( + body + ); + } + if (status_code == 0) { - session->close(0, "successful operation", { {"Connection", "close"} }); + session->close(0, result.empty() ? "successful operation" : std::move(result), { {"Connection", "close"} }); return; } @@ -119,6 +131,14 @@ UserApiUserCreateWithArrayResource::~UserApiUserCreateWithArrayResource() { } +void UserApiUserCreateWithArrayResource::set_handler_POST( + std::function( + std::vector> const & + )> handler) { + handler_POST_ = std::move(handler); +} + + void UserApiUserCreateWithArrayResource::POST_method_handler(const std::shared_ptr session) { const auto request = session->get_request(); @@ -129,23 +149,27 @@ void UserApiUserCreateWithArrayResource::POST_method_handler(const std::shared_p { const auto request = session->get_request(); - std::string requestBody = restbed::String::format("%.*s\n", ( int ) body.size( ), body.data( )); + std::string file = restbed::String::format("%.*s\n", ( int ) body.size( ), body.data( )); /** - * Get body params or form params here from the requestBody string + * Get body params or form params here from the file string */ - - - + + + // Change the value of this variable to the appropriate response before sending the response int status_code = 200; - - /** - * Process the received information here - */ - + std::string result = "successful operation"; + + if (handler_POST_) + { + std::tie(status_code, result) = handler_POST_( + body + ); + } + if (status_code == 0) { - session->close(0, "successful operation", { {"Connection", "close"} }); + session->close(0, result.empty() ? "successful operation" : std::move(result), { {"Connection", "close"} }); return; } @@ -166,6 +190,14 @@ UserApiUserCreateWithListResource::~UserApiUserCreateWithListResource() { } +void UserApiUserCreateWithListResource::set_handler_POST( + std::function( + std::vector> const & + )> handler) { + handler_POST_ = std::move(handler); +} + + void UserApiUserCreateWithListResource::POST_method_handler(const std::shared_ptr session) { const auto request = session->get_request(); @@ -176,23 +208,27 @@ void UserApiUserCreateWithListResource::POST_method_handler(const std::shared_pt { const auto request = session->get_request(); - std::string requestBody = restbed::String::format("%.*s\n", ( int ) body.size( ), body.data( )); + std::string file = restbed::String::format("%.*s\n", ( int ) body.size( ), body.data( )); /** - * Get body params or form params here from the requestBody string + * Get body params or form params here from the file string */ - - - + + + // Change the value of this variable to the appropriate response before sending the response int status_code = 200; - - /** - * Process the received information here - */ - + std::string result = "successful operation"; + + if (handler_POST_) + { + std::tie(status_code, result) = handler_POST_( + body + ); + } + if (status_code == 0) { - session->close(0, "successful operation", { {"Connection", "close"} }); + session->close(0, result.empty() ? "successful operation" : std::move(result), { {"Connection", "close"} }); return; } @@ -219,28 +255,52 @@ UserApiUserUsernameResource::~UserApiUserUsernameResource() { } +void UserApiUserUsernameResource::set_handler_DELETE( + std::function( + std::string const & + )> handler) { + handler_DELETE_ = std::move(handler); +} + +void UserApiUserUsernameResource::set_handler_GET( + std::function( + std::string const & + )> handler) { + handler_GET_ = std::move(handler); +} +void UserApiUserUsernameResource::set_handler_PUT( + std::function( + std::string const &, std::shared_ptr const & + )> handler) { + handler_PUT_ = std::move(handler); +} + void UserApiUserUsernameResource::DELETE_method_handler(const std::shared_ptr session) { const auto request = session->get_request(); - + // Getting the path params const std::string username = request->get_path_parameter("username", ""); - - + + // Change the value of this variable to the appropriate response before sending the response int status_code = 200; - - /** - * Process the received information here - */ - + std::string result = "successful operation"; + + if (handler_DELETE_) + { + std::tie(status_code, result) = handler_DELETE_( + username + ); + } + if (status_code == 400) { - session->close(400, "Invalid username supplied", { {"Connection", "close"} }); + session->close(400, result.empty() ? "Invalid username supplied" : std::move(result), { {"Connection", "close"} }); return; } if (status_code == 404) { - session->close(404, "User not found", { {"Connection", "close"} }); + session->close(404, result.empty() ? "User not found" : std::move(result), { {"Connection", "close"} }); return; } @@ -252,27 +312,31 @@ void UserApiUserUsernameResource::GET_method_handler(const std::shared_ptrget_path_parameter("username", ""); - - + + // Change the value of this variable to the appropriate response before sending the response int status_code = 200; - - /** - * Process the received information here - */ - + std::string result = "successful operation"; + + if (handler_GET_) + { + std::tie(status_code, result) = handler_GET_( + username + ); + } + if (status_code == 200) { std::shared_ptr response = NULL; - session->close(200, "successful operation", { {"Connection", "close"} }); + session->close(200, result.empty() ? "successful operation" : std::move(result), { {"Connection", "close"} }); return; } if (status_code == 400) { - session->close(400, "Invalid username supplied", { {"Connection", "close"} }); + session->close(400, result.empty() ? "Invalid username supplied" : std::move(result), { {"Connection", "close"} }); return; } if (status_code == 404) { - session->close(404, "User not found", { {"Connection", "close"} }); + session->close(404, result.empty() ? "User not found" : std::move(result), { {"Connection", "close"} }); return; } @@ -287,26 +351,30 @@ void UserApiUserUsernameResource::PUT_method_handler(const std::shared_ptrget_request(); - std::string requestBody = restbed::String::format("%.*s\n", ( int ) body.size( ), body.data( )); + std::string file = restbed::String::format("%.*s\n", ( int ) body.size( ), body.data( )); // Getting the path params const std::string username = request->get_path_parameter("username", ""); - - + + // Change the value of this variable to the appropriate response before sending the response int status_code = 200; - - /** - * Process the received information here - */ - + std::string result = "successful operation"; + + if (handler_PUT_) + { + std::tie(status_code, result) = handler_PUT_( + username, body + ); + } + if (status_code == 400) { - session->close(400, "Invalid user supplied", { {"Connection", "close"} }); + session->close(400, result.empty() ? "Invalid user supplied" : std::move(result), { {"Connection", "close"} }); return; } if (status_code == 404) { - session->close(404, "User not found", { {"Connection", "close"} }); + session->close(404, result.empty() ? "User not found" : std::move(result), { {"Connection", "close"} }); return; } @@ -326,33 +394,45 @@ UserApiUserLoginResource::~UserApiUserLoginResource() { } +void UserApiUserLoginResource::set_handler_GET( + std::function( + std::string const &, std::string const & + )> handler) { + handler_GET_ = std::move(handler); +} + + void UserApiUserLoginResource::GET_method_handler(const std::shared_ptr session) { const auto request = session->get_request(); - - + + // Getting the query params const std::string username = request->get_query_parameter("username", ""); const std::string password = request->get_query_parameter("password", ""); - + // Change the value of this variable to the appropriate response before sending the response int status_code = 200; - - /** - * Process the received information here - */ - + std::string result = "successful operation"; + + if (handler_GET_) + { + std::tie(status_code, result) = handler_GET_( + username, password + ); + } + if (status_code == 200) { // Description: calls per hour allowed by the user session->set_header("X-Rate-Limit", ""); // Change second param to your header value // Description: date in UTC when toekn expires session->set_header("X-Expires-After", ""); // Change second param to your header value - session->close(200, "successful operation", { {"Connection", "close"} }); + session->close(200, result.empty() ? "successful operation" : std::move(result), { {"Connection", "close"} }); return; } if (status_code == 400) { - session->close(400, "Invalid username/password supplied", { {"Connection", "close"} }); + session->close(400, result.empty() ? "Invalid username/password supplied" : std::move(result), { {"Connection", "close"} }); return; } @@ -372,22 +452,34 @@ UserApiUserLogoutResource::~UserApiUserLogoutResource() { } +void UserApiUserLogoutResource::set_handler_GET( + std::function( + + )> handler) { + handler_GET_ = std::move(handler); +} + + void UserApiUserLogoutResource::GET_method_handler(const std::shared_ptr session) { const auto request = session->get_request(); - - - + + + // Change the value of this variable to the appropriate response before sending the response int status_code = 200; - - /** - * Process the received information here - */ - + std::string result = "successful operation"; + + if (handler_GET_) + { + std::tie(status_code, result) = handler_GET_( + + ); + } + if (status_code == 0) { - session->close(0, "successful operation", { {"Connection", "close"} }); + session->close(0, result.empty() ? "successful operation" : std::move(result), { {"Connection", "close"} }); return; } diff --git a/samples/server/petstore/cpp-restbed/api/UserApi.h b/samples/server/petstore/cpp-restbed/api/UserApi.h index fcb3dc1dd5..0750da000f 100644 --- a/samples/server/petstore/cpp-restbed/api/UserApi.h +++ b/samples/server/petstore/cpp-restbed/api/UserApi.h @@ -2,10 +2,10 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 4.0.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ @@ -21,6 +21,8 @@ #include +#include + #include #include #include @@ -58,6 +60,19 @@ public: UserApiUserResource(); virtual ~UserApiUserResource(); void POST_method_handler(const std::shared_ptr session); + + void set_handler_POST( + std::function( + std::shared_ptr const & + )> handler + ); + + +private: + std::function( + std::shared_ptr const & + )> handler_POST_; + }; /// @@ -72,6 +87,19 @@ public: UserApiUserCreateWithArrayResource(); virtual ~UserApiUserCreateWithArrayResource(); void POST_method_handler(const std::shared_ptr session); + + void set_handler_POST( + std::function( + std::vector> const & + )> handler + ); + + +private: + std::function( + std::vector> const & + )> handler_POST_; + }; /// @@ -86,6 +114,19 @@ public: UserApiUserCreateWithListResource(); virtual ~UserApiUserCreateWithListResource(); void POST_method_handler(const std::shared_ptr session); + + void set_handler_POST( + std::function( + std::vector> const & + )> handler + ); + + +private: + std::function( + std::vector> const & + )> handler_POST_; + }; /// @@ -102,6 +143,35 @@ public: void DELETE_method_handler(const std::shared_ptr session); void GET_method_handler(const std::shared_ptr session); void PUT_method_handler(const std::shared_ptr session); + + void set_handler_DELETE( + std::function( + std::string const & + )> handler + ); + + void set_handler_GET( + std::function( + std::string const & + )> handler + ); + void set_handler_PUT( + std::function( + std::string const &, std::shared_ptr const & + )> handler + ); + +private: + std::function( + std::string const & + )> handler_DELETE_; + + std::function( + std::string const & + )> handler_GET_; + std::function( + std::string const &, std::shared_ptr const & + )> handler_PUT_; }; /// @@ -116,6 +186,19 @@ public: UserApiUserLoginResource(); virtual ~UserApiUserLoginResource(); void GET_method_handler(const std::shared_ptr session); + + void set_handler_GET( + std::function( + std::string const &, std::string const & + )> handler + ); + + +private: + std::function( + std::string const &, std::string const & + )> handler_GET_; + }; /// @@ -130,6 +213,19 @@ public: UserApiUserLogoutResource(); virtual ~UserApiUserLogoutResource(); void GET_method_handler(const std::shared_ptr session); + + void set_handler_GET( + std::function( + + )> handler + ); + + +private: + std::function( + + )> handler_GET_; + }; diff --git a/samples/server/petstore/cpp-restbed/model/ApiResponse.cpp b/samples/server/petstore/cpp-restbed/model/ApiResponse.cpp index 588b26391a..15bf9dd817 100644 --- a/samples/server/petstore/cpp-restbed/model/ApiResponse.cpp +++ b/samples/server/petstore/cpp-restbed/model/ApiResponse.cpp @@ -2,10 +2,10 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 4.0.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/ApiResponse.h b/samples/server/petstore/cpp-restbed/model/ApiResponse.h index 3ea3993ff5..f0c0a9034d 100644 --- a/samples/server/petstore/cpp-restbed/model/ApiResponse.h +++ b/samples/server/petstore/cpp-restbed/model/ApiResponse.h @@ -2,10 +2,10 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 4.0.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/Category.cpp b/samples/server/petstore/cpp-restbed/model/Category.cpp index 6dadb6b13a..eca17e71bd 100644 --- a/samples/server/petstore/cpp-restbed/model/Category.cpp +++ b/samples/server/petstore/cpp-restbed/model/Category.cpp @@ -2,10 +2,10 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 4.0.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/Category.h b/samples/server/petstore/cpp-restbed/model/Category.h index 988c7e2abb..1dd7a111e0 100644 --- a/samples/server/petstore/cpp-restbed/model/Category.h +++ b/samples/server/petstore/cpp-restbed/model/Category.h @@ -2,10 +2,10 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 4.0.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/Order.cpp b/samples/server/petstore/cpp-restbed/model/Order.cpp index 5324911689..835d6787dc 100644 --- a/samples/server/petstore/cpp-restbed/model/Order.cpp +++ b/samples/server/petstore/cpp-restbed/model/Order.cpp @@ -2,10 +2,10 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 4.0.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/Order.h b/samples/server/petstore/cpp-restbed/model/Order.h index 4a98b0e92c..ad2dcab331 100644 --- a/samples/server/petstore/cpp-restbed/model/Order.h +++ b/samples/server/petstore/cpp-restbed/model/Order.h @@ -2,10 +2,10 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 4.0.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/Pet.cpp b/samples/server/petstore/cpp-restbed/model/Pet.cpp index 5f3a3cd94d..cd4b8a5b05 100644 --- a/samples/server/petstore/cpp-restbed/model/Pet.cpp +++ b/samples/server/petstore/cpp-restbed/model/Pet.cpp @@ -2,10 +2,10 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 4.0.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/Pet.h b/samples/server/petstore/cpp-restbed/model/Pet.h index 201a33113d..eeda96ced0 100644 --- a/samples/server/petstore/cpp-restbed/model/Pet.h +++ b/samples/server/petstore/cpp-restbed/model/Pet.h @@ -2,10 +2,10 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 4.0.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/Tag.cpp b/samples/server/petstore/cpp-restbed/model/Tag.cpp index 823bd8cc87..55b77ea7b9 100644 --- a/samples/server/petstore/cpp-restbed/model/Tag.cpp +++ b/samples/server/petstore/cpp-restbed/model/Tag.cpp @@ -2,10 +2,10 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 4.0.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/Tag.h b/samples/server/petstore/cpp-restbed/model/Tag.h index 74efa22c62..f1fa712392 100644 --- a/samples/server/petstore/cpp-restbed/model/Tag.h +++ b/samples/server/petstore/cpp-restbed/model/Tag.h @@ -2,10 +2,10 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 4.0.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/User.cpp b/samples/server/petstore/cpp-restbed/model/User.cpp index 8df4aed92b..805306a5d7 100644 --- a/samples/server/petstore/cpp-restbed/model/User.cpp +++ b/samples/server/petstore/cpp-restbed/model/User.cpp @@ -2,10 +2,10 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 4.0.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/cpp-restbed/model/User.h b/samples/server/petstore/cpp-restbed/model/User.h index 4d4c040831..f2792886c9 100644 --- a/samples/server/petstore/cpp-restbed/model/User.h +++ b/samples/server/petstore/cpp-restbed/model/User.h @@ -2,10 +2,10 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * - * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT. + * NOTE: This class is auto generated by OpenAPI-Generator 4.0.1-SNAPSHOT. * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION b/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION +++ b/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/go-gin-api-server/go/routers.go b/samples/server/petstore/go-gin-api-server/go/routers.go index a36d0b0973..0a1432a626 100644 --- a/samples/server/petstore/go-gin-api-server/go/routers.go +++ b/samples/server/petstore/go-gin-api-server/go/routers.go @@ -11,7 +11,6 @@ package petstoreserver import ( "net/http" - "strings" "github.com/gin-gonic/gin" ) @@ -36,13 +35,13 @@ func NewRouter() *gin.Engine { router := gin.Default() for _, route := range routes { switch route.Method { - case "GET": + case http.MethodGet: router.GET(route.Pattern, route.HandlerFunc) - case "POST": + case http.MethodPost: router.POST(route.Pattern, route.HandlerFunc) - case "PUT": + case http.MethodPut: router.PUT(route.Pattern, route.HandlerFunc) - case "DELETE": + case http.MethodDelete: router.DELETE(route.Pattern, route.HandlerFunc) } } @@ -58,147 +57,147 @@ func Index(c *gin.Context) { var routes = Routes{ { "Index", - "GET", + http.MethodGet, "/v2/", Index, }, { "AddPet", - strings.ToUpper("Post"), + http.MethodPost, "/v2/pet", AddPet, }, { "DeletePet", - strings.ToUpper("Delete"), + http.MethodDelete, "/v2/pet/:petId", DeletePet, }, { "FindPetsByStatus", - strings.ToUpper("Get"), + http.MethodGet, "/v2/pet/findByStatus", FindPetsByStatus, }, { "FindPetsByTags", - strings.ToUpper("Get"), + http.MethodGet, "/v2/pet/findByTags", FindPetsByTags, }, { "GetPetById", - strings.ToUpper("Get"), + http.MethodGet, "/v2/pet/:petId", GetPetById, }, { "UpdatePet", - strings.ToUpper("Put"), + http.MethodPut, "/v2/pet", UpdatePet, }, { "UpdatePetWithForm", - strings.ToUpper("Post"), + http.MethodPost, "/v2/pet/:petId", UpdatePetWithForm, }, { "UploadFile", - strings.ToUpper("Post"), + http.MethodPost, "/v2/pet/:petId/uploadImage", UploadFile, }, { "DeleteOrder", - strings.ToUpper("Delete"), + http.MethodDelete, "/v2/store/order/:orderId", DeleteOrder, }, { "GetInventory", - strings.ToUpper("Get"), + http.MethodGet, "/v2/store/inventory", GetInventory, }, { "GetOrderById", - strings.ToUpper("Get"), + http.MethodGet, "/v2/store/order/:orderId", GetOrderById, }, { "PlaceOrder", - strings.ToUpper("Post"), + http.MethodPost, "/v2/store/order", PlaceOrder, }, { "CreateUser", - strings.ToUpper("Post"), + http.MethodPost, "/v2/user", CreateUser, }, { "CreateUsersWithArrayInput", - strings.ToUpper("Post"), + http.MethodPost, "/v2/user/createWithArray", CreateUsersWithArrayInput, }, { "CreateUsersWithListInput", - strings.ToUpper("Post"), + http.MethodPost, "/v2/user/createWithList", CreateUsersWithListInput, }, { "DeleteUser", - strings.ToUpper("Delete"), + http.MethodDelete, "/v2/user/:username", DeleteUser, }, { "GetUserByName", - strings.ToUpper("Get"), + http.MethodGet, "/v2/user/:username", GetUserByName, }, { "LoginUser", - strings.ToUpper("Get"), + http.MethodGet, "/v2/user/login", LoginUser, }, { "LogoutUser", - strings.ToUpper("Get"), + http.MethodGet, "/v2/user/logout", LogoutUser, }, { "UpdateUser", - strings.ToUpper("Put"), + http.MethodPut, "/v2/user/:username", UpdateUser, }, diff --git a/samples/server/petstore/java-msf4j/.openapi-generator/VERSION b/samples/server/petstore/java-msf4j/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/java-msf4j/.openapi-generator/VERSION +++ b/samples/server/petstore/java-msf4j/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/finch/.openapi-generator-ignore b/samples/server/petstore/java-undertow/.openapi-generator-ignore similarity index 100% rename from samples/server/petstore/finch/.openapi-generator-ignore rename to samples/server/petstore/java-undertow/.openapi-generator-ignore diff --git a/samples/server/petstore/java-undertow/.openapi-generator/VERSION b/samples/server/petstore/java-undertow/.openapi-generator/VERSION new file mode 100644 index 0000000000..06b5019af3 --- /dev/null +++ b/samples/server/petstore/java-undertow/.openapi-generator/VERSION @@ -0,0 +1 @@ +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/undertow/README.md b/samples/server/petstore/java-undertow/README.md similarity index 100% rename from samples/server/petstore/undertow/README.md rename to samples/server/petstore/java-undertow/README.md diff --git a/samples/server/petstore/undertow/dependency-reduced-pom.xml b/samples/server/petstore/java-undertow/dependency-reduced-pom.xml similarity index 100% rename from samples/server/petstore/undertow/dependency-reduced-pom.xml rename to samples/server/petstore/java-undertow/dependency-reduced-pom.xml diff --git a/samples/server/petstore/undertow/pom.xml b/samples/server/petstore/java-undertow/pom.xml similarity index 100% rename from samples/server/petstore/undertow/pom.xml rename to samples/server/petstore/java-undertow/pom.xml diff --git a/samples/server/petstore/undertow/src/main/java/org/openapitools/handler/PathHandlerProvider.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerProvider.java similarity index 100% rename from samples/server/petstore/undertow/src/main/java/org/openapitools/handler/PathHandlerProvider.java rename to samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerProvider.java diff --git a/samples/server/petstore/undertow/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Category.java similarity index 100% rename from samples/server/petstore/undertow/src/main/java/org/openapitools/model/Category.java rename to samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Category.java diff --git a/samples/server/petstore/undertow/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/ModelApiResponse.java similarity index 100% rename from samples/server/petstore/undertow/src/main/java/org/openapitools/model/ModelApiResponse.java rename to samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/ModelApiResponse.java diff --git a/samples/server/petstore/undertow/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Order.java similarity index 100% rename from samples/server/petstore/undertow/src/main/java/org/openapitools/model/Order.java rename to samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Order.java diff --git a/samples/server/petstore/undertow/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Pet.java similarity index 100% rename from samples/server/petstore/undertow/src/main/java/org/openapitools/model/Pet.java rename to samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Pet.java diff --git a/samples/server/petstore/undertow/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Tag.java similarity index 100% rename from samples/server/petstore/undertow/src/main/java/org/openapitools/model/Tag.java rename to samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/Tag.java diff --git a/samples/server/petstore/undertow/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/User.java similarity index 100% rename from samples/server/petstore/undertow/src/main/java/org/openapitools/model/User.java rename to samples/server/petstore/java-undertow/src/main/java/org/openapitools/model/User.java diff --git a/samples/server/petstore/undertow/src/main/resources/META-INF/services/com.networknt.server.HandlerProvider b/samples/server/petstore/java-undertow/src/main/resources/META-INF/services/com.networknt.server.HandlerProvider similarity index 100% rename from samples/server/petstore/undertow/src/main/resources/META-INF/services/com.networknt.server.HandlerProvider rename to samples/server/petstore/java-undertow/src/main/resources/META-INF/services/com.networknt.server.HandlerProvider diff --git a/samples/server/petstore/undertow/src/main/resources/config/oauth/primary.crt b/samples/server/petstore/java-undertow/src/main/resources/config/oauth/primary.crt similarity index 100% rename from samples/server/petstore/undertow/src/main/resources/config/oauth/primary.crt rename to samples/server/petstore/java-undertow/src/main/resources/config/oauth/primary.crt diff --git a/samples/server/petstore/undertow/src/main/resources/config/openapi.json b/samples/server/petstore/java-undertow/src/main/resources/config/openapi.json similarity index 100% rename from samples/server/petstore/undertow/src/main/resources/config/openapi.json rename to samples/server/petstore/java-undertow/src/main/resources/config/openapi.json diff --git a/samples/server/petstore/undertow/src/main/resources/config/security.json b/samples/server/petstore/java-undertow/src/main/resources/config/security.json similarity index 100% rename from samples/server/petstore/undertow/src/main/resources/config/security.json rename to samples/server/petstore/java-undertow/src/main/resources/config/security.json diff --git a/samples/server/petstore/undertow/src/main/resources/config/server.json b/samples/server/petstore/java-undertow/src/main/resources/config/server.json similarity index 100% rename from samples/server/petstore/undertow/src/main/resources/config/server.json rename to samples/server/petstore/java-undertow/src/main/resources/config/server.json diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/jaxrs-cxf/pom.xml b/samples/server/petstore/jaxrs-cxf/pom.xml index 0548375aee..273e216da1 100644 --- a/samples/server/petstore/jaxrs-cxf/pom.xml +++ b/samples/server/petstore/jaxrs-cxf/pom.xml @@ -191,14 +191,14 @@ 1.7 ${java.version} ${java.version} - 1.5.18 + 1.5.22 9.2.9.v20150224 4.12 1.1.7 2.5 1.1.0.Final 3.3.0 - 2.9.8 + 2.9.9 UTF-8 diff --git a/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/build.gradle b/samples/server/petstore/jaxrs-resteasy/eap-java8/build.gradle index db258e3178..63a1d0b7c7 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/build.gradle @@ -16,7 +16,7 @@ dependencies { providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' providedCompile 'javax.validation:validation-api:1.1.0.Final' - compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.6.3' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9' testCompile 'junit:junit:4.12', 'org.hamcrest:hamcrest-core:1.3' } diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml index efcd7e6620..1999487716 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/pom.xml @@ -148,7 +148,7 @@ com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.6.3 + 2.9.9 diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle b/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle index 3d50424ed3..6dd309498e 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle @@ -16,7 +16,7 @@ dependencies { providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' providedCompile 'javax.validation:validation-api:1.1.0.Final' - compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.6.3' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9' compile 'joda-time:joda-time:2.7' testCompile 'junit:junit:4.12', 'org.hamcrest:hamcrest-core:1.3' diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml index 78a42e812d..8e47b072dc 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml @@ -153,7 +153,7 @@ com.fasterxml.jackson.datatype jackson-datatype-joda - 2.6.3 + 2.9.9 diff --git a/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/jaxrs-resteasy/eap/build.gradle b/samples/server/petstore/jaxrs-resteasy/eap/build.gradle index 3d50424ed3..6dd309498e 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/eap/build.gradle @@ -16,7 +16,7 @@ dependencies { providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' providedCompile 'javax.validation:validation-api:1.1.0.Final' - compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.6.3' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.9' compile 'joda-time:joda-time:2.7' testCompile 'junit:junit:4.12', 'org.hamcrest:hamcrest-core:1.3' diff --git a/samples/server/petstore/jaxrs-resteasy/eap/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap/pom.xml index f468d7d032..11a3ceddfc 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap/pom.xml @@ -153,7 +153,7 @@ com.fasterxml.jackson.datatype jackson-datatype-joda - 2.6.3 + 2.9.9 diff --git a/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/pom.xml b/samples/server/petstore/jaxrs/jersey1-useTags/pom.xml index bd29eaa708..a85ec85578 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/pom.xml +++ b/samples/server/petstore/jaxrs/jersey1-useTags/pom.xml @@ -196,11 +196,11 @@ 1.7 ${java.version} ${java.version} - 1.5.18 + 1.5.22 1.1.0.Final 9.2.9.v20150224 1.19.1 - 2.8.9 + 2.9.9 1.7.21 4.12 2.5 diff --git a/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/jaxrs/jersey1/pom.xml b/samples/server/petstore/jaxrs/jersey1/pom.xml index ab850e9645..fad09cbc14 100644 --- a/samples/server/petstore/jaxrs/jersey1/pom.xml +++ b/samples/server/petstore/jaxrs/jersey1/pom.xml @@ -196,11 +196,11 @@ 1.7 ${java.version} ${java.version} - 1.5.18 + 1.5.22 1.1.0.Final 9.2.9.v20150224 1.19.1 - 2.8.9 + 2.9.9 1.7.21 4.12 2.5 diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml b/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml index 9c94168346..c396d5a6db 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml +++ b/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml @@ -184,7 +184,7 @@ 1.1.0.Final 9.2.9.v20150224 2.22.2 - 2.8.9 + 2.9.9 4.12 1.1.7 2.5 diff --git a/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/jaxrs/jersey2/pom.xml b/samples/server/petstore/jaxrs/jersey2/pom.xml index dbc9b8247e..05175f71f7 100644 --- a/samples/server/petstore/jaxrs/jersey2/pom.xml +++ b/samples/server/petstore/jaxrs/jersey2/pom.xml @@ -184,7 +184,7 @@ 1.1.0.Final 9.2.9.v20150224 2.22.2 - 2.8.9 + 2.9.9 4.12 1.1.7 2.5 diff --git a/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION b/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/kotlin-server/ktor/README.md b/samples/server/petstore/kotlin-server/ktor/README.md index c5ad559266..1714a1b2ba 100644 --- a/samples/server/petstore/kotlin-server/ktor/README.md +++ b/samples/server/petstore/kotlin-server/ktor/README.md @@ -2,7 +2,11 @@ This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. +<<<<<<< HEAD Generated by OpenAPI Generator 4.1.0-SNAPSHOT. +======= +Generated by OpenAPI Generator 4.0.2-SNAPSHOT. +>>>>>>> origin/master ## Requires diff --git a/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/kotlin-springboot/build.gradle.kts b/samples/server/petstore/kotlin-springboot/build.gradle.kts index f7a2deac99..29ca3edef7 100644 --- a/samples/server/petstore/kotlin-springboot/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot/build.gradle.kts @@ -40,6 +40,7 @@ dependencies { compile("com.fasterxml.jackson.dataformat:jackson-dataformat-xml") compile("com.fasterxml.jackson.module:jackson-module-kotlin") + testCompile("org.jetbrains.kotlin:kotlin-test-junit5") testCompile("org.springframework.boot:spring-boot-starter-test") { exclude(module = "junit") } diff --git a/samples/server/petstore/kotlin-springboot/pom.xml b/samples/server/petstore/kotlin-springboot/pom.xml index 96ed05a21d..71876ce723 100644 --- a/samples/server/petstore/kotlin-springboot/pom.xml +++ b/samples/server/petstore/kotlin-springboot/pom.xml @@ -105,5 +105,11 @@ javax.validation validation-api + + org.jetbrains.kotlin + kotlin-test-junit5 + 1.3.31 + test + diff --git a/samples/server/petstore/kotlin-springboot/src/test/kotlin/org/openapitools/api/PetApiTest.kt b/samples/server/petstore/kotlin-springboot/src/test/kotlin/org/openapitools/api/PetApiTest.kt new file mode 100644 index 0000000000..394aff3b33 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot/src/test/kotlin/org/openapitools/api/PetApiTest.kt @@ -0,0 +1,148 @@ +package org.openapitools.api + +import org.openapitools.model.ModelApiResponse +import org.openapitools.model.Pet +import org.junit.jupiter.api.Test + +import org.springframework.http.ResponseEntity + +class PetApiTest { + + private val service: PetApiService = PetApiServiceImpl() + private val api: PetApiController = PetApiController(service) + + + /** + * Add a new pet to the store + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun addPetTest() { + val body:Pet? = null + val response: ResponseEntity = api.addPet(body!!) + + // TODO: test validations + } + + /** + * Deletes a pet + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun deletePetTest() { + val petId:Long? = null + val apiKey:String? = null + val response: ResponseEntity = api.deletePet(petId!!, apiKey!!) + + // TODO: test validations + } + + /** + * Finds Pets by status + * + * Multiple status values can be provided with comma separated strings + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun findPetsByStatusTest() { + val status:List? = null + val response: ResponseEntity> = api.findPetsByStatus(status!!) + + // TODO: test validations + } + + /** + * Finds Pets by tags + * + * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun findPetsByTagsTest() { + val tags:List? = null + val response: ResponseEntity> = api.findPetsByTags(tags!!) + + // TODO: test validations + } + + /** + * Find pet by ID + * + * Returns a single pet + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun getPetByIdTest() { + val petId:Long? = null + val response: ResponseEntity = api.getPetById(petId!!) + + // TODO: test validations + } + + /** + * Update an existing pet + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun updatePetTest() { + val body:Pet? = null + val response: ResponseEntity = api.updatePet(body!!) + + // TODO: test validations + } + + /** + * Updates a pet in the store with form data + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun updatePetWithFormTest() { + val petId:Long? = null + val name:String? = null + val status:String? = null + val response: ResponseEntity = api.updatePetWithForm(petId!!, name!!, status!!) + + // TODO: test validations + } + + /** + * uploads an image + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun uploadFileTest() { + val petId:Long? = null + val additionalMetadata:String? = null + val file:org.springframework.core.io.Resource? = null + val response: ResponseEntity = api.uploadFile(petId!!, additionalMetadata!!, file!!) + + // TODO: test validations + } + +} diff --git a/samples/server/petstore/kotlin-springboot/src/test/kotlin/org/openapitools/api/StoreApiTest.kt b/samples/server/petstore/kotlin-springboot/src/test/kotlin/org/openapitools/api/StoreApiTest.kt new file mode 100644 index 0000000000..48b25c4eaf --- /dev/null +++ b/samples/server/petstore/kotlin-springboot/src/test/kotlin/org/openapitools/api/StoreApiTest.kt @@ -0,0 +1,77 @@ +package org.openapitools.api + +import org.openapitools.model.Order +import org.junit.jupiter.api.Test + +import org.springframework.http.ResponseEntity + +class StoreApiTest { + + private val service: StoreApiService = StoreApiServiceImpl() + private val api: StoreApiController = StoreApiController(service) + + + /** + * Delete purchase order by ID + * + * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun deleteOrderTest() { + val orderId:String? = null + val response: ResponseEntity = api.deleteOrder(orderId!!) + + // TODO: test validations + } + + /** + * Returns pet inventories by status + * + * Returns a map of status codes to quantities + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun getInventoryTest() { + val response: ResponseEntity> = api.getInventory() + + // TODO: test validations + } + + /** + * Find purchase order by ID + * + * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun getOrderByIdTest() { + val orderId:Long? = null + val response: ResponseEntity = api.getOrderById(orderId!!) + + // TODO: test validations + } + + /** + * Place an order for a pet + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun placeOrderTest() { + val body:Order? = null + val response: ResponseEntity = api.placeOrder(body!!) + + // TODO: test validations + } + +} diff --git a/samples/server/petstore/kotlin-springboot/src/test/kotlin/org/openapitools/api/UserApiTest.kt b/samples/server/petstore/kotlin-springboot/src/test/kotlin/org/openapitools/api/UserApiTest.kt new file mode 100644 index 0000000000..50940559e8 --- /dev/null +++ b/samples/server/petstore/kotlin-springboot/src/test/kotlin/org/openapitools/api/UserApiTest.kt @@ -0,0 +1,143 @@ +package org.openapitools.api + +import org.openapitools.model.User +import org.junit.jupiter.api.Test + +import org.springframework.http.ResponseEntity + +class UserApiTest { + + private val service: UserApiService = UserApiServiceImpl() + private val api: UserApiController = UserApiController(service) + + + /** + * Create user + * + * This can only be done by the logged in user. + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun createUserTest() { + val body:User? = null + val response: ResponseEntity = api.createUser(body!!) + + // TODO: test validations + } + + /** + * Creates list of users with given input array + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun createUsersWithArrayInputTest() { + val body:List? = null + val response: ResponseEntity = api.createUsersWithArrayInput(body!!) + + // TODO: test validations + } + + /** + * Creates list of users with given input array + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun createUsersWithListInputTest() { + val body:List? = null + val response: ResponseEntity = api.createUsersWithListInput(body!!) + + // TODO: test validations + } + + /** + * Delete user + * + * This can only be done by the logged in user. + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun deleteUserTest() { + val username:String? = null + val response: ResponseEntity = api.deleteUser(username!!) + + // TODO: test validations + } + + /** + * Get user by user name + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun getUserByNameTest() { + val username:String? = null + val response: ResponseEntity = api.getUserByName(username!!) + + // TODO: test validations + } + + /** + * Logs user into the system + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun loginUserTest() { + val username:String? = null + val password:String? = null + val response: ResponseEntity = api.loginUser(username!!, password!!) + + // TODO: test validations + } + + /** + * Logs out current logged in user session + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun logoutUserTest() { + val response: ResponseEntity = api.logoutUser() + + // TODO: test validations + } + + /** + * Updated user + * + * This can only be done by the logged in user. + * + * @throws ApiException + * if the Api call fails + */ + @Test + fun updateUserTest() { + val username:String? = null + val body:User? = null + val response: ResponseEntity = api.updateUser(username!!, body!!) + + // TODO: test validations + } + +} diff --git a/samples/server/petstore/php-lumen/.openapi-generator/VERSION b/samples/server/petstore/php-lumen/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/php-lumen/.openapi-generator/VERSION +++ b/samples/server/petstore/php-lumen/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION b/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION +++ b/samples/server/petstore/php-silex/OpenAPIServer/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/php-slim/.openapi-generator/VERSION b/samples/server/petstore/php-slim/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/php-slim/.openapi-generator/VERSION +++ b/samples/server/petstore/php-slim/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION b/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/php-ze-ph/.openapi-generator/VERSION b/samples/server/petstore/php-ze-ph/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/php-ze-ph/.openapi-generator/VERSION +++ b/samples/server/petstore/php-ze-ph/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION b/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION index afa6365606..0c89fc927e 100644 --- a/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION +++ b/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.0 \ No newline at end of file diff --git a/samples/server/petstore/python-aiohttp/openapi_server/openapi/openapi.yaml b/samples/server/petstore/python-aiohttp/openapi_server/openapi/openapi.yaml index 1979eb6b1c..3571653f41 100644 --- a/samples/server/petstore/python-aiohttp/openapi_server/openapi/openapi.yaml +++ b/samples/server/petstore/python-aiohttp/openapi_server/openapi/openapi.yaml @@ -1,6 +1,7 @@ openapi: 3.0.1 info: - description: This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + description: This is a sample server Petstore server. For this sample, you can use + the api key `special-key` to test the authorization filters. license: name: Apache-2.0 url: http://www.apache.org/licenses/LICENSE-2.0.html @@ -123,7 +124,8 @@ paths: /pet/findByTags: get: deprecated: true - description: Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + description: Multiple tags can be provided with comma separated strings. Use + tag1, tag2, tag3 for testing. operationId: find_pets_by_tags parameters: - description: Tags to filter by @@ -347,7 +349,8 @@ paths: x-openapi-router-controller: openapi_server.controllers.store_controller /store/order/{orderId}: delete: - description: For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + description: For valid response try integer IDs with value < 1000. Anything + above 1000 or nonintegers will generate API errors operationId: delete_order parameters: - description: ID of the order that needs to be deleted @@ -368,7 +371,8 @@ paths: - store x-openapi-router-controller: openapi_server.controllers.store_controller get: - description: For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + description: For valid response try integer IDs with value <= 5 or > 10. Other + values will generated exceptions operationId: get_order_by_id parameters: - description: ID of pet that needs to be fetched diff --git a/samples/server/petstore/python-aiohttp/openapi_server/typing_utils.py b/samples/server/petstore/python-aiohttp/openapi_server/typing_utils.py new file mode 100644 index 0000000000..0563f81fd5 --- /dev/null +++ b/samples/server/petstore/python-aiohttp/openapi_server/typing_utils.py @@ -0,0 +1,32 @@ +# coding: utf-8 + +import sys + +if sys.version_info < (3, 7): + import typing + + def is_generic(klass): + """ Determine whether klass is a generic class """ + return type(klass) == typing.GenericMeta + + def is_dict(klass): + """ Determine whether klass is a Dict """ + return klass.__extra__ == dict + + def is_list(klass): + """ Determine whether klass is a List """ + return klass.__extra__ == list + +else: + + def is_generic(klass): + """ Determine whether klass is a generic class """ + return hasattr(klass, '__origin__') + + def is_dict(klass): + """ Determine whether klass is a Dict """ + return klass.__origin__ == dict + + def is_list(klass): + """ Determine whether klass is a List """ + return klass.__origin__ == list diff --git a/samples/server/petstore/python-aiohttp/openapi_server/util.py b/samples/server/petstore/python-aiohttp/openapi_server/util.py index 9263acb016..c446943677 100644 --- a/samples/server/petstore/python-aiohttp/openapi_server/util.py +++ b/samples/server/petstore/python-aiohttp/openapi_server/util.py @@ -2,6 +2,7 @@ import datetime import typing from typing import Union +from openapi_server import typing_utils T = typing.TypeVar('T') Class = typing.Type[T] @@ -26,10 +27,10 @@ def _deserialize(data: Union[dict, list, str], klass: Union[Class, str]) -> Unio return deserialize_date(data) elif klass == datetime.datetime: return deserialize_datetime(data) - elif type(klass) == typing.GenericMeta: - if klass.__extra__ == list: + elif typing_utils.is_generic(klass): + if typing_utils.is_list(klass): return _deserialize_list(data, klass.__args__[0]) - if klass.__extra__ == dict: + if typing_utils.is_dict(klass): return _deserialize_dict(data, klass.__args__[1]) else: return deserialize_model(data, klass) diff --git a/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION b/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION index afa6365606..0c89fc927e 100644 --- a/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION +++ b/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.0 \ No newline at end of file diff --git a/samples/server/petstore/python-blueplanet/app/openapi_server/typing_utils.py b/samples/server/petstore/python-blueplanet/app/openapi_server/typing_utils.py new file mode 100644 index 0000000000..0563f81fd5 --- /dev/null +++ b/samples/server/petstore/python-blueplanet/app/openapi_server/typing_utils.py @@ -0,0 +1,32 @@ +# coding: utf-8 + +import sys + +if sys.version_info < (3, 7): + import typing + + def is_generic(klass): + """ Determine whether klass is a generic class """ + return type(klass) == typing.GenericMeta + + def is_dict(klass): + """ Determine whether klass is a Dict """ + return klass.__extra__ == dict + + def is_list(klass): + """ Determine whether klass is a List """ + return klass.__extra__ == list + +else: + + def is_generic(klass): + """ Determine whether klass is a generic class """ + return hasattr(klass, '__origin__') + + def is_dict(klass): + """ Determine whether klass is a Dict """ + return klass.__origin__ == dict + + def is_list(klass): + """ Determine whether klass is a List """ + return klass.__origin__ == list diff --git a/samples/server/petstore/python-blueplanet/app/openapi_server/util.py b/samples/server/petstore/python-blueplanet/app/openapi_server/util.py index 527d1424c3..fc9f8b16f0 100644 --- a/samples/server/petstore/python-blueplanet/app/openapi_server/util.py +++ b/samples/server/petstore/python-blueplanet/app/openapi_server/util.py @@ -2,6 +2,7 @@ import datetime import six import typing +from openapi_server import typing_utils def _deserialize(data, klass): @@ -23,10 +24,10 @@ def _deserialize(data, klass): return deserialize_date(data) elif klass == datetime.datetime: return deserialize_datetime(data) - elif type(klass) == typing.GenericMeta: - if klass.__extra__ == list: + elif typing_utils.is_generic(klass): + if typing_utils.is_list(klass): return _deserialize_list(data, klass.__args__[0]) - if klass.__extra__ == dict: + if typing_utils.is_dict(klass): return _deserialize_dict(data, klass.__args__[1]) else: return deserialize_model(data, klass) diff --git a/samples/server/petstore/python-flask-python2/.openapi-generator/VERSION b/samples/server/petstore/python-flask-python2/.openapi-generator/VERSION index afa6365606..0c89fc927e 100644 --- a/samples/server/petstore/python-flask-python2/.openapi-generator/VERSION +++ b/samples/server/petstore/python-flask-python2/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.0 \ No newline at end of file diff --git a/samples/server/petstore/python-flask-python2/openapi_server/openapi/openapi.yaml b/samples/server/petstore/python-flask-python2/openapi_server/openapi/openapi.yaml index ca14f8b7cf..122782a9b9 100644 --- a/samples/server/petstore/python-flask-python2/openapi_server/openapi/openapi.yaml +++ b/samples/server/petstore/python-flask-python2/openapi_server/openapi/openapi.yaml @@ -1,6 +1,7 @@ openapi: 3.0.1 info: - description: This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + description: This is a sample server Petstore server. For this sample, you can use + the api key `special-key` to test the authorization filters. license: name: Apache-2.0 url: http://www.apache.org/licenses/LICENSE-2.0.html @@ -121,7 +122,8 @@ paths: /pet/findByTags: get: deprecated: true - description: Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + description: Multiple tags can be provided with comma separated strings. Use + tag1, tag2, tag3 for testing. operationId: find_pets_by_tags parameters: - description: Tags to filter by @@ -340,7 +342,8 @@ paths: x-openapi-router-controller: openapi_server.controllers.store_controller /store/order/{orderId}: delete: - description: For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + description: For valid response try integer IDs with value < 1000. Anything + above 1000 or nonintegers will generate API errors operationId: delete_order parameters: - description: ID of the order that needs to be deleted @@ -361,7 +364,8 @@ paths: - store x-openapi-router-controller: openapi_server.controllers.store_controller get: - description: For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + description: For valid response try integer IDs with value <= 5 or > 10. Other + values will generated exceptions operationId: get_order_by_id parameters: - description: ID of pet that needs to be fetched diff --git a/samples/server/petstore/python-flask-python2/openapi_server/typing_utils.py b/samples/server/petstore/python-flask-python2/openapi_server/typing_utils.py new file mode 100644 index 0000000000..0563f81fd5 --- /dev/null +++ b/samples/server/petstore/python-flask-python2/openapi_server/typing_utils.py @@ -0,0 +1,32 @@ +# coding: utf-8 + +import sys + +if sys.version_info < (3, 7): + import typing + + def is_generic(klass): + """ Determine whether klass is a generic class """ + return type(klass) == typing.GenericMeta + + def is_dict(klass): + """ Determine whether klass is a Dict """ + return klass.__extra__ == dict + + def is_list(klass): + """ Determine whether klass is a List """ + return klass.__extra__ == list + +else: + + def is_generic(klass): + """ Determine whether klass is a generic class """ + return hasattr(klass, '__origin__') + + def is_dict(klass): + """ Determine whether klass is a Dict """ + return klass.__origin__ == dict + + def is_list(klass): + """ Determine whether klass is a List """ + return klass.__origin__ == list diff --git a/samples/server/petstore/python-flask-python2/openapi_server/util.py b/samples/server/petstore/python-flask-python2/openapi_server/util.py index c7340cd000..4b0188652b 100644 --- a/samples/server/petstore/python-flask-python2/openapi_server/util.py +++ b/samples/server/petstore/python-flask-python2/openapi_server/util.py @@ -2,6 +2,7 @@ import datetime import six import typing +from openapi_server import typing_utils def _deserialize(data, klass): @@ -23,10 +24,10 @@ def _deserialize(data, klass): return deserialize_date(data) elif klass == datetime.datetime: return deserialize_datetime(data) - elif type(klass) == typing.GenericMeta: - if klass.__extra__ == list: + elif typing_utils.is_generic(klass): + if typing_utils.is_list(klass): return _deserialize_list(data, klass.__args__[0]) - if klass.__extra__ == dict: + if typing_utils.is_dict(klass): return _deserialize_dict(data, klass.__args__[1]) else: return deserialize_model(data, klass) diff --git a/samples/server/petstore/python-flask/.openapi-generator/VERSION b/samples/server/petstore/python-flask/.openapi-generator/VERSION index afa6365606..0c89fc927e 100644 --- a/samples/server/petstore/python-flask/.openapi-generator/VERSION +++ b/samples/server/petstore/python-flask/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.0 \ No newline at end of file diff --git a/samples/server/petstore/python-flask/openapi_server/openapi/openapi.yaml b/samples/server/petstore/python-flask/openapi_server/openapi/openapi.yaml index ca14f8b7cf..122782a9b9 100644 --- a/samples/server/petstore/python-flask/openapi_server/openapi/openapi.yaml +++ b/samples/server/petstore/python-flask/openapi_server/openapi/openapi.yaml @@ -1,6 +1,7 @@ openapi: 3.0.1 info: - description: This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + description: This is a sample server Petstore server. For this sample, you can use + the api key `special-key` to test the authorization filters. license: name: Apache-2.0 url: http://www.apache.org/licenses/LICENSE-2.0.html @@ -121,7 +122,8 @@ paths: /pet/findByTags: get: deprecated: true - description: Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + description: Multiple tags can be provided with comma separated strings. Use + tag1, tag2, tag3 for testing. operationId: find_pets_by_tags parameters: - description: Tags to filter by @@ -340,7 +342,8 @@ paths: x-openapi-router-controller: openapi_server.controllers.store_controller /store/order/{orderId}: delete: - description: For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + description: For valid response try integer IDs with value < 1000. Anything + above 1000 or nonintegers will generate API errors operationId: delete_order parameters: - description: ID of the order that needs to be deleted @@ -361,7 +364,8 @@ paths: - store x-openapi-router-controller: openapi_server.controllers.store_controller get: - description: For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions + description: For valid response try integer IDs with value <= 5 or > 10. Other + values will generated exceptions operationId: get_order_by_id parameters: - description: ID of pet that needs to be fetched diff --git a/samples/server/petstore/python-flask/openapi_server/typing_utils.py b/samples/server/petstore/python-flask/openapi_server/typing_utils.py new file mode 100644 index 0000000000..0563f81fd5 --- /dev/null +++ b/samples/server/petstore/python-flask/openapi_server/typing_utils.py @@ -0,0 +1,32 @@ +# coding: utf-8 + +import sys + +if sys.version_info < (3, 7): + import typing + + def is_generic(klass): + """ Determine whether klass is a generic class """ + return type(klass) == typing.GenericMeta + + def is_dict(klass): + """ Determine whether klass is a Dict """ + return klass.__extra__ == dict + + def is_list(klass): + """ Determine whether klass is a List """ + return klass.__extra__ == list + +else: + + def is_generic(klass): + """ Determine whether klass is a generic class """ + return hasattr(klass, '__origin__') + + def is_dict(klass): + """ Determine whether klass is a Dict """ + return klass.__origin__ == dict + + def is_list(klass): + """ Determine whether klass is a List """ + return klass.__origin__ == list diff --git a/samples/server/petstore/python-flask/openapi_server/util.py b/samples/server/petstore/python-flask/openapi_server/util.py index c7340cd000..4b0188652b 100644 --- a/samples/server/petstore/python-flask/openapi_server/util.py +++ b/samples/server/petstore/python-flask/openapi_server/util.py @@ -2,6 +2,7 @@ import datetime import six import typing +from openapi_server import typing_utils def _deserialize(data, klass): @@ -23,10 +24,10 @@ def _deserialize(data, klass): return deserialize_date(data) elif klass == datetime.datetime: return deserialize_datetime(data) - elif type(klass) == typing.GenericMeta: - if klass.__extra__ == list: + elif typing_utils.is_generic(klass): + if typing_utils.is_list(klass): return _deserialize_list(data, klass.__args__[0]) - if klass.__extra__ == dict: + if typing_utils.is_dict(klass): return _deserialize_dict(data, klass.__args__[1]) else: return deserialize_model(data, klass) diff --git a/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/undertow/.openapi-generator-ignore b/samples/server/petstore/scala-finch/.openapi-generator-ignore similarity index 100% rename from samples/server/petstore/undertow/.openapi-generator-ignore rename to samples/server/petstore/scala-finch/.openapi-generator-ignore diff --git a/samples/server/petstore/finch/.openapi-generator/VERSION b/samples/server/petstore/scala-finch/.openapi-generator/VERSION similarity index 100% rename from samples/server/petstore/finch/.openapi-generator/VERSION rename to samples/server/petstore/scala-finch/.openapi-generator/VERSION diff --git a/samples/server/petstore/finch/README.md b/samples/server/petstore/scala-finch/README.md similarity index 64% rename from samples/server/petstore/finch/README.md rename to samples/server/petstore/scala-finch/README.md index 4a1526522b..099ac4d904 100644 --- a/samples/server/petstore/finch/README.md +++ b/samples/server/petstore/scala-finch/README.md @@ -5,11 +5,8 @@ This server was generated by the [OpenAPI Generator](https://openapi-generator.t [OpenAPI-Spec](https://openapis.org) from a remote server, you can easily generate a server stub. This is an example of building a OpenAPI-enabled scalatra server. -This example uses the [finch](http://github.com/finagle/finch/) framework. To see how to make this your own, look here: - -[README](https://github.com/openapitools/openapi-generator/master/samples/server-generator/finch) - +This example uses the [finch](http://github.com/finagle/finch/) framework. ### After generation -Run `scalafix RemoveUnusedImports` to cleanup unused imports. \ No newline at end of file +Run `scalafix RemoveUnusedImports` to cleanup unused imports. diff --git a/samples/server/petstore/finch/build.sbt b/samples/server/petstore/scala-finch/build.sbt similarity index 100% rename from samples/server/petstore/finch/build.sbt rename to samples/server/petstore/scala-finch/build.sbt diff --git a/samples/server/petstore/finch/pom.xml b/samples/server/petstore/scala-finch/pom.xml similarity index 100% rename from samples/server/petstore/finch/pom.xml rename to samples/server/petstore/scala-finch/pom.xml diff --git a/samples/server/petstore/finch/project/build.properties b/samples/server/petstore/scala-finch/project/build.properties similarity index 100% rename from samples/server/petstore/finch/project/build.properties rename to samples/server/petstore/scala-finch/project/build.properties diff --git a/samples/server/petstore/finch/project/plugins.sbt b/samples/server/petstore/scala-finch/project/plugins.sbt similarity index 100% rename from samples/server/petstore/finch/project/plugins.sbt rename to samples/server/petstore/scala-finch/project/plugins.sbt diff --git a/samples/server/petstore/finch/sbt b/samples/server/petstore/scala-finch/sbt similarity index 100% rename from samples/server/petstore/finch/sbt rename to samples/server/petstore/scala-finch/sbt diff --git a/samples/server/petstore/finch/src/main/scala/DataAccessor.scala b/samples/server/petstore/scala-finch/src/main/scala/DataAccessor.scala similarity index 100% rename from samples/server/petstore/finch/src/main/scala/DataAccessor.scala rename to samples/server/petstore/scala-finch/src/main/scala/DataAccessor.scala diff --git a/samples/server/petstore/finch/src/main/scala/Server.scala b/samples/server/petstore/scala-finch/src/main/scala/Server.scala similarity index 100% rename from samples/server/petstore/finch/src/main/scala/Server.scala rename to samples/server/petstore/scala-finch/src/main/scala/Server.scala diff --git a/samples/server/petstore/finch/src/main/scala/endpoint.scala b/samples/server/petstore/scala-finch/src/main/scala/endpoint.scala similarity index 100% rename from samples/server/petstore/finch/src/main/scala/endpoint.scala rename to samples/server/petstore/scala-finch/src/main/scala/endpoint.scala diff --git a/samples/server/petstore/finch/src/main/scala/errors.scala b/samples/server/petstore/scala-finch/src/main/scala/errors.scala similarity index 100% rename from samples/server/petstore/finch/src/main/scala/errors.scala rename to samples/server/petstore/scala-finch/src/main/scala/errors.scala diff --git a/samples/server/petstore/finch/src/main/scala/org/openapitools/apis/PetApi.scala b/samples/server/petstore/scala-finch/src/main/scala/org/openapitools/apis/PetApi.scala similarity index 100% rename from samples/server/petstore/finch/src/main/scala/org/openapitools/apis/PetApi.scala rename to samples/server/petstore/scala-finch/src/main/scala/org/openapitools/apis/PetApi.scala diff --git a/samples/server/petstore/finch/src/main/scala/org/openapitools/apis/StoreApi.scala b/samples/server/petstore/scala-finch/src/main/scala/org/openapitools/apis/StoreApi.scala similarity index 100% rename from samples/server/petstore/finch/src/main/scala/org/openapitools/apis/StoreApi.scala rename to samples/server/petstore/scala-finch/src/main/scala/org/openapitools/apis/StoreApi.scala diff --git a/samples/server/petstore/finch/src/main/scala/org/openapitools/apis/UserApi.scala b/samples/server/petstore/scala-finch/src/main/scala/org/openapitools/apis/UserApi.scala similarity index 100% rename from samples/server/petstore/finch/src/main/scala/org/openapitools/apis/UserApi.scala rename to samples/server/petstore/scala-finch/src/main/scala/org/openapitools/apis/UserApi.scala diff --git a/samples/server/petstore/finch/src/main/scala/org/openapitools/models/ApiResponse.scala b/samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/ApiResponse.scala similarity index 100% rename from samples/server/petstore/finch/src/main/scala/org/openapitools/models/ApiResponse.scala rename to samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/ApiResponse.scala diff --git a/samples/server/petstore/finch/src/main/scala/org/openapitools/models/Category.scala b/samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/Category.scala similarity index 100% rename from samples/server/petstore/finch/src/main/scala/org/openapitools/models/Category.scala rename to samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/Category.scala diff --git a/samples/server/petstore/finch/src/main/scala/org/openapitools/models/Order.scala b/samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/Order.scala similarity index 100% rename from samples/server/petstore/finch/src/main/scala/org/openapitools/models/Order.scala rename to samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/Order.scala diff --git a/samples/server/petstore/finch/src/main/scala/org/openapitools/models/Pet.scala b/samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/Pet.scala similarity index 100% rename from samples/server/petstore/finch/src/main/scala/org/openapitools/models/Pet.scala rename to samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/Pet.scala diff --git a/samples/server/petstore/finch/src/main/scala/org/openapitools/models/Tag.scala b/samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/Tag.scala similarity index 100% rename from samples/server/petstore/finch/src/main/scala/org/openapitools/models/Tag.scala rename to samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/Tag.scala diff --git a/samples/server/petstore/finch/src/main/scala/org/openapitools/models/User.scala b/samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/User.scala similarity index 100% rename from samples/server/petstore/finch/src/main/scala/org/openapitools/models/User.scala rename to samples/server/petstore/scala-finch/src/main/scala/org/openapitools/models/User.scala diff --git a/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/spring-mvc-j8-async/pom.xml b/samples/server/petstore/spring-mvc-j8-async/pom.xml index c38516914a..7c74b1f294 100644 --- a/samples/server/petstore/spring-mvc-j8-async/pom.xml +++ b/samples/server/petstore/spring-mvc-j8-async/pom.xml @@ -150,7 +150,7 @@ 4.12 2.5 2.8.0 - 2.9.5 + 2.9.9 2.8.4 1.1.0.Final 4.3.20.RELEASE diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java index 200571e46f..9eaa5fe5e4 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java index 50a795a483..805249ab7c 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 4001c75894..d26884597e 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java index e28e479cb1..830d7121e5 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java index 7ad7e7a8e7..6b7835c4c6 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java index bbec568a4a..13d57a8efa 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml b/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml index 2386244d28..92fd248964 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/pom.xml @@ -150,7 +150,7 @@ 4.12 2.5 2.8.0 - 2.9.5 + 2.9.9 2.8.4 1.1.0.Final 4.3.20.RELEASE diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java index 491911c3bd..bed62bd5b3 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java index 67b6c91777..2e04937531 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 2296062bc2..3bb065d2f8 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java index 1eed442687..cd8cc0ef70 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java index 52d5b5eb80..1ea7128bbb 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java index 208c959c9a..ebd7a5a891 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/spring-mvc/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-mvc/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/spring-mvc/pom.xml b/samples/server/petstore/spring-mvc/pom.xml index 7416f0c023..adcf1f5768 100644 --- a/samples/server/petstore/spring-mvc/pom.xml +++ b/samples/server/petstore/spring-mvc/pom.xml @@ -150,7 +150,7 @@ 4.12 2.5 2.8.0 - 2.9.5 + 2.9.9 2.8.4 1.1.0.Final 4.3.20.RELEASE diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java index 3208591b15..830e2405e0 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java index 5162b022f2..44c4a0ad45 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 4ff2855742..c1d6144ebb 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java index 370eb74089..ec0f60f746 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java index 8dad1488c6..3473e70341 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java index 95c11daa28..b258dd9754 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java index 3208591b15..830e2405e0 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java index 5162b022f2..44c4a0ad45 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 4ff2855742..c1d6144ebb 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java index 370eb74089..ec0f60f746 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java index 8dad1488c6..3473e70341 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java index 95c11daa28..b258dd9754 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index f59b48e0d8..392e579201 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java index e305846684..f519ea522e 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 6cc14a3180..2d07e98611 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java index d54f8f5502..7c69d35e26 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java index 9ed8c53d42..a958fda34c 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java index 3cfd9cf707..8c3c6d524e 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java index 3208591b15..830e2405e0 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index 5162b022f2..44c4a0ad45 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 4ff2855742..c1d6144ebb 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java index 370eb74089..ec0f60f746 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index 8dad1488c6..3473e70341 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java index 95c11daa28..b258dd9754 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java index 63e4f57549..3b49dd6b09 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index cf22349d94..4977905c78 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 4b9b6a8bef..8c67df2bd3 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java index 00a35ef381..ea51cd1257 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index edfe60f324..cd8a3888a6 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java index b45e6afcc4..ac3828b2e7 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION b/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java index 353f2ed77b..739b60d5ce 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java index e5b842a97b..d193920e58 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 121b8b7c40..ea52e54f47 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java index 96c92eee13..b19f58d10e 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java index 38dfb5cf45..e8393c9a50 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java index ae426eeaba..04faa36192 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION b/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java index 491911c3bd..bed62bd5b3 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java index 98dfec2513..59e9629915 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 2296062bc2..3bb065d2f8 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java index 227710d64c..853e274f16 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java index 52d5b5eb80..1ea7128bbb 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java index 208c959c9a..ebd7a5a891 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION b/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java index 00a115c4e4..e5894d861d 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java index afaba765c2..de8d4e1e41 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java index c4615f35bd..8905e80d4d 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java index a8bc0a1f3b..885e24a4bd 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java index c34b3740c8..a3b5141579 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java index 1b0bed4ed8..aed8385d52 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/.openapi-generator/VERSION b/samples/server/petstore/springboot/.openapi-generator/VERSION index 83a328a922..f2f9c59cf3 100644 --- a/samples/server/petstore/springboot/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot/.openapi-generator/VERSION @@ -1 +1,5 @@ -4.1.0-SNAPSHOT \ No newline at end of file +<<<<<<< HEAD +4.1.0-SNAPSHOT +======= +4.0.2-SNAPSHOT +>>>>>>> origin/master diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java index 491911c3bd..bed62bd5b3 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java index 4962c13375..d829e4abc1 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 2296062bc2..3bb065d2f8 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java index 1eed442687..cd8cc0ef70 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index 52d5b5eb80..1ea7128bbb 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java index 208c959c9a..ebd7a5a891 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java @@ -1,5 +1,9 @@ /** +<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT). +======= + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT). +>>>>>>> origin/master * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/undertow/.openapi-generator/VERSION b/samples/server/petstore/undertow/.openapi-generator/VERSION deleted file mode 100644 index afa6365606..0000000000 --- a/samples/server/petstore/undertow/.openapi-generator/VERSION +++ /dev/null @@ -1 +0,0 @@ -4.0.0-SNAPSHOT \ No newline at end of file diff --git a/website/dynamic/users.yml b/website/dynamic/users.yml index d32144a8f8..2af7b7f22e 100644 --- a/website/dynamic/users.yml +++ b/website/dynamic/users.yml @@ -68,6 +68,11 @@ image: "img/companies/myworkout.png" infoLink: "https://myworkout.com/" pinned: false +- + caption: OPTiM + image: "img/companies/optim.png" + infoLink: "https://www.optim.co.jp/" + pinned: false - caption: "Raiffeisen Schweiz Genossenschaft" image: "img/companies/raiffeisen.png" @@ -113,6 +118,11 @@ image: "img/companies/xero.png" infoLink: "https://www.xero.com/" pinned: false +- + caption: Yelp + image: "img/companies/yelp.png" + infoLink: "https://www.yelp.com/" + pinned: false - caption: Zalando image: "img/companies/zalando.jpg" diff --git a/website/static/img/companies/optim.png b/website/static/img/companies/optim.png new file mode 100644 index 0000000000..c39a2561c3 Binary files /dev/null and b/website/static/img/companies/optim.png differ diff --git a/website/static/img/companies/yelp.png b/website/static/img/companies/yelp.png new file mode 100755 index 0000000000..d46184708e Binary files /dev/null and b/website/static/img/companies/yelp.png differ